update po files

36 files changed, 157300 insertions, 125060 deletions

diff --git a/po/be.po b/po/be.po
index 267f81951..e909290dc 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,15 +3,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -22,318 +18,310 @@ msgstr ""
 "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"
 
-#: ../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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Стан"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Асабістыя звесткі"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Пачаць размову"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Удзельнічаць у _групавой размове"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 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:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Пошук сервісаў"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Выканаць загад..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Змяніць рахунак"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Адкрыць уваходную пошту Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Асабістыя звесткі"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Пачаць размову"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Стан"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Змяніць рахунак"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Стварэнне рахунка"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Стварэнне рахунка</b>\n"
-"\n"
-"Калі ласка, пачакайце..."
+"Трэба зарэгістраваць рахунак, каб далучыцца да\n"
+"сеткі Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, fuzzy
+msgid "I already have an account I want to _use"
+msgstr "Я ўжо маю патрэбны рахунак"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "_Зарэгістраваць новы рахунак"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Выберыце адну з наступных опцый:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Запоўніце звесткі Вашага рахунка</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Пароль:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Захоўваць па_роль"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Аўтарызацыя"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Злучыцца па націску кнопкі \"Скончыць\""
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Стварэнне рахунка"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Аўтарызацыя"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-#, fuzzy
-msgid "I already have an account I want to _use"
-msgstr "Я ўжо маю патрэбны рахунак"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "_Зарэгістраваць новы рахунак"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../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 запомніць пароль для гэтага рахунка"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Проксі:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 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: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 "Ніякі"
+msgid "Use custom hostname/port"
+msgstr "Адмысловы вузел / порт"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Проксі:"
+msgid "_Hostname:"
+msgstr "Назва вузла: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Захоўваць па_роль"
+msgid "_Port:"
+msgstr "_Порт:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Абнавіць профіль па злучэнні"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Адмысловыя"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Адмысловы вузел / порт"
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Трэба зарэгістраваць рахунак, каб далучыцца да\n"
-"сеткі Jabber."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Скончыць"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Назва вузла: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Стварэнне рахунка</b>\n"
+"\n"
+"Калі ласка, пачакайце..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Злучыцца па націску кнопкі \"Скончыць\""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Пароль:"
+msgid "Set my profile when I connect"
+msgstr "Абнавіць профіль па злучэнні"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "_Finish"
+msgstr "_Скончыць"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Рознае</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ніякі"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Асабістыя звесткі</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Уласцівасці</b>"
+msgid "Accounts"
+msgstr "Рахункі"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 #, fuzzy
-msgid "A_djust to status"
-msgstr "_Адпаведна стану"
+msgid "Add"
+msgstr "Адрас"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Рахунак"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Выдаліць"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Рахункі"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "_Змяніць імя"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "Спіс адміністратараў"
+msgid "_Enable"
+msgstr "Уключыць"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Аўтарызацыя"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"Назва рэсурса перадаецца серверу, каб той мог адрозніваць некалькі "
+"праграмаў, злучаных праз адзін рахунак. Такім чынам, Вы можаце злучыцца праз "
+"адзін рахунак і з рэсурса 'Дома', і з рэсурса 'Праца'. Падзеі будуць "
+"накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Аўтаматычна перадалучацца, калі знікае злучэнне"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Паказаць _адлучаных людзей"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Праглядзець"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "_Злучацца па старце Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "З_мяніць пароль"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's 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 ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "Спіс адміністратараў"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Выберыце файл..."
+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 ""
+"Прыярытэт вызначае, куды накіроўваць падзеі, калі некалькі праграмаў "
+"злучаныя з серверам праз адзін рахунак. Праграма з найвышэйшым прыярытэтам "
+"атрымлівае гэтыя падзеі"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Выберыце _ключ..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Адпаведна стану"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Пстрыкніце, каб змяніць пароль рахунка"
+msgid "Priority will change automatically according to your status."
+msgstr "Прыярытэт будзе змяняцца згодна з станам."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "Прыяры_тэт:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Няправільнае імя карыстальніка"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "_Злучацца па старце Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Злучэнне"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Імя:"
+msgid "Resour_ce:"
+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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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:25
+#, fuzzy
+msgid "Browse..."
+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, і шанец "
-"правільнай перадачы файлаў падвысіцца."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
+msgid "Client certificate"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Рахунак"
 
 #: ../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 "C_onnect on Gajim startup"
+msgstr "_Злучацца па старце Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -344,6 +332,18 @@ msgstr ""
 "гэтага рахунка"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Аўтаматычна перадалучацца, калі знікае злучэнне"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Захоўваць _журналы размоў з усімі людзьмі"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "С_інхранізаваць стан рахунка з глабальным станам"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -352,184 +352,212 @@ 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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Калі порт адпраўкі паведамленняў не прыдатны для Вас, выберыце іншы.\n"
-"Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
-
-#: ../data/gui/accounts_window.ui.h:34
-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:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Ужыць проксі для перадачы файлаў"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Прозвішча:"
+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:37
-msgid "Mer_ge accounts"
-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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Агульная"
 
-#: ../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:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Асабістыя звесткі"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Кіраванне..."
+
+#: ../data/gui/accounts_window.ui.h:40
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Уласцівасці</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Прыяры_тэт:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Прыярытэт вызначае, куды накіроўваць падзеі, калі некалькі праграмаў "
-"злучаныя з серверам праз адзін рахунак. Праграма з найвышэйшым прыярытэтам "
-"атрымлівае гэтыя падзеі"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Прыярытэт будзе змяняцца згодна з станам."
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Адпраўляць праверачныя пакункі серверу"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "_Змяніць імя"
+#: ../data/gui/accounts_window.ui.h:44
+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:45
-msgid "Resour_ce:"
-msgstr "Рэ_сурс:"
+#, fuzzy
+msgid "Use cust_om hostname/port"
+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 ""
-"Назва рэсурса перадаецца серверу, каб той мог адрозніваць некалькі "
-"праграмаў, злучаных праз адзін рахунак. Такім чынам, Вы можаце злучыцца праз "
-"адзін рахунак і з рэсурса 'Дома', і з рэсурса 'Праца'. Падзеі будуць "
-"накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)"
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Назва вузла: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Захоўваць _журналы размоў з усімі людзьмі"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Порт:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Рознае</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Адпраўляць праверачныя пакункі серверу"
+msgid "Connection"
+msgstr "Злучэнне"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "С_інхранізаваць стан рахунка з глабальным станам"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Ключ не выбраны"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "С_інхранізаваць стан рахунка з глабальным станам"
+msgid "Choose _Key..."
+msgstr "Выберыце _ключ..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Паказаць _адлучаных людзей"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Адмысловы вузел / порт"
+msgid "_Edit Personal Information..."
+msgstr "Змяніць асабістыя звесткі..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Адмысловы порт:"
+msgid "Information about you, as stored in the server"
+msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Ужыць проксі для перадачы файлаў"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Асабістыя звесткі</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Асабістыя звесткі"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Змяніць асабістыя звесткі..."
+msgid "Co_nnect on Gajim startup"
+msgstr "_Злучацца па старце Gajim"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Уключыць"
+msgid "Synchroni_ze account status with global status"
+msgstr "С_інхранізаваць стан рахунка з глабальным станам"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Назва вузла: "
+msgid "Use cust_om port:"
+msgstr "Адмысловы порт:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Кіраванне..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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"
+"Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Імя:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "_Порт:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Прозвішча:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Аб'яднаць рахункі"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "Р_ахунак:"
+msgid "Add New Contact"
+msgstr "Дадаць новага чалавека"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "_Дазволіць чалавеку бачыць змены майго стану"
+msgid "A_ccount:"
+msgstr "Р_ахунак:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Дадаць новага чалавека"
+msgid "_Protocol:"
+msgstr "_Пратакол:"
 
-#: ../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 "Я хачу дадаць Вас у свой кантактны ліст."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ID карыстальніка:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Мянушка:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Група:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "_Дазволіць чалавеку бачыць змены майго стану"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "П_адпіска"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -541,7 +569,11 @@ msgstr ""
 "гэтага пратакола. Пстрыкніце па кнопцы\n"
 "рэгістрацыі."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Рэгістрацыя"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -549,388 +581,190 @@ msgstr ""
 "Вы павінны злучыцца з транспартам, каб\n"
 "дадаць людзей з гэтага пратакола."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Група:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Мянушка:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Пратакол:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Рэгістрацыя"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "П_адпіска"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ID карыстальніка:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Адбылася памылка:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Свае загады - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Выберыце загад для выканання:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Калі ласка, пачакайце канца атрымання спіса загадаў..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Свае загады - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Выберыце загад для выканання:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Праверыць яшчэ"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Апісанне памылкі..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Калі ласка, пачакайце канца адпраўлення загаду..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Скончыць"
+msgid "Please wait..."
+msgstr "Калі ласка, пачакайце..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Калі ласка, пачакайце канца атрымання спіса загадаў..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Гэты рахунак не мае адпаведных загадаў."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Калі ласка, пачакайце канца адпраўлення загаду..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Адбылася памылка:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Калі ласка, пачакайце..."
+msgid "Error description..."
+msgstr "Апісанне памылкі..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Гэты рахунак не мае адпаведных загадаў."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Скончыць"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Апісанне</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Адмысловы рэдактар настаўленняў"
 
 #: ../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"
+msgid "Filter:"
+msgstr "Фільтар:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Адмысловы рэдактар настаўленняў"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Апісанне</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Фільтар:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>Увага:</b> Каб ужыць некаторыя змены, трэба перазапусціць Gajim"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Вярнуць звычайныя колеры"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Выдаліць MOTD"
+msgid "Show _XML Console"
+msgstr "Паказаць _кансоль XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Спісы прыватнасці"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Адміністратар"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "Адправіць паведамленне ўсім далучаным людзям з гэтага сервера"
+#, fuzzy
+msgid "_Send Server Message..."
+msgstr "Ад_правіць паведамленне серверу"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-#, fuzzy
-msgid "Set MOTD..."
-msgstr "Вызначыць MOTD"
+msgid "Sends a message to users currently connected to this server"
+msgstr "Адправіць паведамленне ўсім далучаным людзям з гэтага сервера"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Вызначыць паведамленне дня"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Паказаць _кансоль XML"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Вызначыць MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Абнавіць паведамленне дня"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Абнавіць MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
-msgid "Updates Message of the Day"
-msgstr "Абнавіць паведамленне дня"
-
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Адміністратар"
+msgid "Delete MOTD"
+msgstr "Выдаліць MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "Ад_правіць паведамленне серверу"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " вакно / картка размовы з гэтым чалавекам адкрыта  "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Дзеянні</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Умовы</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Гукі</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Адмысловыя дзеянні"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Адмысловыя настаўленні нагадванняў"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Усе станы"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Сышоў"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Заняты"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Чалавек змяніў стан"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Чалавек адлучыўся"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Няма "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Перадача файлаў"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Запыт на перадачу файла"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Перадача файла спыненая"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Фарбаванае паведамленне ў групавой размове"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Новае паведамленне ў групавой размове"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Мае "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Нябачны"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Выканаць загад"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Мяне няма"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Некалькі спецыяльных станаў..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "У сетцы / Вольны для размовы"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Граць гук"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Новае прыватнае паведамленне"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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, каб вакно размовы міргала на панэлі "
-"заданняў"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Не адкрываць аўтаматычна вокны размовы"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Адключыць выплыўнае вакно"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Адключыць гук для гэтай падзеі"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Не паказваць падзею ў галоўным вакне"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Не паказваць падзею ў галоўным вакне"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Паведаміць у выплыўным вакне"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Адкрыць вакно размовы з карыстальнікам"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Паказваць падзею ў галоўным вакне"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Паказваць падзею ў галоўным вакне"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "і я "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Людзі"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "для "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Група"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "калі я ў"
+msgid "Deletes Message of the Day"
+msgstr "Выдаліць паведамленне дня"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ніякі"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Уласцівасці"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Аўтаматычна далучацца"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ніякі"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Уласцівасці"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Аўтаматычна далучацца"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Уваход:"
+msgid "New entry received"
+msgstr "Атрыманае новае паведамленне"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Вы атрымалі новае паведамленне:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Назва крыніцы:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Уваход:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Апошняя змена:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Атрыманае новае паведамленне"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Вы атрымалі новае паведамленне:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
@@ -938,28 +772,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Паведамленні аб змене стану</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Паведамленні аб змене стану</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -967,322 +796,318 @@ msgstr "<b>Паведамленні аб змене стану</b>"
 msgid "<b>Mood:</b>"
 msgstr "<b>Гукі</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Паведамленні аб змене стану</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Змяніць пароль"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Увядзіце для пацверджання:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Увядзіце новы пароль:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Увядзіце для пацверджання:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Увядзіце тэкст новага паведамлення аб змене стану</b>"
+msgid "Save as Preset..."
+msgstr "Захаваць тлумачэнне..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Актывізаваны"
+msgid "Mood:"
+msgstr "Пакой:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Пакой:"
+msgid "Activity:"
+msgstr "Актывізаваны"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Стандартныя паведамленні:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Захаваць тлумачэнне..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Увядзіце тэкст новага паведамлення аб змене стану</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Удзельнічаць у _групавой размове"
+msgid "_Copy Link Location"
+msgstr "_Скапіяваць адрас спасылкі"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Дадаць у кантактны ліст"
+msgid "_Open Link in Browser"
+msgstr "_Адкрыць у праглядальніку"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Скапіяваць JID / паштовы адрас"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Скапіяваць адрас спасылкі"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Напісаць ліст"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Адкрыць у праглядальніку"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Пачаць размову"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "№"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Удзельнічаць у _групавой размове"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Дадаць у кантактны ліст"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Дадаць чалавека ў спіс"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "сочыць за размовай"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "сочыць за размовай"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "№"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "Ад_правіць"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "За_прасіць"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Назіральнікі"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr ""
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Спытацца _дазволу праглядаць змены стану"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:5
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Дадаць спецыяльнае _нагадванне"
+msgid "MUC server"
+msgstr "Назіральнікі"
 
-#: ../data/gui/contact_context_menu.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Прызначыць ключ Open_PGP"
+msgid "In_vite"
+msgstr "За_прасіць"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Выканаць загад..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Пачаць _размову"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Адправіць _асобнае паведамленне..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Змяніць _групы"
+msgid "Send _File..."
+msgstr "Адправіць _файл"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "За_прасіць"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Людзі"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Пераключыць шыфраванне Open_PGP"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "Вы_даліць"
+msgid "Toggle End to End Encryption"
+msgstr "Пераключыць шыфраванне Open_PGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Адправіць асаблівы XML"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Выканаць загад..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Адправіць _асобнае паведамленне..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Змяніць імя чалавека"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Адправіць _файл"
+msgid "_Rename..."
+msgstr "Змяніць _імя"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Змяніць _групы"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Пачаць _размову"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Прызначыць ключ Open_PGP"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Пераключыць шыфраванне Open_PGP"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Пераключыць шыфраванне Open_PGP"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Дадаць спецыяльнае _нагадванне"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "П_адпіска"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Дазволіць чалавеку _бачыць змены майго стану"
+#, fuzzy
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Спытацца _дазволу праглядаць змены стану"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:5755
-msgid "_History"
-msgstr "_Журнал"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Змяніць імя чалавека"
+msgid "_Unignore"
+msgstr "дзевяць"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "Змяніць _імя"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "П_адпіска"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "Вы_даліць"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "дзевяць"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Журнал"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Запоўніце форму."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Настаўленні пакоя"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Запоўніце форму."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Змяніць групы"
@@ -1296,56 +1121,48 @@ msgstr "<b>Апісанне</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Здольнасці сервера"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
+msgid "File Transfers"
+msgstr "Перадача файлаў"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Скасаваць перадачу файла"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Паказаць спіс перадаваных і атрыманых файлаў"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Скасаваць выбраную перадачу файла"
+msgid "file transfers list"
+msgstr "спіс файлаў у чарзе на перадачу"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Скасаваць выбраную перадачу файла і выдаліць няскончаны файл"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Па_чысціць"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Перадача файлаў"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Схаваць вакно"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Выдаліць скончаныя, скасаваныя і хібныя запісы перадачы файлаў з спіса"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Выдаліць перадачу файла з спіса."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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"
@@ -1353,82 +1170,108 @@ msgstr ""
 "Выдаліць адзін файл з чаргі перадачы. Калі яшчэ адбываецца перадача, яна "
 "спыняецца, а потым выдаляецца"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Па_чысціць"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Прыпыніць"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Скасаваць выбраную перадачу файла і выдаліць няскончаны файл"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Працягнуць"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Скасаваць перадачу файла"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
+msgid "Cancels the selected file transfer"
+msgstr "Скасаваць выбраную перадачу файла"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Адкрыць дырэкторыю з файлам"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Схаваць вакно"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Прыпыніць"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Працягнуць"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "спіс файлаў у чарзе на перадачу"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Адкрыць дырэкторыю з файлам"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Колер картак</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Рахунак"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Тлусты"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Група"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Чалавек"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Піша"
+msgid "Gajim Themes Customization"
+msgstr "Настаўленне тэмы Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Чалавек"
+msgid "Text _color:"
+msgstr "Колер _тэксту:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Шрыфт:"
+msgid "_Background:"
+msgstr "_Фон:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Настаўленне тэмы Gajim"
+msgid "Text _font:"
+msgstr "_Шрыфт:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Знік"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Група"
+msgid "Font style:"
+msgstr "Шрыфт:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Неактыўны"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Тлусты"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Нахілены"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Прыпынена"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Піша"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Неактыўны"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Колер картак</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Знік"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1436,7 +1279,7 @@ msgstr ""
 "MUC\n"
 "Паведамленні"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1444,22 +1287,6 @@ msgstr ""
 "Накіраваны MUC\n"
 "Паведамленні"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Прыпынена"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Колер _тэксту:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Шрыфт:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Фон:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1467,91 +1294,101 @@ msgstr "Змяніць м_янушку"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Кіраванне закладкамі"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Змяніць _тэму"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Настаўленні _пакоя"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Змясціць у закладках"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Апісанне: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Кіраванне закладкамі"
+msgid "_Request Voice"
+msgstr "_Голас"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Змясціць у закладках"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Ма_дэратар"
+msgid "_Send Private Message"
+msgstr "Ад_правіць прыватнае паведамленне"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Адправіць _файл"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Дзеянні ўдзельнікаў"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Адправіць _файл"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Дадаць у кантактны ліст"
+msgid "_Voice"
+msgstr "_Голас"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Ма_дэратар"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Удзельнік"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Адміністратар"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Забараніць казанне"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Уладальнік"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Выкінуць"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Удзельнік"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Уладальнік"
+msgid "_Ban"
+msgstr "_Забараніць казанне"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "Ад_правіць прыватнае паведамленне"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Голас"
+msgid "_Add to Roster"
+msgstr "_Дадаць у кантактны ліст"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Змясціць у закладках"
+msgid "Show a list of formattings"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Змяніць м_янушку"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Змяніць м_янушку"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Змясціць у закладках"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1563,11 +1400,29 @@ msgid "From:"
 msgstr "Ад:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Тэма:"
 
 #: ../data/gui/history_manager.ui.h:1
+msgid "Gajim History Logs Manager"
+msgstr "Gajim - Кіраўнік журналаў размоў"
+
+#: ../data/gui/history_manager.ui.h:2
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim - Кіраўнік журналаў размоў"
+
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:6
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1583,203 +1438,190 @@ msgstr ""
 "Калі Вы хочаце здзейсніць масавую чыстку журналаў, закрыйце Gajim. Не "
 "выдаляйце журналы размоў з людзьмі, з якімі Вы зараз размаўляеце."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Выдаліць"
+#: ../data/gui/history_manager.ui.h:8
+msgid "_Search Database"
+msgstr "_Пошук у базе дадзеных"
 
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:9
 msgid "Export"
 msgstr "Экспартаваць"
 
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-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"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
-msgid "_Search Database"
-msgstr "_Пошук у базе дадзеных"
-
 #: ../data/gui/history_window.ui.h:1
 #, fuzzy
-msgid "All Chat Histories"
-msgstr "Старыя казкі"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Журнал размоў"
-
-#: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Імя чалавека"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Групавыя размовы"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Старыя казкі"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Журнал размоў"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Пошук"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Весці журнал размоў"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Вузел:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Вузел:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Увайсці ў гэты пакой па злучэнні"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Пакой:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Мянушка:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Нядаўна:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Нядаўна:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Увайсці ў гэты пакой па злучэнні"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Пакой:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Змясціць у закладках"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Сервер:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "_Змясціць у закладках"
+msgid "Bro_wse Rooms"
+msgstr "_Праглядзець"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Далучыцца"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Аўтаматычна далучацца"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
-"запуску"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Кіраванне закладкамі"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Загаловак:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Стан друку:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Аўтаматычна далучацца"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Загаловак:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1792,103 +1634,106 @@ msgid "_Configure"
 msgstr "_Працягнуць"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Уласцівасці</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Злучэнне HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Настаўленні</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Злучэнне HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Кіраванне профілямі проксі"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Тып:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Па_роль:"
+msgid "_Name:"
+msgstr "_Імя:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Проксі:"
+msgid "<b>Properties</b>"
+msgstr "<b>Уласцівасці</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Порт:"
+msgid "Use HTTP prox_y"
+msgstr "С_карыстаць проксі"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "С_карыстаць проксі"
+msgid "_BOSH URL:"
+msgstr "_Спасылка:"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Аўтарызацыя"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Імя карыстальніка:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "_Спасылка:"
+msgid "Pass_word:"
+msgstr "Па_роль:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Імя:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Проксі:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Тып:"
+msgid "Proxy _Port:"
+msgstr "_Порт:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Імя карыстальніка:"
+msgid "<b>Settings</b>"
+msgstr "<b>Настаўленні</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Кіраванне рахункамі"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Пароль"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "А_ўтарызаваць"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Тут"
+msgid "Version:"
+msgstr "Версія GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Працягнуць"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Апісанне: %s"
+msgid "Authors:"
+msgstr "А_ўтарызаваць"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1896,39 +1741,32 @@ msgid "Homepage:"
 msgstr "У Сеціве:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Марнаванне часу"
+msgid "Description:"
+msgstr "Апісанне: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+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 ""
+msgid "Installed"
+msgstr "Марнаванне часу"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1942,519 +1780,501 @@ msgid "Event desc"
 msgstr "Падзеі"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Адмысловы рэдактар настаўленняў</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Праграмы</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Адмысловы</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Дзеянні</b>"
+msgid "All chat states"
+msgstr "Усе станы"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Дзеянні</b>"
+msgid "Composing only"
+msgstr "Піша"
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Змяніць правіла</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Адключана"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Колер картак</b>"
+msgid "Never"
+msgstr "_Ніколі"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Візуальныя нагадванні</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Умовы</b>"
+msgid "Always"
+msgstr "Сышоў"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Вынырваць"
 
-#. 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>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Паведамляць мне пра гэта"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Гукі</b>"
+msgid "Show only in roster"
+msgstr "Паказваць толькі ў _галоўным вакне"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Настаўленні GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Паведамленні аб змене стану</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Спіс прыватнасці</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Паведамленні аб змене стану</b>"
+msgid "Last state"
+msgstr "Апошняе паведамленне: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Уласцівасці"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Уласцівасці</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Дадаць правіла</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Візуальныя нагадванні</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Паказваць _стан у галоўным вакне"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+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:23
-msgid "Advanced"
-msgstr "Адмысловы"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Адмысловы"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Усе станы"
+msgid "Sort contacts by status"
+msgstr "_Упарадкаваць людзей па стане"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Дазволіць адпраўку звестак аб _сістэме"
+#, fuzzy
+msgid "in _roster"
+msgstr "Няма ў спісе"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Дазволіць адпраўку звестак аб _сістэме"
+msgid "in _group chats"
+msgstr "Удзельнічаць у _групавой размове"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Сышоў"
+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:31
-msgid "Ask status message when I:"
-msgstr "Запытацца аб паведамленні змены стану, калі я:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Сымболікі:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Вакно для аднаго паведамлення:"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Схаваць кнопкі групавой размовы."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ігнараваць афармленне ўваходных паведамленняў"
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "П_аведамленне стану:"
+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:36
-#, fuzzy
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
-"Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай Jabber-"
-"праграмай"
+msgid "_Highlight misspelled words"
+msgstr "_Фарбаваць няправільна напісаныя словы"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Піша"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Настаўленні колераў і шрыфтаў"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Паказаць _галоўнае вакно"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "П_аведамленне стану:"
+msgid "Show icon when your messages are received"
+msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Імя чалавека"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Адмысловы</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Змяніць правіла</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Па атрыманні новай падзеі"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Паведамляць мне аб людзях, якія: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Паведамляць мне аб людзях, якія: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Адключана"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Паказваць _малюнкі ў галоўным вакне"
+msgid "Notify on new _GMail email"
+msgstr "Паведамляць аб новай пошце на _Gmail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Паказаць _падрабязнасці пошты"
+#, 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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Паказваць _малюнкі ў галоўным вакне"
+msgid "Display _extra email details"
+msgstr "Паказаць _падрабязнасці пошты"
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Паказваць _малюнкі ў галоўным вакне"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
+"новых лістоў"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Паказваць _малюнкі ў галоўным вакне"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Настаўленні GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Паказваць _малюнкі ў галоўным вакне"
+msgid "Show notification area icon:"
+msgstr "_Значка панэлі паведамленняў"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Паказваць _стан у галоўным вакне"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Візуальныя нагадванні</b>"
 
 #: ../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 можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
-"Вызначце, аб якіх зменах стану Вы хочаце ведаць."
+msgid "Play _sounds"
+msgstr "Граць _гук"
 
 #: ../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 можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
-"Вызначце, аб якіх зменах стану Вы хочаце паведамляць суразмоўцу."
+msgid "Ma_nage..."
+msgstr "Кі_раванне..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 msgstr ""
-"Gajim будзе паведамляць Вам аб сышоўшых людзях у выплыўным вакне ў правым "
-"верхнім куце экрана"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Гукі</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "Схаваць кнопкі групавой размовы."
+msgid "Notifications"
+msgstr "Змяненне рахунка"
 
 #: ../data/gui/preferences_window.ui.h:59
-#, fuzzy
 msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
+"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 далучыцца да гэтай групавой размовы пры "
-"запуску"
+"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 таксама дадасць звесткі аб адпраўніку "
-"новых лістоў"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "_Паказваць нагадванні стану размовы:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "_Паказваць нагадванні стану размовы:"
 
 #: ../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 паказвае аватары ў галоўным вакне і ў "
-"групавых размовах"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Візуальныя нагадванні</b>"
 
 #: ../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 паказвае паведамленні аб зменах стану для "
-"кожнага чалавека ў галоўным вакне і ў групавых размовах"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Асабістыя звесткі"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
-"групавых размовах"
+msgid "_Away after:"
+msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
-"групавых размовах"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
-"групавых размовах"
+msgid "_Not available after:"
+msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"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: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 ""
+msgid "minutes"
+msgstr "хвіліны"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 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:72
-#, fuzzy
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 таксама дадасць звесткі аб адпраўніку "
-"новых лістоў"
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Калі гэтая опцыя ўключаная, Gajim будзе паказваць значкі для асобных "
-"пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, "
-"адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 заменіць ascii-сымболікі (напр., ':)' ) "
-"адпаведнай значкай"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Дзеянні</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "_Вакно для аднаго паведамлення:"
+msgid "Ask status message when I:"
+msgstr "Запытацца аб паведамленні змены стану, калі я:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Кі_раванне..."
+msgid "Sign _in"
+msgstr "_Злучыцца"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Ніколі"
+msgid "Sign _out"
+msgstr "З_ысці"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Змяненне рахунка"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Паведамляць мне аб людзях, якія: "
+msgid "<b>Status Messages</b>"
+msgstr "<b>Паведамленні аб змене стану</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Паведамляць мне аб людзях, якія: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Паведамляць мне пра гэта"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Стан"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Паведамляць аб новай пошце на _Gmail"
+msgid "Use system _default"
+msgstr "Ужыць _сістэмны"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "П_аведамленне стану:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Асабістыя звесткі"
+msgid "<b>Font</b>"
+msgstr "<b>Гукі</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Граць _гук"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Ужыць _значкі транспартаў"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Вынырваць"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. 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:89
-msgid "Preferences"
-msgstr "Уласцівасці"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Прадвызначаны набор _значак стану:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Настаўленні колераў і шрыфтаў"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "Т_эма:"
 
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Сервер:"
+msgid "<b>Themes</b>"
+msgstr "<b>Уласцівасці</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "_Значка панэлі паведамленняў"
+msgid "Contact's nickname:"
+msgstr "Імя чалавека"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Паказваць толькі ў _галоўным вакне"
+msgid "Your nickname:"
+msgstr "П_ерад мянушкай:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Злучыцца"
+msgid "_Status message:"
+msgstr "П_аведамленне стану:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "З_ысці"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Вярнуць звычайныя колеры"
 
 #: ../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 будзе паказваць нефарматаваны тэкст."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "П_аведамленне стану:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "_Упарадкаваць людзей па стане"
+msgid "Your message:"
+msgstr "Памылка: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Стан"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Фарбаванае паведамленне ў групавой размове"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Прадвызначаны набор _значак стану:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Колер картак</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2462,569 +2282,590 @@ msgid "Style"
 msgstr "Марнаванне часу"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "Т_эма:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Дзеянні</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Ужыць _значкі транспартаў"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Дадаць правіла</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Ужыць _сістэмны"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сервер:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Па атрыманні новай падзеі"
+msgid "<b>Connection</b>"
+msgstr "<b>Умовы</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Памылка: %s"
+msgid "_File manager:"
+msgstr "_Кіраўнік файлаў:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "П_ерад мянушкай:"
+msgid "_Mail client:"
+msgstr "_Паштовая праграма:"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Гартач:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "_Паказваць нагадванні стану размовы:"
+msgid "<b>Custom</b>"
+msgstr "<b>Адмысловы</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Сымболікі:"
+msgid "<b>Applications</b>"
+msgstr "<b>Праграмы</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Кіраўнік файлаў:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Фарбаваць няправільна напісаныя словы"
+#, fuzzy
+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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Дазволіць адпраўку звестак аб _сістэме"
 
 #: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ігнараваць афармленне ўваходных паведамленняў"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Дазволіць адпраўку звестак аб _сістэме"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Паштовая праграма:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Адкрыць..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Вярнуць звычайныя колеры"
-
-#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "_Паказваць нагадванні стану размовы:"
+msgid "Allow my _idle time to be sent"
+msgstr "Дазволіць адпраўку звестак аб _сістэме"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "П_аведамленне стану:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Спіс прыватнасці</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
 #: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
-msgid "in _group chats"
-msgstr "Удзельнічаць у _групавой размове"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Няма ў спісе"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
+"Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай Jabber-"
+"праграмай"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "хвіліны"
+msgid "_Open..."
+msgstr "_Адкрыць..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Адмысловы рэдактар настаўленняў</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Адмысловы"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Спісы прыватнасці:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Дадаць / Змяніць правіла</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Спіс прыватнасці"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Спіс правілаў</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Спіс прыватнасці</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Актыўны для гэтага сеанса"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Актываваць пры запуску"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Спіс правілаў</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Усе"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Дадаць / Змяніць правіла</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "усе па падпісцы"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Дазволіць"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Адмовіць"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "усе з групы"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Парадак:"
+msgid "all by subscription"
+msgstr "усе па падпісцы"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Спіс прыватнасці"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Усе"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "усе па падпісцы"
+msgid "to send me messages"
+msgstr "адпраўляць мне паведамленні"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "усе з групы"
+msgid "to send me queries"
+msgstr "адпраўляць мне запыты"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Абодва"
+msgid "to view my status"
+msgstr "бачыць мой стан"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Ад"
+msgid "to send me status"
+msgstr "адпраўляць мне паведамленні аб змене стану"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "адзін"
+msgid "All (including subscription)"
+msgstr "усе па падпісцы"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "два"
+msgid "Order:"
+msgstr "Парадак:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "адпраўляць мне паведамленні"
+#, fuzzy
+msgid "none"
+msgstr "адзін"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "адпраўляць мне запыты"
+#, fuzzy
+msgid "both"
+msgstr "Абодва"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "адпраўляць мне паведамленні аб змене стану"
-
-#: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "бачыць мой стан"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Дадаць правіла</b>"
+msgid "from"
+msgstr "Ад"
 
-#: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Аватар:"
+msgid "to"
+msgstr "два"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Народзіны:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Адмысловы</b>"
+msgid "<b>Family:</b>"
+msgstr "Прозвішча:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Адмысловы</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Гукі</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Дадаць правіла</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Аддзел:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "E-mail:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Уласцівасці</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Дадатковы адрас:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Прозвішча:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Гукі</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Адмысловы</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Настаўленні</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Адмысловы</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "У Сеціве:"
+msgid "<b>State:</b>"
+msgstr "<b>Настаўленні</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Дадатковы адрас:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Дадаць правіла</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Паштовы індэкс:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Адмысловы</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Гукі</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Мянушка:"
+msgid "<b>Address</b>"
+msgstr "<b>Дадаць правіла</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Тэлефонны нумар:"
+msgid "<b>Homepage:</b>"
+msgstr "У Сеціве:"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Умовы</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Адмысловы</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Паштовы індэкс:"
+msgid "<b>Nickname:</b>"
+msgstr "Мянушка:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Уласцівасці</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Тэлефонны нумар:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Фармат: ГГГГ-ММ-ДД"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Гукі</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Народзіны:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Настаўленні</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "E-mail:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Настаўленні</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Аватар:"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Пстрыкніце, каб вызначыць свой аватар"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Асабістыя звесткі"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Гукі</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Адмысловы</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Пра мяне"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Умовы</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Пстрыкніце, каб вызначыць свой аватар"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Аддзел:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Фармат: ГГГГ-ММ-ДД"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Гукі</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Асабістыя звесткі"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Праца"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Што Вы хочаце зрабіць?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Пра мяне"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Выдаліць рахунак _толькі для Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Выдаліць рахунак для Gajim і на _серверы"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Што Вы хочаце зрабіць?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Добра"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Дадаць чалавека..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Дзеянні"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Здольнасці сервера"
+msgid "Add _Contact..."
+msgstr "_Дадаць чалавека..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Перадача _файлаў"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Змяніць"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Частыя пытанні (у Сеціве)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Рахункі"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Дапамога ў Сеціве"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Профіль, а_ватар"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Профіль, а_ватар"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Выгляд"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Паказаць _адлучаных людзей"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Паказаць _транспарты"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Паказаць _адлучаных людзей"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Паказаць _галоўнае вакно"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Рахункі"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+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:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Дзеянні"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Даведка"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Змест"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Змяніць"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Дапамога ў Сеціве"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_Частыя пытанні"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Даведка"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Адправіць _асобнае паведамленне..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Частыя пытанні (у Сеціве)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Выгляд"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Калі ласка, пачакайце канца атрымання спіса загадаў..."
+msgid "Fea_tures"
+msgstr "Здольнасці сервера"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Пошук"
 
+#: ../data/gui/search_window.ui.h:2
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Калі ласка, пачакайце канца атрымання спіса загадаў..."
+
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Дадаць _чалавека"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "П_ошук"
 
@@ -3044,41 +2885,37 @@ msgstr "Зарэгістравацца"
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Адказаць на гэтае паведамленне"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Каму:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Ад_правіць"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Адправіць паведамленне"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Адправіць паведамленне і закрыць вакно"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Адказаць"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Каму:"
+msgid "Reply to this message"
+msgstr "Адказаць на гэтае паведамленне"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Адказаць"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Ад_правіць і закрыць"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Адправіць паведамленне і закрыць вакно"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "А_ўтарызаваць"
+msgid "Subscription Request"
+msgstr "Запыт падпіскі"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Аўтарызаваць чалавека, каб ён мог бачыць, калі Вы далучаны"
+msgid "_Deny"
+msgstr "_Адмовіць"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -3086,274 +2923,285 @@ msgid ""
 "connected"
 msgstr "Забраць аўтарызацыю ў чалавека, каб ён не мог бачыць, калі Вы далучаны"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Запыт падпіскі"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "А_ўтарызаваць"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Адмовіць"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Аўтарызаваць чалавека, каб ён мог бачыць, калі Вы далучаны"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Паказаць _адлучаных людзей"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Адключыць гукі"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Адправіць _асобнае паведамленне"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Паказаць нягледжаныя _падзеі"
-
-#: ../data/gui/systray_context_menu.ui.h:4
 msgid "Sta_tus"
 msgstr "Ст_ан"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Групавая размова"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Дзеянні</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Адправіць _асобнае паведамленне"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Адмысловы</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Паказаць нягледжаныя _падзеі"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Настаўленні</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Адключыць гукі"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Асабістыя звесткі"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Рэсурс:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Настаўленні</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Апісанне</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Адмысловы</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Каментарыі"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Настаўленні</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "Аватар:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>Configured avatar:</b>"
 msgstr "Настаўленні _пакоя"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Чалавек"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Апісанне</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Асабістыя звесткі"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Дзеянні</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Яшчэ"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Аватар:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Чалавек"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Гукі</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Каментарыі"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Трафік Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Увод XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Звесткі/Запыт"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Гукі</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Звесткі/Запыт"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Прысутнасць"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Паведамленне"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Прысутнасць"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Увод XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Змяніць рахунак..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Мясцовы jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Асабістае"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Рэсурс:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Jabber-праграма для GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Асабістае"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Імгненны паведамляльнік Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber-праграма"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Jabber-праграма для GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Асабістыя звесткі"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Няправільны элемент"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Свае загады - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Актывізаваны"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Неактывізаваны"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Лагічнае"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Цэлы лік"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Тэкставае"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Колер"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Назва ўласцівасці"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Значэнне"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Тып"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Няма)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Схаваны"
 
@@ -3365,242 +3213,178 @@ msgstr[0] "Вы атрымалі новае паведамленне:"
 msgstr[1] "Вы атрымалі новае паведамленне:"
 msgstr[2] "Вы атрымалі новае паведамленне:"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Ангельская"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Беларуская"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Балгарская"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Breton"
-msgstr "Брытонская"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Чэшская"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Нямецкая"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Грэцкая"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Брытанская"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Эсперанта"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Іспанская"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Basque"
-msgstr "Басцкая"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Французская"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Харвацкая"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Італійская"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Нарвежская (бокмал)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Галандская"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Нарвежская"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Польская"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Партугальская"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Бразільская партугальская"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Расейская"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Serbian"
-msgstr "Нямецкая"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Славацкая"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Шведская"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Кітайская (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Мова правапісу"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "дзевяць"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Мянушка"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Шрыфт:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Асабістыя звесткі"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Шыфраванне дзейнічае"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Няма ў спісе"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Паведамленне аб аўтаматычнай недаступнасці"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Адправіць _файл"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
@@ -3608,66 +3392,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3675,249 +3459,609 @@ 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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Перадача файлаў"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Памер: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Прыняць"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Перадача файла скончаная"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Запрашэнне ў групавую размову"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Выдаліць чалавека з спіса"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Памылка чытання файла:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Перадача файла спыненая"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Перадача файла скасаваная"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Карыстанне: /%s, хавае кнопкі размовы."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Карыстанне: /%s, хавае кнопкі размовы."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s не знойдзены"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Сышоў"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Тут"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Пераключыць шыфраванне Open_PGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Адправіць файл чалавеку"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Пстрыкніце, каб праглядзець былыя размовы з гэтым чалавекам"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Няма злучэння"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Няма злучэння"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Змяніць м_янушку"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Мянушка не знойдзеная: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Пытацца пацверджання закрыцця групавой размовы."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Адправіць %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Вы не ўвайшлі ў пакой групавой размовы."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Няправільнае імя карыстальніка"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Адносіны: "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Карыстанне: /%s, хавае кнопкі групавой размовы."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Не хапае аргумента \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "стварэнне базы журналаў"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim сканчвае работу"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "стварэнне дырэкторыі %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Змяніць звесткі аб стане"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Змяніць стан"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Выставіць тып прысутнасці і апісанне"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Вольны для размовы"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "У сетцы"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Пашыраны рэжым адсутнасці"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Не турбаваць"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Адлучаны - па-за сеткай"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Апісанне прысутнасці:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Стан змяніўся."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Сысці з групавых размоў"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s на %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Групавыя размовы"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Вы сышлі з наступных групавых размоў:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d нечытанае паведамленне"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "%d нечытанае паведамленне"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Паказваць нагадванні праз DBus і Notification-Daemon"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Праз колькі хвілінаў змяняць стан на сышоўшы."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Сышоў як вынік марнавання часу"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Праз колькі хвілінаў змяняць стан на недаступны."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Недаступны ў выніку марнавання часу"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "тэкст паведамлення аб змене стану"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Паказваць падзею ў галоўным вакне"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Паказваць падзею ў галоўным вакне"
+
+#. red
+#: ../src/common/config.py:104
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Запыт на перадачу файла"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Перадача файла скасаваная"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Запрашэнне ў групавую размову"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Змена мянушкі"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "тэкст паведамлення аб змене стану"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 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:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Мова правапісу"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3927,7 +4071,7 @@ msgstr ""
 "'sometimes' - паказваць час кожныя print_ichat_every_foo_minutes хвілінаў.\n"
 "'never' - не паказваць час."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3938,18 +4082,18 @@ msgstr ""
 "паказвае самы прыблізны. Працуе, калі опцыя print_time мае значэнне "
 "'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Лічыць спалучэнні * / _  мажлівымі знакамі фарматавання."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Калі true, не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але * * не "
 "выдаляецца."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3960,19 +4104,25 @@ msgstr ""
 "сінтаксіс на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext."
 "html (калі Вы хочаце ўжыць гэтую магчымасць, усталюйце docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "Знак пасля дапоўненай мянушкі ў групавой размове."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 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
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3984,49 +4134,59 @@ msgstr ""
 "дакументацыі для python на функцыю strftime: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Знакі, якія друкуюцца ў вокнах размовы перад мянушкай"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Знакі, якія друкуюцца ў вокнах размовы пасля мянушкі"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Дадаць * і [n] у назву галоўнага вакна?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колькі хвілінаў апошняй размовы паказваць у новых размовах."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4034,11 +4194,11 @@ msgstr ""
 "Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок "
 "(стандартныя паводзіны Mirabilis ICQ)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4047,13 +4207,13 @@ msgstr ""
 "Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', "
 "што значыць выкарыстанне Вікі-Слоўніка."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim можа кантралявацца з дапамогай gajim-"
 "remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4064,14 +4224,14 @@ msgstr ""
 "(для якіх опцыя listen_to_network_manager не выстаўленая ў False і якія "
 "сінхранізуюцца з глабальным станам) згодна з станам сеткавага злучэння."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4079,7 +4239,7 @@ msgstr ""
 "Паказваць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4087,33 +4247,35 @@ msgstr ""
 "Калі трэба паказваць час не для кожнага паведамлення "
 "(print_time==sometimes), паказваць яго кожныя x хвілінаў."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Пытацца пацверджання закрыцця групавой размовы."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Заўсёды пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Ніколі не пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4122,28 +4284,34 @@ msgstr ""
 "Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / "
 "перанакіравання портаў."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Паказваць картку, калі актыўная толькі адна размова?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Паказваць межы картак у вокнах размовы?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4151,18 +4319,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Спіс падзеленых кропкай з коскай слоў, якія трэба фарбаваць у групавых "
 "размовах."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4171,14 +4339,14 @@ msgstr ""
 "Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае "
 "настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 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
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4186,17 +4354,17 @@ msgstr ""
 "Калі true, Gajim паказвае значку на кожнай картцы з нечытанымі "
 "паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 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
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4205,15 +4373,16 @@ msgstr ""
 "чалавеку, хто не меў усталяванага аватара ў апошні сеанс, ці чый аватар "
 "надта стары."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr "Калі false, не паказваць паведамленні аб змене стану суразмоўцы."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4225,30 +4394,34 @@ msgstr ""
 "паказваць усе такія паведамленні. Калі опцыя выстаўленая ў \"in_and_out\", "
 "Gajim будзе паказваць толькі паведамленні аб сыходзе / ўваходзе суразмоўцы."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Фонавы колер для толькі сышоўшых людзей."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Калі true, адноўленыя з папярэдняга сеанса паведамленні будуць мець меншы "
 "памер шрыфта."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Не паказваць аватар для транспарта."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4258,7 +4431,7 @@ msgstr ""
 "вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці "
 "нягледжаных падзей."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4269,7 +4442,7 @@ msgstr ""
 "перастаць адпраўляць звесткі sha у групавыя размовы"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4278,7 +4451,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Вызначае вакно для новых паведамленняў.\n"
@@ -4289,32 +4462,40 @@ msgstr ""
 "адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі "
 "пасля перазапуску праграмы."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Калі true, клавіша Escape закрывае картку / вакно."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Хавае банер у групавой размове"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Хавае банер у прыватнай размове"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Схаваць спіс удзельнікаў групавой размовы."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4322,28 +4503,28 @@ msgstr ""
 "У групавой размове не паказваць мянушку, калі папярэдняе паведамленне "
 "напісаў той самы чалавек."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Адправіць паведамленне і закрыць вакно"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Спіс колераў для фарбавання мянушак у групавой размове."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4351,7 +4532,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4360,7 +4541,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4369,7 +4550,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4379,7 +4560,7 @@ msgstr ""
 "Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў "
 "ад Вашага сервера."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4387,7 +4568,7 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4396,7 +4577,7 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4404,7 +4585,7 @@ msgstr ""
 "Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных "
 "людзей і агульную колькасць у радках групаў і рахункаў."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4412,91 +4593,105 @@ msgstr ""
 "Можа мець значэнні 'chat', 'normal' альбо быць пустым. Калі не пустое, то "
 "лічыць усе ўваходныя паведамленні гэтага тыпу"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4504,84 +4699,97 @@ msgstr ""
 "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў "
 "опцыях autopriority_*."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Выпраўленне хібы Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4589,141 +4797,190 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s хоча адправіць Вам файл."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Аўтарызацыя"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Аўтарызацыя"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапісу"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "усе ці падзеленыя прагаламі станы"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' ці 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сон"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Ежа"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Ямо, пакіньце мне паведамленне."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Фільм"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працую"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Працую."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Сышоў"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4732,27 +4989,184 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "зялёны"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "садавіна"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "чалавек"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "мора"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Да"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "запыт адпіскі ад %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Аўтарызацыя забраная"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Няправільны Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "памылка адпраўкі %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Новае асобнае паведамленне"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Новае асобнае паведамленне ад %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Новае прыватнае паведамленне"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Новае прыватнае паведамленне ў групавой размове %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Новае паведамленне ад %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Новае паведамленне"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Новае паведамленне ад %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s змяніў стан"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s цяпер %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Чалавек змяніў стан"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s прыйшоў"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Чалавек прыйшоў"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s сышоў"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Чалавек сышоў"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Немагчыма загрузіць модуль idle"
@@ -4762,215 +5176,193 @@ msgstr "Немагчыма загрузіць модуль idle"
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Зарэгістравацца на %s"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Няправільны 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: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 ""
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4979,108 +5371,118 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Няправільны адказ"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Немагчыма злучыцца з \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, 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:1361 ../src/common/connection.py:1439
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Праверце злучэнне альбо паспрабуйце пазней"
+#: ../src/common/connection.py:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Немагчыма злучыцца з \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Праверце звесткі аўтарызацыі."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Памылка ў часе выдалення спіса прыватнасці"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5089,68 +5491,68 @@ msgstr ""
 "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
 "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Людзі"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Транспарты"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Няма ў спісе"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Файлы падтрымкі python для D-Bus адсутнічаюць на гэтым кампутары"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Немагчыма скарыстаць D-Bus для Gajim"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
@@ -5165,7 +5567,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Сервіс недаступны: Gajim не працуе, альбо remote_control мае значэнне False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
 
@@ -5350,224 +5752,232 @@ msgstr "Канец тыдня"
 msgid "Weekend!"
 msgstr "Выходныя!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Няправільны знак у імені карыстальніка."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Няправільны знак у назве вузла."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Патрэбны адрас сервера."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Няправільны знак у назве рэсурса."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Мяне няма"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Адключаны"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Нябачны"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Нябачны"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?чалавек у стане:Невядомы"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?чалавек у стане:Ёсць памылкі"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Ужо ёсць падпіскі:Няма"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Да"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Ад"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Абодва"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Запыт (на падпіску):Няма"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роля чалавека:Няма"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "піша паведамленне..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s кiБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5575,22 +5985,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5598,21 +6008,40 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Немагчыма загрузіць малюнак"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Немагчыма загрузіць малюнак"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Настаўленні пакоя"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5624,111 +6053,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Памылка: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Стандартныя паведамленні стану"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Памер: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Файл: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "зялёны"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "памылка: немагчыма прачытаць %s"
+msgid "Error: cannot open %s for reading"
+msgstr "Памылка: немагчыма прачытаць %s"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
@@ -6436,49 +6879,133 @@ msgstr ""
 msgid "Writing"
 msgstr "Працую"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Прадвызначана"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "мора"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Пакаранне %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Краіна:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Рахунак"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Апісанне"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Памылка Avahi"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "адзін"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "пакой"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "спасылка"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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 ужо працуе. Перадача файлаў скасаваная."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Памылка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6487,46 +7014,45 @@ msgstr ""
 "%s\n"
 "Мясцовыя паведамленні могуць не працаваць."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Немагчыма стартаваць мясцовы сервіс"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Немагчыма злучыцца праз порт %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Немагчыма змяніць стан рахунка \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
@@ -6537,26 +7063,26 @@ msgstr "Немагчыма злучыцца з вузлом: скончыўся
 msgid "Error while adding service. %s"
 msgstr "Памылка дадання сервіса. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Стандартныя паведамленні стану"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6565,215 +7091,216 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Перадалучыцца?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Нягледжаныя падзеі"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Кіраванне рахункамі"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6781,11 +7308,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6793,11 +7320,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6805,11 +7332,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6817,7 +7344,7 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6834,113 +7361,109 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Памылка злучэння"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Выдаліць рахунак _толькі для Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Няправільнае імя карыстальніка"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6951,36 +7474,36 @@ msgstr ""
 "\"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць"
 "\" галоўнага вакна."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
 "рахунка."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Вызначце сваю новую мянушку:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6990,7 +7513,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6998,326 +7521,344 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Працягнуць"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Актыўны"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Падзея"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Атрыманае першае паведамленне"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Атрыманае першае паведамленне"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, 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:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Выйсці"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Учора"
 msgstr[1] "Учора"
 msgstr[2] "Учора"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-праграма"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Імя чалавека: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "У групе"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Імя чалавека"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Вызначыць MOTD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Паведамленне аб змене стану %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Захаваць гэтае паведамленне аб змене стану"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Адрас AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Нумар GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Нумар ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Адрас MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Адрас Yahoo!:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
 "%s"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
 msgstr "Jabber-праграма для GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Былыя распрацоўнікі:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "Падзякі:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7328,109 +7869,161 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "Insecure connection"
+msgstr "Злучэнне"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Больш не пытацца"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Няправільная спасылка"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Гэта не групавая размова"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Пачаць размову з рахунка %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7439,168 +8032,138 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Немагчыма разабраць \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Чалавек прыйшоў"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Чалавек сышоў"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Новае паведамленне"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Новае асобнае паведамленне"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Новае прыватнае паведамленне"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Запрашэнне ў групавую размову"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Чалавек змяніў стан"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Кансоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Марнаванне часу"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "Вы_даліць"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7608,193 +8171,190 @@ msgid ""
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Дадаць _чалавека"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Дадаць _чалавека"
+msgstr[1] "Дадаць _чалавека"
+msgstr[2] "Дадаць _чалавека"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Выдаліць чалавека з спіса"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Выдаліць чалавека з спіса"
+msgstr[1] "Выдаліць чалавека з спіса"
+msgstr[2] "Выдаліць чалавека з спіса"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Умова"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "калі я "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7802,38 +8362,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7843,78 +8403,116 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "для рахунка %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Іншыя"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Канферэнцыі"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7922,476 +8520,492 @@ msgstr ""
 "Па вызначаным адрасе няма сервісаў, альбо яны не адказваюць на запыты. "
 "Праверце адрас і паспрабуйце зноў."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Праглядзець"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Выканаць загад..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук у %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Карыстальнікі"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Апісанне"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Закладка ўжо ўсталяваная"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Закладка паспяхова дададзеная"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
 "вакна."
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Ніякі"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Новы допіс"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Загады: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Шыфраванне OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "_Уваходнае паведамленне:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Паролі розняцца"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Змяненне рахунка"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Адпаведна стану"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Шыфраванне OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Уваходнае паведамленне:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Агульная"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Тут"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Здольнасці сервера"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Час"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Ступень выкананасці"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Перадача файла скончаная"
-
-#: ../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
-msgid "Connection with peer cannot be established."
-msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Атрымальнік: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Памылка: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Перадача файла спыненая"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Выберыце файл..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Апісанне: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim не можа даступіцца да гэтага файла"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Гэтым файлам карыстаецца іншы працэс."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Файл: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Тып: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Апісанне: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s хоча адправіць Вам файл:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Захаваць файл як..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Файл: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Тып: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Апісанне: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s хоча адправіць Вам файл:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Адпраўленне профіля..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Памылка перадачы файла"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8399,81 +9013,117 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/с)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Няправільны файл"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Назва:"
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "паведамленне"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Сымболікі:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Паказваць толькі ў _галоўным вакне"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Адмысловы рэдактар настаўленняў"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Настаўленні пакоя"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim патрабуе запуску сервера X. Выхад..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim патрабуе pywin32 для запуску"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 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
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim ужо працуе"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8481,28 +9131,28 @@ msgstr ""
 "Gajim ужо працуе\n"
 "Усё роўна запусціць наноў?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Паказвае даведку па вызначаным загадзе"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "загад"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "паказаць даведку па загадзе"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8510,51 +9160,55 @@ 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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "рахунак"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "паказаць людзей з пэўнага рахунка"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Паказаць спіс зарэгістраваных рахункаў"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "стан"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "паведамленне"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "паведамленне стану"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8562,21 +9216,48 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Змяніць стан рахунка(ў)"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Прыяры_тэт:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Зарэгістраваць новы рахунак"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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.py:130
 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.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8586,34 +9267,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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.py:146 ../src/gajim-remote.py:160
 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.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8623,134 +9299,131 @@ msgstr ""
 "OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', "
 "без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тэма"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 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.py:176
 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.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Месца файла"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "назва выдаляемай уласцівасці"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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.py:219
 msgid "Removes contact from roster"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Дадаць чалавека ў спіс"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Дадаць новага чалавека для гэтага рахунка"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:243
 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-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Вяртае колькасць нечытаных паведамленняў"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Адкрыць вакно 'Пачаць размову'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Пачаць размову для рахунка"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Адправіць асаблівы XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "Адправіць XML"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8758,46 +9431,99 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Змяніць стан"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Мянушка не знойдзеная: %s"
+
+#: ../src/gajim-remote.py:272
+#, 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:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Апрацоўваць спасылкі xmpp:/"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "спасылка"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "змест паведамлення"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Увайсці ў размоўны пакой"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "пакой"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "Room JID"
+msgstr "Пакой:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "мянушка"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Мянушка не знойдзеная: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "пароль"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Паролі розняцца"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 #, 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
+#: ../src/gajim-remote.py:301
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8806,163 +9532,42 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Карыстанне: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\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"
-"Увядзіце \"%s help %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 ""
-"Аргумент \"%s\" не вызначаны. \n"
-"Увядзіце \"%s help %s\" для падрабязных звестак"
-
-#: ../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 "адзін з: offline, online, chat, away, xa, dnd, invisible "
-
-#: ../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: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 "Мянушка не знойдзеная: %s"
-
-#: ../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 ""
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr ""
-
-#: ../src/gajim-remote.py:282
-#, fuzzy
-msgid "Message content"
-msgstr "змест паведамлення"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Пакой:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Мянушка не знойдзеная: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8971,7 +9576,7 @@ msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8980,10 +9585,14 @@ msgstr ""
 "Аргумент \"%s\" не вызначаны. \n"
 "Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Няправільная спасылка"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тэма"
@@ -9007,203 +9616,237 @@ msgid "You cannot delete your current theme"
 msgstr "Вы не можаце выдаліць актыўную тэму"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s змяніў мянушку на %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s пакараны: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(who)s пакараў %(nick)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Адносіны: "
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Апісанне: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
@@ -9228,66 +9871,60 @@ msgstr "_Паведаміць пра памылку"
 msgid "Details"
 msgstr "Падрабязнасці"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Памылка разбору файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не з'яўляецца прадвызначанай Jabber-праграмай"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ці Вы хочаце зрабіць Gajim прадвызначанай Jabber-праграмай?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim прадвызначанай Jabber-"
 "праграмай"
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9297,190 +9934,176 @@ msgstr ""
 "Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
 "Выберыце іншую мянушку:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Вам забаронена казанне ў гэтай групавой размове."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Стварэнне групавых размоў абмежаванае."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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:498 ../src/gui_interface.py:513
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "памылка адпраўкі %s ( %s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Запыт падпіскі"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Адпісацца"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Патрэбны пароль"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Вызначце пароль GPG для рахунка %s."
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
 "(магчыма, зменная асяроддзя выстаўленая няправільна)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новая пошта на %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9488,7 +10111,7 @@ msgstr[0] "%d новы ліст"
 msgstr[1] "%d новыя лісты"
 msgstr[2] "%d новых лістоў"
 
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9498,103 +10121,88 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Выдаліць чалавека з спіса"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-#, fuzzy
-msgid "Error opening file"
-msgstr "Памылка чытання файла:"
+msgid "File Transfer Failed"
+msgstr "Перадача файлаў"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Для кожнага _паведамлення"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9602,15 +10210,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Дадаць асабістае нагадванне для %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9621,32 +10234,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Злучэнне"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-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:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9654,102 +10248,105 @@ msgid ""
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Няправільны пароль"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Я хачу дадаць Вас у мой кантактны ліст"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "стварэнне дырэкторыі %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Людзі"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Мянушка"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Паведамленне"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Тэма"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9757,7 +10354,7 @@ msgstr ""
 "Вы сапраўды хочаце ачысціць базу дадзеных? (Увага: закрыйце Gajim перад "
 "працягам)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9771,98 +10368,110 @@ msgstr ""
 "\n"
 "Калі Вы выбралі Так, пачакайце..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Экспартаванне журналаў..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)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[2] "Вы сапраўды хочаце выдаліць журналы размоў з выбранымі асобамі?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Вы сапраўды хочаце выдаліць журнал размоў з выбранай асобай?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Гэтае дзеянне не аднаўляецца."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Асабістыя звесткі"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 msgstr[1] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал размоў %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Памылка: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Немагчыма загрузіць малюнак"
+msgid "Loading"
+msgstr "Піша"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Размовы"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Групавыя размовы"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Паведамленні"
 
@@ -9874,104 +10483,115 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s змяніў стан"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "дзевяць"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s прыйшоў"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s сышоў"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Забарона казання для %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Новае асобнае паведамленне ад %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Памылка злучэння"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Новае прыватнае паведамленне ў групавой размове %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Новае паведамленне ад %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Такі файл ужо ёсць"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Новае паведамленне ад %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "дзевяць"
+msgid "Configuration"
+msgstr "Настаўленні пакоя"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Месца файла"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Чытанне профіля..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Месца файла"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Такой групавой размовы няма."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Асабістыя звесткі"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Фармат: ГГГГ-ММ-ДД"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Атрыманыя звесткі"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з серверам."
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Адпраўленне профіля..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Звесткі НЕ абноўленыя"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9979,51 +10599,52 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10031,39 +10652,39 @@ msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Скасаваць перадачу файла"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10072,95 +10693,95 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, 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:2800
+#: ../src/roster_window.py:3043
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10169,12 +10790,12 @@ msgstr ""
 "прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10183,16 +10804,16 @@ msgstr ""
 "чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас "
 "адлучаным."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10202,46 +10823,46 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10251,12 +10872,12 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10264,12 +10885,17 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Адправіць %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Зрабіць %s і %s мета-кантактамі"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
@@ -10279,138 +10905,138 @@ msgstr "Зрабіць %s і %s мета-кантактамі"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "рахунку %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Кіраванне закладкамі..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "рахунка %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "для рахунка %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Праглядзець сервісы..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Змяніць _групы"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ад_правіць асобнае паведамленне"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Выканаць загад..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Змяніць _імя"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Чалавек адлучыўся"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Змяніць паведамленне стану..."
 
@@ -10427,31 +11053,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Тэма: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10461,149 +11077,154 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Змяніць паведамленне стану..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Няма ў спісе"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Рэсурс: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s гэтай групавой размовы"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Апошняе паведамленне: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " ад %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Злучэнне"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Чалавек адлучыўся"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Падпіска: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " ад %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Пакой:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Актывізаваны"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Тып:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Змяненне рахунка"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Сцягнуць"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Загрузіць"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Тып: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Перададзена: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Не пачатая"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Спыненая"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Скончаная"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Прыпыненая"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Марнаванне часу"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Перадача"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Гэты сервіс яшчэ не адказаў на запыт падрабязных звестак"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10611,68 +11232,409 @@ msgstr ""
 "Гэты сервіс не дае падрабязных звестак.\n"
 "Хутчэй за ўсё, гэты сервіс састарэлы ці зламаны"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "ад %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Праграмы</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Вы не цікавіцеся чалавекам, і ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Выберыце файл..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " вакно / картка размовы з гэтым чалавекам адкрыта  "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Дзеянні</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Умовы</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Адмысловыя дзеянні"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Адмысловыя настаўленні нагадванняў"
+
+#~ msgid "All statuses"
+#~ msgstr "Усе станы"
+
+#~ msgid "Busy "
+#~ msgstr "Заняты"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Чалавек змяніў стан"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Чалавек адлучыўся"
+
+#~ msgid "Don't have "
+#~ msgstr "Няма "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Перадача файла спыненая"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Фарбаванае паведамленне ў групавой размове"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Новае паведамленне ў групавой размове"
+
+#~ msgid "Have "
+#~ msgstr "Мае "
+
+#~ msgid "Launch a command"
+#~ msgstr "Выканаць загад"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Некалькі спецыяльных станаў..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "У сетцы / Вольны для размовы"
+
+#~ msgid "Play a sound"
+#~ msgstr "Граць гук"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Новае прыватнае паведамленне"
+
+#~ msgid "When "
+#~ msgstr "Калі "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Скарыстаць здольнасць UrgencyHint, каб вакно размовы міргала на панэлі "
+#~ "заданняў"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Не адкрываць аўтаматычна вокны размовы"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Адключыць выплыўнае вакно"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Адключыць гук для гэтай падзеі"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Не паказваць падзею ў галоўным вакне"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Не паказваць падзею ў галоўным вакне"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Паведаміць у выплыўным вакне"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Адкрыць вакно размовы з карыстальнікам"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Паказваць падзею ў галоўным вакне"
+
+#~ msgid "and I "
+#~ msgstr "і я "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Людзі"
+
+#~ msgid "for "
+#~ msgstr "для "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Група"
+
+#~ msgid "when I'm in"
+#~ msgstr "калі я ў"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Дадаць чалавека ў спіс"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Дазволіць чалавеку _бачыць змены майго стану"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Апісанне: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Адмысловы"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Паказваць _малюнкі ў галоўным вакне"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Паказваць _малюнкі ў галоўным вакне"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Паказваць _малюнкі ў галоўным вакне"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+#~ "групавых размовах"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+#~ "групавых размовах"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+#~ "групавых размовах"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Адправіць _асобнае паведамленне..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Аватар:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Імгненны паведамляльнік Gajim"
+
+#~ msgid "English"
+#~ msgstr "Ангельская"
+
+#~ msgid "Belarusian"
+#~ msgstr "Беларуская"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Балгарская"
+
+#, fuzzy
+#~ msgid "Breton"
+#~ msgstr "Брытонская"
+
+#~ msgid "Czech"
+#~ msgstr "Чэшская"
+
+#~ msgid "German"
+#~ msgstr "Нямецкая"
+
+#~ msgid "Greek"
+#~ msgstr "Грэцкая"
+
+#~ msgid "British"
+#~ msgstr "Брытанская"
+
+#~ msgid "Esperanto"
+#~ msgstr "Эсперанта"
+
+#~ msgid "Spanish"
+#~ msgstr "Іспанская"
+
+#, fuzzy
+#~ msgid "Basque"
+#~ msgstr "Басцкая"
+
+#~ msgid "French"
+#~ msgstr "Французская"
+
+#~ msgid "Croatian"
+#~ msgstr "Харвацкая"
+
+#~ msgid "Italian"
+#~ msgstr "Італійская"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Нарвежская (бокмал)"
+
+#~ msgid "Dutch"
+#~ msgstr "Галандская"
+
+#~ msgid "Norwegian"
+#~ msgstr "Нарвежская"
+
+#~ msgid "Polish"
+#~ msgstr "Польская"
+
+#~ msgid "Portuguese"
+#~ msgstr "Партугальская"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Бразільская партугальская"
+
+#~ msgid "Russian"
+#~ msgstr "Расейская"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Нямецкая"
+
+#~ msgid "Slovak"
+#~ msgstr "Славацкая"
+
+#~ msgid "Swedish"
+#~ msgstr "Шведская"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Кітайская (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Мова правапісу"
+
+#~ msgid "all or space separated status"
+#~ msgstr "усе ці падзеленыя прагаламі станы"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no' ці 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' ці ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Праверце злучэнне альбо паспрабуйце пазней"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "памылка: немагчыма прачытаць %s"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Немагчыма адкрыць порт %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr "Магчыма, Gajim ужо працуе. Перадача файлаў скасаваная."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Jabber-праграма для GTK+"
+
+#~ msgid "Condition"
+#~ msgstr "Умова"
+
+#~ msgid "when I am "
+#~ msgstr "калі я "
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr ""
+#~ "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны "
+#~ "рахунак)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Карыстанне: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Надта шмат аргументаў. \n"
+#~ "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Аргумент \"%s\" не вызначаны. \n"
+#~ "Увядзіце \"%s help %s\" для падрабязных звестак"
+
+#~ msgid "Contacts"
+#~ msgstr "Людзі"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Тэма: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Пакой:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Актывізаваны"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Не паказваць падзею ў прасторы паведамленняў"
 
@@ -10690,30 +11652,12 @@ 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 "Змяненне рахунка"
 
@@ -10798,9 +11742,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ "Шэраг людзей\n"
 #~ "Банер размовы"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Кіраванне рахункамі"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Выдаліць"
@@ -10905,9 +11846,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ "Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць "
 #~ "паведамленне."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Гэтае паведамленне зашыфраванае]"
-
 #~ msgid "%i days ago"
 #~ msgstr "%i дзён таму"
 
@@ -10920,12 +11858,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Commands: %s"
 #~ msgstr "Загады: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Карыстанне: /%s, хавае кнопкі размовы."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10934,10 +11866,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ "Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
 #~ "асобы). (напр., /%s рагоча як конь.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Карыстанне: /%s, хавае кнопкі размовы."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Даведка па /%s адсутнічае"
 
@@ -10954,10 +11882,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgstr "%(contact_jid)s запрошаныя ў %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Мянушка не знойдзеная: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10969,12 +11893,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ "ён таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
 
 #~ 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 ""
@@ -11015,9 +11933,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ 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 [тэма], паказвае ці змяняе тэму групавой размовы."
@@ -11052,10 +11967,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "_Host:"
 #~ msgstr "_Вузел:"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Паказаць _галоўнае вакно"
-
 #~ msgid "Modify Account"
 #~ msgstr "Змяніць рахунак"
 
@@ -11149,9 +12060,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Soliloquy"
 #~ msgstr "Маналог"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Пстрыкніце, каб праглядзець былыя размовы з гэтым чалавекам"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Кампактны выгляд    Alt+К"
 
@@ -11164,9 +12072,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Query Builder..."
 #~ msgstr "Стварэнне запыту..."
 
-#~ msgid "Accept"
-#~ msgstr "Прыняць"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Атрыманае запрашэнне"
 
@@ -11259,9 +12164,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "The auto away status message"
 #~ msgstr "Паведамленне аб аўтаматычным сыходзе"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "Паведамленне аб аўтаматычнай недаступнасці"
-
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Лічыць усе ўваходныя паведамленні:"
 
@@ -11295,9 +12197,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Company:"
 #~ msgstr "Кампанія:"
 
-#~ msgid "Country:"
-#~ msgstr "Краіна:"
-
 #~ msgid "Given:"
 #~ msgstr "Дадзенае імя:"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index 9e3a31dd8..c670698ad 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -4,15 +4,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -23,318 +19,310 @@ msgstr ""
 "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"
 
-#: ../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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Asabistyja źviestki"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Pačni razmovu"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Dałučysia da _pakoju"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Dadaj kantakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Šukaj servisy"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Vykanaj zahad..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Madyfikuj kont"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Adčyni poštu Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Asabistyja źviestki"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Pačni razmovu"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Madyfikuj kont"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Stvareńnie kontu"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Stvarajecca kont</b>\n"
-"\n"
-"Kali łaska, pačakaj..."
+"Ty musiš mieć kont, kab dałučycca da sietki\n"
+"Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Kali łaska, abiary adnu z nastupnych opcyjaŭ:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Kali łaska, zapoŭni kartku źviestak dla novaha kontu</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Parol:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Zachavaj _parol"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Užyvaj aŭtaryzacyju"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Dałučysia pa nacisku knopki \"Skonč\""
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Stvareńnie kontu"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Užyvaj aŭtaryzacyju"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Kiruj..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Skarystaj admysłovy host/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Proxy:"
+msgid "_Hostname:"
+msgstr "Nazva hosta: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Zachavaj _parol"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Dadatkovyja"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Ty musiš mieć kont, kab dałučycca da sietki\n"
-"Jabber."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Skonč"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Nazva hosta: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Stvarajecca kont</b>\n"
+"\n"
+"Kali łaska, pačakaj..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Dałučysia pa nacisku knopki \"Skonč\""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Parol:"
+msgid "Set my profile when I connect"
+msgstr "Nastaŭ profil paśla złučeńnia"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Skonč"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Roznaje</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Nijaki"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Asabistyja źviestki</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Ułaścivaści</b>"
+msgid "Accounts"
+msgstr "Konty"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 #, fuzzy
-msgid "A_djust to status"
-msgstr "_Dastasuj da statusu"
+msgid "Add"
+msgstr "Adras"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Kont"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Vydal"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Konty"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "_Źmiani nazvu"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "Śpis administrataraŭ"
+msgid "_Enable"
+msgstr "Ukluč"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Užyvaj aŭtaryzacyju"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"Nazva krynicy paviedamlajecca serveru, kab toj moh adroźnić niekalki "
+"prahram, dałučanych da adnaho kontu. Tak ty možaš dałučycca da adnaho kontu "
+"i z domu, i z pracy. Paviedamleńni buduć skiroŭvacca na krynicu z "
+"najvyšejšym pryjarytetam. (hladzi nižej)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Aŭtamatyčna pieradałučajsia pry abryvie złučeńnia"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Pakažy _adłučanyja kantakty"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Prahladaj"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "_Zlučajsia pry starcie Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Ź_miani parol"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klikni, kab źmianić parol dla kontu"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "Śpis administrataraŭ"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Abiary fajł dla adsyłańnia..."
+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 ""
+"Pryjarytet vyznačaje, jakaja prahrama atrymvaje paviedamleńni z servera, "
+"kali niekalki prahram dałučanyja praz adzin kont. Prahrama z najvyšejšym "
+"pryjarytetam budzie atrymvać paviedamleńni"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Abiary _kluč..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Dastasuj da statusu"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klikni, kab źmianić parol dla kontu"
+msgid "Priority will change automatically according to your status."
+msgstr "Źmianiaj pryjarytet aŭtamatyčna zhodna z statusam."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "Pryjary_tet:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Niapravilnaje imia karystalnika"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "_Zlučajsia pry starcie Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Złučeńnie"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Imia:"
+msgid "Resour_ce:"
+msgstr "_Krynica:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Prahladaj"
 
 #: ../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 ""
-"Kali ŭklučanaja hetaja opcyja, Gajim zojmie dadatkovyja adrasy IP, kab "
-"pieradača fajłaŭ było šparčejšym."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
+msgid "Client certificate"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Kont"
 
 #: ../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 ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie dasyłać infarmacyjnyja pakiety "
-"dziela zapeŭnivańnia servera ŭ tym, što złučeńnie vykarystoŭvajecca"
+msgid "C_onnect on Gajim startup"
+msgstr "_Zlučajsia pry starcie Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -345,6 +333,18 @@ msgstr ""
 "praz hety kont"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Aŭtamatyčna pieradałučajsia pry abryvie złučeńnia"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Zachoŭvaj _žurnały razmoŭ dla ŭsich kantaktaŭ"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "_Synchranizuj status kontu z glabalnym statusam"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -353,185 +353,213 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, to źmieny glabalnaha statusu (z menu ŭnizie "
 "śpisu kantaktaŭ) buduć upłyvać na status hetaha kontu"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Kali zvyčajny port dla ŭvachodnych paviedamleńniaŭ nie pasuje, možaš vybrać "
-"inšy.\n"
-"Taksama moža spatrebicca źmianić nałady firewalla."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "JID:"
+msgid "Use file transfer proxies"
+msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Proźvišča:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim zojmie dadatkovyja adrasy IP, kab "
+"pieradača fajłaŭ było šparčejšym."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Źlej konty ŭ adno"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Ahulnaja"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Kluč nie abrany"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Asabistyja źviestki"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Kiruj..."
+
+#: ../data/gui/accounts_window.ui.h:40
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ułaścivaści</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Pryjary_tet:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Pryjarytet vyznačaje, jakaja prahrama atrymvaje paviedamleńni z servera, "
-"kali niekalki prahram dałučanyja praz adzin kont. Prahrama z najvyšejšym "
-"pryjarytetam budzie atrymvać paviedamleńni"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Źmianiaj pryjarytet aŭtamatyčna zhodna z statusam."
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "_Źmiani nazvu"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dasyłać infarmacyjnyja pakiety "
+"dziela zapeŭnivańnia servera ŭ tym, što złučeńnie vykarystoŭvajecca"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "_Krynica:"
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Skarystaj admysłovy host/port"
 
 #: ../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 ""
-"Nazva krynicy paviedamlajecca serveru, kab toj moh adroźnić niekalki "
-"prahram, dałučanych da adnaho kontu. Tak ty možaš dałučycca da adnaho kontu "
-"i z domu, i z pracy. Paviedamleńni buduć skiroŭvacca na krynicu z "
-"najvyšejšym pryjarytetam. (hladzi nižej)"
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nazva hosta: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Zachoŭvaj _žurnały razmoŭ dla ŭsich kantaktaŭ"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Roznaje</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
+msgid "Connection"
+msgstr "Złučeńnie"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "_Synchranizuj status kontu z glabalnym statusam"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Kluč nie abrany"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "_Synchranizuj status kontu z glabalnym statusam"
+msgid "Choose _Key..."
+msgstr "Abiary _kluč..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Pakažy _adłučanyja kantakty"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Skarystaj admysłovy host/port"
+msgid "_Edit Personal Information..."
+msgstr "Źmiani asabistyja źviestki..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Užyvaj admysłovy port:"
+msgid "Information about you, as stored in the server"
+msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Asabistyja źviestki</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Asabistyja źviestki"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Źmiani asabistyja źviestki..."
+msgid "Co_nnect on Gajim startup"
+msgstr "_Zlučajsia pry starcie Gajim"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Ukluč"
+msgid "Synchroni_ze account status with global status"
+msgstr "_Synchranizuj status kontu z glabalnym statusam"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Nazva hosta: "
+msgid "Use cust_om port:"
+msgstr "Užyvaj admysłovy port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Kiruj..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Kali zvyčajny port dla ŭvachodnych paviedamleńniaŭ nie pasuje, možaš vybrać "
+"inšy.\n"
+"Taksama moža spatrebicca źmianić nałady firewalla."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Imia:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "_Port:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Proźvišča:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "JID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Źlej konty ŭ adno"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Kont:"
+msgid "Add New Contact"
+msgstr "Dadaj novy kantakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "_Dazvol hetamu kantaktu bačyć moj status"
+msgid "A_ccount:"
+msgstr "_Kont:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Dadaj novy kantakt"
+msgid "_Protocol:"
+msgstr "_Pratakoł:"
 
-#: ../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 "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ID karystalnika:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Mianuška:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Hrupa:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "_Dazvol hetamu kantaktu bačyć moj status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Aŭtaryzacyja"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -543,7 +571,11 @@ msgstr ""
 "Klikni pa knopcy rehistracyi\n"
 "dla praciahu."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Rehistruj"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -551,386 +583,190 @@ msgstr ""
 "Treba złučycca z šluzam, kab mahčy dadavać kantakty\n"
 "z hetaha pratakołu."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Hrupa:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Mianuška:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Pratakoł:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Rehistruj"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Aŭtaryzacyja"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ID karystalnika:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Adbyłasia pamyłka:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Zahady ad-hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Abiary zahad dla vykanańnia:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Kali łaska, pačakaj kanca atrymańnia śpisu zahadaŭ..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Zahady ad-hoc - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Abiary zahad dla vykanańnia:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Spraŭdź nanoŭ"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Apisańnie pamyłki..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Kali łaska, pačakaj kanca dasyłańnia zahadu..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Skonč"
+msgid "Please wait..."
+msgstr "Kali łaska, pačakaj..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Kali łaska, pačakaj kanca atrymańnia śpisu zahadaŭ..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Hety abjekt Jabber nia maje dastupnych zahadaŭ."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Kali łaska, pačakaj kanca dasyłańnia zahadu..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Adbyłasia pamyłka:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Kali łaska, pačakaj..."
+msgid "Error description..."
+msgstr "Apisańnie pamyłki..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Hety abjekt Jabber nia maje dastupnych zahadaŭ."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Skonč"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Apisańnie</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Redaktar dadatkovych naładaŭ"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>UVAHA:</b> Kab ubačyć niekatoryja źmieny, uruchom Gajim"
+msgid "Filter:"
+msgstr "Filter:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Redaktar dadatkovych naładaŭ"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Apisańnie</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>UVAHA:</b> Kab ubačyć niekatoryja źmieny, uruchom Gajim"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Viarni zvyčajnyja kolery"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Vydal MOTD"
+msgid "Show _XML Console"
+msgstr "Pakažy _kansol XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Śpisy pryvatnaści"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administratar"
+
 #: ../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"
+#, fuzzy
+msgid "_Send Server Message..."
+msgstr "_Dašli paviedamleńnie servera"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-#, fuzzy
-msgid "Set MOTD..."
-msgstr "Vyznač MOTD"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Vyznač paviedamleńnie dniu"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Pakažy _kansol XML"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Vyznač MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Aktualizuj paviedamleńnie dniu"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Aktualizuj MOTD"
 
-#: ../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:11
-msgid "_Administrator"
-msgstr "_Administratar"
+msgid "Delete MOTD"
+msgstr "Vydal MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Dašli paviedamleńnie servera"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " akno/kartka razmovy z hetym kantaktam adčynienaja "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Dziejańni</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Umovy</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Huki</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Admysłovyja dziejańni"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Pašyranyja nałady nahadvańnia"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Usie statusy"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Adyjšoŭ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Zaniaty"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kantakt źmianiŭ status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kantakt adłučyŭsia"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Razmaŭlaju "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Pieradačy fajłaŭ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Zapyt na pieradaču fajłu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Pieradača fajłu spyniena"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Novaje paviedamleńnie ŭ pakoji"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Nie razmaŭlaju "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Niabačny"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Vykanaj zahad"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Niedastupny"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Adzin ci niekalki admysłovych statusaŭ..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Dałučany / Achvotna parazmaŭlaju"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Ahuč"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Novaje pryvatnaje paviedamleńnie"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kali "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Mirgaj vyjavaj na paneli zadańniaŭ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Nie adčyniaj aŭtamatyčna voknaŭ razmovy"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Nie pakazvaj vypłyŭnych voknaŭ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Nie ahučvaj hetaj padzieji"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Nie pakazvać paviedamleńniaŭ u śpisie kantaktaŭ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Paviedam mnie ŭ vypłyŭnym aknie"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Adčyni akno razmovy z karystalnikam"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "u časie, kali "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kantakty"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "dla "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Hrupa"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "kali maju "
+msgid "Deletes Message of the Day"
+msgstr "Vydal paviedamleńnie dniu"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Nijaki"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Nałady"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Aŭtamatyčna dałučajsia"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Nijaki"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Nałady"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Aŭtamatyčna dałučajsia"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Zapis:"
+msgid "New entry received"
+msgstr "Atrymaŭ novy zapis"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Atrymaŭ novy zapis:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Nazva kanału:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Zapis:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Apošniaja źmiena:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Atrymaŭ novy zapis"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Atrymaŭ novy zapis:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
@@ -938,28 +774,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -967,322 +798,318 @@ msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 msgid "<b>Mood:</b>"
 msgstr "<b>Huki</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Źmiani parol"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Paŭtary parol dla paćvierdžańnia:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Uviadzi novy parol:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Paŭtary parol dla paćvierdžańnia:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Uviadzi novaje paviedamleńnie statusu</b>"
+msgid "Save as Preset..."
+msgstr "Zachavaj jak šablon..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Dziejny"
+msgid "Mood:"
+msgstr "Pakoj:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Pakoj:"
+msgid "Activity:"
+msgstr "Dziejny"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Šablony paviedamleńniaŭ statusu:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Zachavaj jak šablon..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Uviadzi novaje paviedamleńnie statusu</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Dałučysia da _pakoju"
+msgid "_Copy Link Location"
+msgstr "S_kapijuj adras spasyłki"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Dadaj u śpis kantaktaŭ"
+msgid "_Open Link in Browser"
+msgstr "_Adčyni spasyłku ŭ hartačy"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "S_kapijuj JID/Email"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "S_kapijuj adras spasyłki"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Adčyni paštovuju prahramu"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Adčyni spasyłku ŭ hartačy"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Pačni razmovu"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "№"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Dałučysia da _pakoju"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Dadaj u śpis kantaktaŭ"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dadaje kantakt u śpis kantaktaŭ"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "sočyć za razmovaj"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "sočyć za razmovaj"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "№"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Dašli paviedamleńnie"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Vyšli"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "_Zaprasi"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Naziralniki"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr ""
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Spytaj _dazvołu bačyć jahony/jejny status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:5
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Dadaj admysłovaje _nahadvańnie"
+msgid "MUC server"
+msgstr "Naziralniki"
 
-#: ../data/gui/contact_context_menu.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Pryznač kluč Open_PGP"
+msgid "In_vite"
+msgstr "_Zaprasi"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Vykanaj zahad..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Pačni _razmovu"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Dašli _asobnaje aviedamleńnie..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Źmiani _hrupy"
+msgid "Send _File..."
+msgstr "Vyšli _fajł"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kantakty"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Vydal"
+msgid "Toggle End to End Encryption"
+msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Dasyłaje svoj XML"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Vykanaj zahad..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Dašli _asobnaje aviedamleńnie..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Źmiani nazvu kantaktu"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Vyšli _fajł"
+msgid "_Rename..."
+msgstr "Źmiani _nazvu"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Źmiani _hrupy"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Pačni _razmovu"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Pryznač kluč Open_PGP"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Dadaj admysłovaje _nahadvańnie"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Aŭtaryzacyja"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Dazvol jamu/joj _bačyć moj status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "_Dazvol hetamu kantaktu bačyć moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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 ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Spytaj _dazvołu bačyć jahony/jejny status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Žurnał razmoŭ"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Źmiani nazvu kantaktu"
+msgid "_Unignore"
+msgstr "dziaviataja"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "Źmiani _nazvu"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Aŭtaryzacyja"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Vydal"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "dziaviataja"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Žurnał razmoŭ"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Zapoŭni formu."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Kanfihuracyja pakoju"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Zapoŭni formu."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Źmiani hrupy"
@@ -1296,137 +1123,155 @@ msgstr "<b>Apisańnie</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Zdolnaści serveraŭ"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
+msgid "File Transfers"
+msgstr "Pieradačy fajłaŭ"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Anuluj pieradaču fajła"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Pakažy śpis pieradačaŭ fajłaŭ"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Anuluj abranuju pieradaču fajła"
+msgid "file transfers list"
+msgstr "śpis pieradačaŭ fajłaŭ"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Anuluj abranuju pieradaču fajła i vydal niedaciahnuty fajł"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Pry_biarysia"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Pieradačy fajłaŭ"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Schavaj akno"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Vydal skončanyja, anulavanyja i chibnyja pieradačy fajłaŭ ź śpisa"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Vydal pieradaču fajła ź śpisu."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Vydal skončanyja, anulavanyja i chibnyja pieradačy fajłaŭ ź śpisa"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Pakažy śpis pieradačaŭ fajłaŭ"
-
-#: ../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 "Hetaje dziejańnie anuluje pieradaču fajła i vydalić jaje ź śpisu."
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Pry_biarysia"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Prypyni"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Anuluj abranuju pieradaču fajła i vydal niedaciahnuty fajł"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Praciahni"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Anuluj pieradaču fajła"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
+msgid "Cancels the selected file transfer"
+msgstr "Anuluj abranuju pieradaču fajła"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Adčyni kataloh z fajłam"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Schavaj akno"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Prypyni"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Praciahni"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "śpis pieradačaŭ fajłaŭ"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Adčyni kataloh z fajłam"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Kolery kartak u aknie razmoŭ</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Kont"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Tłusty"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Hrupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kantakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Uvod paviedamleńnia"
+msgid "Gajim Themes Customization"
+msgstr "Kanfihuracyja temy Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kantakt"
+msgid "Text _color:"
+msgstr "Koler _tekstu:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Styl šryftu:"
+msgid "_Background:"
+msgstr "_Fon:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Kanfihuracyja temy Gajim"
+msgid "Text _font:"
+msgstr "_Šryft:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Vyjšaŭ"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Hrupa"
+msgid "Font style:"
+msgstr "Styl šryftu:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Pasiŭny"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Tłusty"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Nachileny"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Prypynienaja"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Uvod paviedamleńnia"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Pasiŭny"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Kolery kartak u aknie razmoŭ</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Vyjšaŭ"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1434,7 +1279,7 @@ msgstr ""
 "MUC\n"
 "Paviedamleńni"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1442,22 +1287,6 @@ msgstr ""
 "Razmova\n"
 "Paviedamleńni"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Prypynienaja"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Koler _tekstu:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Šryft:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Fon:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1465,91 +1294,101 @@ msgstr "Źmiani _mianušku"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Kiruj zakładkami"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Źmiani _temu"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Kanfihuruj _pakoj"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Stvary zakładku dla hetaja pakoju"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Apisańnie: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Kiruj zakładkami"
+msgid "_Request Voice"
+msgstr "_Daj hołas"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Stvary zakładku dla hetaja pakoju"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Ma_deratar"
+msgid "_Send Private Message"
+msgstr "_Dasłać pryvatnaje paviedamleńnie"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Vyšli _fajł"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Dziejańni haspadara"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Vyšli _fajł"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Dadaj u śpis kantaktaŭ"
+msgid "_Voice"
+msgstr "_Daj hołas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Ma_deratar"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Udzielnik"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administratar"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "Za_blakuj"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Uładalnik"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Vypchni"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Udzielnik"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Uładalnik"
+msgid "_Ban"
+msgstr "Za_blakuj"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Dasłać pryvatnaje paviedamleńnie"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Daj hołas"
+msgid "_Add to Roster"
+msgstr "_Dadaj u śpis kantaktaŭ"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Stvary zakładku dla hetaja pakoju"
+msgid "Show a list of formattings"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Źmiani _mianušku"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Źmiani _mianušku"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Stvary zakładku dla hetaja pakoju"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1561,11 +1400,29 @@ msgid "From:"
 msgstr "Ad:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
+msgid "Gajim History Logs Manager"
+msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
+
+#: ../data/gui/history_manager.ui.h:2
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
+
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:6
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1581,203 +1438,190 @@ msgstr ""
 "Kali chočaš ździejśnić masavuju čystku žurnałaŭ, to začyni Gajim. Nie "
 "vydalaj žurnały razmoŭ ź ludźmi, ź jakimi ŭ hety čas razmaŭlaješ."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Vydal"
+#: ../data/gui/history_manager.ui.h:8
+msgid "_Search Database"
+msgstr "_Šukaj u bazie žurnałaŭ"
 
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:9
 msgid "Export"
 msgstr "Ekspartuj"
 
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Kiraŭnik žurnałaŭ razmoŭ 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"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
-msgid "_Search Database"
-msgstr "_Šukaj u bazie žurnałaŭ"
-
 #: ../data/gui/history_window.ui.h:1
 #, fuzzy
-msgid "All Chat Histories"
-msgstr "Старыя казкі"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Žurnał razmoŭ"
-
-#: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Nazva kantaktu"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Pakoji"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Старыя казкі"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Žurnał razmoŭ"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Šukaj"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Zachoŭvaj žurnał razmoŭ"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Host:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Dałučajsia da hetaha pakoju aŭtamatyčna pry kožnym złučeńni"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Pakoj:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Mianuška:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Niadaŭna:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Parol:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Niadaŭna:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Dałučajsia da hetaha pakoju aŭtamatyčna pry kožnym złučeńni"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Pakoj:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Stvary zakładku dla hetaja pakoju"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "_Stvary zakładku dla hetaja pakoju"
+msgid "Bro_wse Rooms"
+msgstr "_Prahladaj"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Dałučysia"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Aŭtamatyčna dałučajsia"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
-"starcie"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Kiruj zakładkami"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Zahałovak:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Pakazvaj status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Aŭtamatyčna dałučajsia"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Zahałovak:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1790,103 +1634,106 @@ msgid "_Configure"
 msgstr "_Praciahni"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Ułaścivaści</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Złučeńnie HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Nałady</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Złučeńnie HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Kiruj profilami proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Parol:"
+msgid "_Name:"
+msgstr "_Imia:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Ułaścivaści</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Port:"
+msgid "Use HTTP prox_y"
+msgstr "S_karystaj proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "S_karystaj proxy"
+msgid "_BOSH URL:"
+msgstr "_URL:"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Užyvaj aŭtaryzacyju"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Imia karystalnika:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL:"
+msgid "Pass_word:"
+msgstr "_Parol:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Imia:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Typ:"
+msgid "Proxy _Port:"
+msgstr "_Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Imia karystalnika:"
+msgid "<b>Settings</b>"
+msgstr "<b>Nałady</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Kiruj kontami"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Parol"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Aŭtaryzuj"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Dastupny"
+msgid "Version:"
+msgstr "Versija GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Praciahni"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Apisańnie: %s"
+msgid "Authors:"
+msgstr "_Aŭtaryzuj"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1894,39 +1741,32 @@ msgid "Homepage:"
 msgstr "Chatniaja staronka:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Zatrymana"
+msgid "Description:"
+msgstr "Apisańnie: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Praciahni"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Zatrymana"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1940,523 +1780,505 @@ msgid "Event desc"
 msgstr "Padzieji"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Redaktar dadatkovych naładaŭ</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikacyi</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Asablivy</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Dziejańni</b>"
+msgid "All chat states"
+msgstr "Usie statusy"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Dziejańni</b>"
+msgid "Composing only"
+msgstr "Uvod paviedamleńnia"
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Redahuj praviła</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Adklučana"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Kolery kartak u aknie razmoŭ</b>"
+msgid "Never"
+msgstr "_Nikoli"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Vizualnyja nahadvańni</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Umovy</b>"
+msgid "Always"
+msgstr "Adyjšoŭ"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Vynyrni"
 
-#. 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>Asablivy</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Paviedam mnie pra heta"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Huki</b>"
+msgid "Show only in roster"
+msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opcyi GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Śpis pryvatnaści</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
+msgid "Last state"
+msgstr "Apošni status: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Nałady"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Ułaścivaści</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Dadaj praviła</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+"śpisie kantaktaŭ i ŭ pakojach"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Vizualnyja nahadvańni</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
+"kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Pašyranyja"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Pašyranyja"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+"śpisie kantaktaŭ i ŭ pakojach"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Usie statusy"
+msgid "Sort contacts by status"
+msgstr "_Paradkuj kantakty pa statusie"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
+#, fuzzy
+msgid "in _roster"
+msgstr "Niama ŭ śpisie kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
+msgid "in _group chats"
+msgstr "Dałučysia da _pakoju"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Pakazvaj vypłyŭnyja vokny i nahadvańni, kali ja ŭ stanie _Adyjšoŭ/"
-"Niedastupny/Zaniaty/Niabačny"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Adyjšoŭ"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
+"(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Spytaj paviedamleńnia statusu, kali ja:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Smajliki:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Hrupuj vokny:"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Chavaje knopki ŭ aknie pakoju."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "Pa_viedamleńnie statusu:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Niekatoryja paviedamleńni źmiaščajuć afarmleńnie tekstu (farmatavańnie, "
+"kolery i h.d.). Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać tekst "
+"biez afarmleńnia."
 
 #: ../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"
+msgid "_Highlight misspelled words"
+msgstr "_Padśviatlaj słovy z pamyłkami"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Uvod paviedamleńnia"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Kanfihuruj koler i šryft interfejsu"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Pakažy _śpis kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Pa_viedamleńnie statusu:"
+msgid "Show icon when your messages are received"
+msgstr "Huk, jaki treba hrać pry atrymańni novaha hrupavoha paviedamleńnia."
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Nazva kantaktu"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Asablivy</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Redahuj praviła</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Kali ŭčyniajecca novaja padzieja"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Gajim budzie paviedamlać ab adłučeńni kantaktaŭ ad servera ŭ pravym nižnim "
+"kucie ekranu"
 
-#: ../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:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Pakazvaj vypłyŭnyja vokny i nahadvańni, kali ja ŭ stanie _Adyjšoŭ/"
+"Niedastupny/Zaniaty/Niabačny"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+msgid "Notify on new _GMail email"
+msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
+"źviestki pra aŭtaraŭ novych listoŭ"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+msgid "Display _extra email details"
+msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
+"źviestki pra aŭtaraŭ novych listoŭ"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opcyi GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+msgid "Show notification area icon:"
+msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizualnyja nahadvańni</b>"
 
 #: ../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 umieje vysyłać i atrymvać metaźviestki, źviazanyja z razmovaj z peŭnym "
-"kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba "
-"pakazvać u voknach razmoŭ."
+msgid "Play _sounds"
+msgstr "_Ahučvaj"
 
 #: ../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 umieje vysyłać i atrymvać metaźviestki, źviazanyja z razmovaj z peŭnym "
-"kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba dasyłać "
-"surazmoŭcam."
+msgid "Ma_nage..."
+msgstr "_Kiruj..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 msgstr ""
-"Gajim budzie paviedamlać ab adłučeńni kantaktaŭ ad servera ŭ pravym nižnim "
-"kucie ekranu"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Huki</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "Chavaje knopki ŭ aknie pakoju."
+msgid "Notifications"
+msgstr "Madyfikacyja kontu"
 
 #: ../data/gui/preferences_window.ui.h:59
-#, fuzzy
 msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
+"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 ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
-"starcie"
+"Gajim umieje vysyłać i atrymvać metaźviestki, źviazanyja z razmovaj z peŭnym "
+"kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba "
+"pakazvać u voknach razmoŭ."
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
-"źviestki pra aŭtaraŭ novych listoŭ"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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 umieje vysyłać i atrymvać metaźviestki, źviazanyja z razmovaj z peŭnym "
+"kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba dasyłać "
+"surazmoŭcam."
 
 #: ../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 ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
-"śpisie kantaktaŭ i ŭ pakojach"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Vizualnyja nahadvańni</b>"
 
 #: ../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 ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
-"kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Asabistyja źviestki"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
-"śpisie kantaktaŭ i ŭ pakojach"
+msgid "_Away after:"
+msgstr "Aŭtamatyčna źmianiać stan na \"_Adyjšoŭ\" praz:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
-"śpisie kantaktaŭ i ŭ pakojach"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
-"śpisie kantaktaŭ i ŭ pakojach"
+msgid "_Not available after:"
+msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
-"śpisie kantaktaŭ i ŭ pakojach"
 
 #: ../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 ""
+msgid "minutes"
+msgstr "chvilinaŭ"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Uklučy hetuju opcyju, kali tabie nadakučvaje ci zakidvaje niepatrebnymi "
-"paviedamleńniami chtości, kaho navat niama ŭ śpisie kantaktaŭ. Ale zvažaj, "
-"što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
-"tabie paviedamleńnie"
-
-#: ../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."
+"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 ""
 
-#: ../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 ""
-"Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
-"źviestki pra aŭtaraŭ novych listoŭ"
-
 #: ../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, "
-"etc...)"
-msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać admysłovyja ikony dla "
-"kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
-"MSN)"
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
-"(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Dziejańni</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "_Hrupuj vokny:"
+msgid "Ask status message when I:"
+msgstr "Spytaj paviedamleńnia statusu, kali ja:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "_Kiruj..."
+msgid "Sign _in"
+msgstr "_Dałučajusia"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Nikoli"
+msgid "Sign _out"
+msgstr "_Adłučajusia"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Madyfikacyja kontu"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
+msgid "<b>Status Messages</b>"
+msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
 #: ../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: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Paviedam mnie pra heta"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
+msgid "Use system _default"
+msgstr "Užyvaj _zmoŭčany dla systemy"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Pa_viedamleńnie statusu:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Asabistyja źviestki"
+msgid "<b>Font</b>"
+msgstr "<b>Huki</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "_Ahučvaj"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Užyvaj _ikony transpartaŭ"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Vynyrni"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać admysłovyja ikony dla "
+"kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
+"MSN)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Nałady"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Standartny zbor _ikon statusu:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Kanfihuruj koler i šryft interfejsu"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Ułaścivaści</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
+msgid "Contact's nickname:"
+msgstr "Nazva kantaktu"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
+msgid "Your nickname:"
+msgstr "П_ерад мянушкай:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Dałučajusia"
+msgid "_Status message:"
+msgstr "Pa_viedamleńnie statusu:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Adłučajusia"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Viarni zvyčajnyja kolery"
 
 #: ../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 ""
-"Niekatoryja paviedamleńni źmiaščajuć afarmleńnie tekstu (farmatavańnie, "
-"kolery i h.d.). Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać tekst "
-"biez afarmleńnia."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Pa_viedamleńnie statusu:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "_Paradkuj kantakty pa statusie"
+msgid "Your message:"
+msgstr "Tekst pamyłki: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Standartny zbor _ikon statusu:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Kolery kartak u aknie razmoŭ</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2464,569 +2286,590 @@ msgid "Style"
 msgstr "Zatrymana"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Dziejańni</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Užyvaj _ikony transpartaŭ"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Dadaj praviła</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Užyvaj _zmoŭčany dla systemy"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Kali ŭčyniajecca novaja padzieja"
+msgid "<b>Connection</b>"
+msgstr "<b>Umovy</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Tekst pamyłki: %s"
+msgid "_File manager:"
+msgstr "_Kiraŭnik fajłaŭ:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "П_ерад мянушкай:"
+msgid "_Mail client:"
+msgstr "_Paštovaja prahrama:"
 
 #: ../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:121
 msgid "_Browser:"
 msgstr "_Hartač:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
+msgid "<b>Custom</b>"
+msgstr "<b>Asablivy</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Smajliki:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikacyi</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Kiraŭnik fajłaŭ:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Padśviatlaj słovy z pamyłkami"
+#, fuzzy
+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 ""
+"Uklučy hetuju opcyju, kali tabie nadakučvaje ci zakidvaje niepatrebnymi "
+"paviedamleńniami chtości, kaho navat niama ŭ śpisie kantaktaŭ. Ale zvažaj, "
+"što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
+"tabie paviedamleńnie"
 
 #: ../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ŭ"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
 
 #: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Paštovaja prahrama:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Adčyni..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Viarni zvyčajnyja kolery"
-
-#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
+msgid "Allow my _idle time to be sent"
+msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "Pa_viedamleńnie statusu:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Śpis pryvatnaści</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
 #: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
-msgid "in _group chats"
-msgstr "Dałučysia da _pakoju"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Niama ŭ śpisie kantaktaŭ"
+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:139
-msgid "minutes"
-msgstr "chvilinaŭ"
+msgid "_Open..."
+msgstr "_Adčyni..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Redaktar dadatkovych naładaŭ</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Pašyranyja"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Śpisy pryvatnaści:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Dadaj / Źmiani praviła</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Śpis pryvatnaści"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Śpis praviłaŭ</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Śpis pryvatnaści</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Dziejny dla hetaj sesii"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Dziejny pry kožnym starcie"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Śpis praviłaŭ</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "usim"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Dadaj / Źmiani praviła</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "pavodle aŭtaryzacyi"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Dazvol"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Admoŭ"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "pavodle hrupy"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Paradak:"
+msgid "all by subscription"
+msgstr "pavodle aŭtaryzacyi"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Śpis pryvatnaści"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "usim"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "pavodle aŭtaryzacyi"
+msgid "to send me messages"
+msgstr "dasyłać mnie paviedamleńni"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "pavodle hrupy"
+msgid "to send me queries"
+msgstr "dasyłać mnie apytańni"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Dvuchbakovaja"
+msgid "to view my status"
+msgstr "bačyć moj status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Ad"
+msgid "to send me status"
+msgstr "dasyłać mnie paviedamleńni statusu"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "pieršaja"
+msgid "All (including subscription)"
+msgstr "pavodle aŭtaryzacyi"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "druhaja"
+msgid "Order:"
+msgstr "Paradak:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "dasyłać mnie paviedamleńni"
+#, fuzzy
+msgid "none"
+msgstr "pieršaja"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "dasyłać mnie apytańni"
+#, fuzzy
+msgid "both"
+msgstr "Dvuchbakovaja"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "dasyłać mnie paviedamleńni statusu"
-
-#: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "bačyć moj status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Dadaj praviła</b>"
+msgid "from"
+msgstr "Ad"
 
-#: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Avatar:"
+msgid "to"
+msgstr "druhaja"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Narodziny:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Asablivy</b>"
+msgid "<b>Family:</b>"
+msgstr "Proźvišča:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Asablivy</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Huki</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Dadaj praviła</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Addzieł:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "E-mail:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Ułaścivaści</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Dadatkovy adras:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Proźvišča:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Huki</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Asablivy</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Nałady</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Asablivy</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Chatniaja staronka:"
+msgid "<b>State:</b>"
+msgstr "<b>Nałady</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Dadatkovy adras:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Dadaj praviła</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Paštovy indeks:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Asablivy</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Huki</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Mianuška:"
+msgid "<b>Address</b>"
+msgstr "<b>Dadaj praviła</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Telefon:"
+msgid "<b>Homepage:</b>"
+msgstr "Chatniaja staronka:"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Umovy</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Asablivy</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Paštovy indeks:"
+msgid "<b>Nickname:</b>"
+msgstr "Mianuška:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Ułaścivaści</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Telefon:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Farmat: HHHH-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Huki</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Narodziny:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Nałady</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "E-mail:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Nałady</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Avatar:"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Klikni, kab vystavić svoj avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Asabistyja źviestki"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Huki</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Asablivy</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Pra siabie"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Umovy</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Klikni, kab vystavić svoj avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Addzieł:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Farmat: HHHH-MM-DD"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Huki</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Asabistyja źviestki"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Praca"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Što chočaš zrabić?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Pra siabie"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Vydal kont _tolki dla Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Vydal kont i dla Gajim, i na _servery"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Što chočaš zrabić?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Vydal"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Tak"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Dadaj kantakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Dziejańni"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Zdolnaści serveraŭ"
+msgid "Add _Contact..."
+msgstr "_Dadaj kantakt..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Pieradačy _fajłaŭ"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Źmianić"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Častyja pytańni (online)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Konty"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Dapamoha online"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, a_vatar"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Vyhlad"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Pakažy _adłučanyja kantakty"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Pakažy _transparty"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Pakažy _adłučanyja kantakty"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Pakažy _śpis kantaktaŭ"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Konty"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Pieradačy _fajł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:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Dziejańni"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Dapamoha"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Źmiest"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Źmianić"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Dapamoha online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_Častyja pytańni"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Dapamoha"
-
-#: ../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
+msgid "Frequently Asked Questions (online)"
+msgstr "Častyja pytańni (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Vyhlad"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Kali łaska, pačakaj kanca atrymańnia śpisu zahadaŭ..."
+msgid "Fea_tures"
+msgstr "Zdolnaści serveraŭ"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Šukaj"
 
+#: ../data/gui/search_window.ui.h:2
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Kali łaska, pačakaj kanca atrymańnia śpisu zahadaŭ..."
+
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "_Dadaj kantakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "Š_ukaj"
 
@@ -3046,42 +2889,37 @@ msgstr "Zarehistrujsia na"
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Adkažy na hetaje paviedamleńnie"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Da:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Dašli"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Dašli paviedamleńnie"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Dašli paviedamleńnie i začyni akno"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Adkažy"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Da:"
+msgid "Reply to this message"
+msgstr "Adkažy na hetaje paviedamleńnie"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Adkažy"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Dašli i začyni"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Dašli paviedamleńnie i začyni akno"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Aŭtaryzuj"
+msgid "Subscription Request"
+msgstr "Zapyt aŭtaryzacyi"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
-"Aŭtaryzuj kantakt, kab jon/jana mahli bačyć, kali ja dałučany da servera"
+msgid "_Deny"
+msgstr "_Admoŭ"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -3091,274 +2929,286 @@ msgstr ""
 "Admoŭ na zapyt aŭtaryzacyi kantaktu, kab jon/jana nie mahli bačyć, kali ja "
 "dałučany"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Zapyt aŭtaryzacyi"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Aŭtaryzuj"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Admoŭ"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+"Aŭtaryzuj kantakt, kab jon/jana mahli bačyć, kali ja dałučany da servera"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Pakažy _adłučanyja kantakty"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Ściš huki"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Vyšli _asobnaje paviedamleńnie"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Pakažy ŭsie niahledžanyja _padzieji"
-
-#: ../data/gui/systray_context_menu.ui.h:4
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Pakoj"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Dziejańni</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Vyšli _asobnaje paviedamleńnie"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Asablivy</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Nałady</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Ściš huki"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Źviestki ab kantakcie"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "JID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Krynica:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Nałady</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Apisańnie</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Asablivy</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Kamentary"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Nałady</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>User avatar:</b>"
+msgstr "Avatar:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Kanfihuruj _pakoj"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kantakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Apisańnie</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Źviestki ab kantakcie"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Dziejańni</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Bolš"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kantakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Huki</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Kamentary"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafik Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Uvod XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Źviestki/Apytańnie (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Huki</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Źviestki/Apytańnie (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "P_rysutnaść"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Paviedamleńnie"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "P_rysutnaść"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Uvod XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Madyfikuj kont..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lakalny JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Asabistyja źviestki"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Krynica:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Klijent Jabber dla GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Asabistyja źviestki"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Kamunikatar Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Klijent Jabber dla GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Niapravilny zapis"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Zahady ad-hoc - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Dziejny"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Niadziejny"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Lahičnaja źmiennaja"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Cely lik"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Koler"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Nazva nałady"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Vartaść"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Niama)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Schavany"
 
@@ -3370,240 +3220,178 @@ msgstr[0] "Atrymaŭ novy zapis:"
 msgstr[1] "Atrymaŭ novy zapis:"
 msgstr[2] "Atrymaŭ novy zapis:"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Anhielskaja"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Biełaruskaja"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Baŭharskaja"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Breton"
-msgstr "Brytonskaja"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Českaja"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Niamieckaja"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Hreckaja"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Brytanskaja"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Hišpanskaja"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
+#: ../src/chat_control.py:209
+msgid "Ping?"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francuzkaja"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Charvackaja"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italijskaja"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Narveskaja (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Halandzkaja"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Narveskaja"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polskaja"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Partuhalskaja"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazilskaja partuhalskaja"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Rasiejskaja"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Serbskaja"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Słavackaja"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Švedzkaja"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Kitajskaja (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Mova spraŭdžvańnia pravapisu"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Złučeńnie niemahčymaje"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "dziaviataja"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Mianuška"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Šryft:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Šyfravańnie ŭklučanaje"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Niama ŭ śpisie"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Niedastupny\""
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Vyšli _fajł"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
@@ -3611,66 +3399,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3678,250 +3466,612 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Pieradačy fajłaŭ"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Pamier: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Dazvol"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Pieradača fajłu skončana"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Zaprašeńnie ŭ pakoj"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Vydalaje kantakt sa śpisu"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Pamyłka adčytańnia fajłu:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Pieradača fajłu spyniena"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Pieradača fajłu anulavana"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "NIemahčyma złučycca ź inšym bokam."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nia znojdzieny"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Adyjšoŭ"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Dastupny"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Dasyłaje kantaktu fajł"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Klikni, kab pahladzieć tekt papiarednich razmoŭ z hetym kantaktam"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Złučeńnie niemahčymaje"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Złučeńnia niama"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Źmiani _mianušku"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
+"asobaj."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Mianuška nia znojdziena: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
+"asobaj."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Dašli %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Ty nie dałučyŭsia da pakoju."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Niapravilnaje imia karystalnika"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Suviaź: "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Užyvańnie: /%s, pakazvaje imiony naviednikaŭ pakoju."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Nie staje arhumenta \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim zaviaršaje vykanańnie"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "stvarajecca kataloh %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Źmiani infarmacyju statusu"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Źmiani status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Akreśli typ bačnaści i apisańnie"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Dałučany"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Adyjšoŭ"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Nie turbavać"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Niabačny - adłučany"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Apisańnie statusu:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Status źmianiŭsia."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Pakiń pakoji"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pakoju %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Zaznač pakoji, jakija chočaš pakinuć"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Pakoji"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Ty pakinuŭ nastupnyja pakoji:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d niečytanaje paviedamleńnie"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "%d niečytanaje paviedamleńnie"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Pakazvaj nahadvańni z dapamohaj DBus i Notification-Daemon"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Adyjšoŭ\"."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Status \"Adyjšoŭ\" jak vynik biaździejnaści prahramy"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Niedastupny\"."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Status \"Niedastupny\" jak vynik biaździejnaści prahramy"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "tekst paviedamleńnia statusu"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+
+#. red
+#: ../src/common/config.py:104
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Zapyt na pieradaču fajłu"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Pieradača fajłu anulavana"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Zaprašeńnie ŭ pakoj"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "tekst paviedamleńnia statusu"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Mova pravierki pravapisu"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3932,7 +4082,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nie pakazvaj času."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3942,18 +4092,18 @@ msgstr ""
 "adklučyć niedakładnaść. 1 akreślivaje samy dakładny čas, 4 akreślivaje samy "
 "niedakładny. Zadziejničana, kali opcyja print_time maje vartaść 'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znakaŭ * / _  jak znaki farmatavańnia."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Kali maje vartaść True, nie vydalaj */_ . Takim čynam *abc* budzie tłustym, "
 "ale i znaki * * nia vydalacca."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3965,14 +4115,14 @@ msgstr ""
 "rst/restructuredtext.html (Kali chočaš karystacca hetaj mahčymaściu, "
 "zainstaluj docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 "Znak, jaki dadajecca paśla mianuški pry dapaŭnieńni (klavišaj TAB) u pakoji."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3980,7 +4130,13 @@ msgstr ""
 "Znak, jaki dadajecca paśla mianuški, kali akreślenaja mianuška ŭžyvajecca ŭ "
 "movie inšaha ŭdzielnika pakoju."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3991,51 +4147,61 @@ msgstr ""
 "\". Hladzi padrabiaznyja źviestki ŭ dakumentacyi dla Pythonu pa funkcyi "
 "strftime: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, što pakazvajucca ŭ razmovie pierad mianuškaj"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, što pakazvajucca ŭ razmovie paśla mianuški"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Dadać * i [n] u zahałovak śpisu kantaktaŭ?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Kolki radkoŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym aknie."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Kolki chvilinaŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym "
 "aknie."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4043,11 +4209,11 @@ msgstr ""
 "Dasyłaj paviedamleńnie praz Ctrl+Enter, a Enteram stvaraj novy radok "
 "(zmoŭčanyja pavodziny Mirabilis ICQ)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolki radkoŭ zachoŭvać dla Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4056,12 +4222,12 @@ msgstr ""
 "Albo specyjalny adrasm jaki ŭtrymlivaje %s, dzie %s jość słovam/vyrazam, "
 "albo radok 'WIKTIONARY', što aznačaje vykarystańnie Wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajimam možna kiravać praz gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4073,14 +4239,14 @@ msgstr ""
 "maje vartaści False i jakija synchranizujucca z hlabalnym stanam) zhodna "
 "statusu sietkavaha złučeńnia."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4088,7 +4254,7 @@ msgstr ""
 "Pakazanyja nahadvańni stanu razmovy ŭ voknach. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4096,33 +4262,35 @@ msgstr ""
 "Kali čas pakazvajecca nie dla kožnaha paviedamleńnia "
 "(print_time==sometimes), pakazvaj jaho kožnyja x chvilinaŭ."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Zaŭsiody pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nikoli nie pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4131,28 +4299,34 @@ msgstr ""
 "Nadpisvaje host, jaki vysyłajecca dla Pieradačy fajłaŭ, u vypadku tranślacyi "
 "adrasoŭ/pieranakiravańnia partoŭ."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Pakazvać kartku, kali dziejnaja tolki adna razmova?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Pakazvać padzieł kartak u voknach razmovy?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4160,18 +4334,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Śpis padzielenych kropkaj z koskaj słovaŭ, jakija treba padśviatlać u "
 "pakojach."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4181,14 +4355,14 @@ msgstr ""
 "X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
 "nahadvańnia."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie praviarać, ci akreśleny jon jak "
 "zmoŭčany klijent Jabber."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4197,7 +4371,7 @@ msgstr ""
 "niečytanymi paviedamleńniami. U zaležnaści ad matyvu, hetaja ikona moža być "
 "animavanaj."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4205,11 +4379,11 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim pakazvaje status kožnaha kantaktu, kali "
 "jon nie pusty, dla kožnaha elementu śpisu kantaktaŭ."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4218,7 +4392,7 @@ msgstr ""
 "kantaktu, jaki nia mieŭ avatara byłym razam, albo kali buferavany avatar "
 "sastareje."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4226,9 +4400,10 @@ msgstr ""
 "Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
 "surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4241,30 +4416,34 @@ msgstr ""
 "vartaść \"in_and_out\", Gajim budzie pakazvać tolki paviedamleńni ab "
 "dałučeńni/adłučeńni surazmoŭcaŭ."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki adłučylisia."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Kali opcyja maje vartaść True, adnoŭlenyja paviedamleńni buduć pakazvacca "
 "mienšym za zmoŭčany šryftam."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pakazvaj avatara dla transpartu."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pakazvaj śpis kantaktaŭ na paneli zadańniaŭ."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4274,7 +4453,7 @@ msgstr ""
 "albo paźniejšaj, mirhaj aknom (zmoŭčanyja pavodziny akna ŭ bolšaści "
 "Kiraŭnikoŭ voknaŭ) pry najaŭnaści niečytanych paviedamleńniaŭ."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4285,7 +4464,7 @@ msgstr ""
 "słać takija danyja SHA."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4294,7 +4473,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kiruje aknom, u jakim pakazvajucca novyja paviedamleńni.\n"
@@ -4305,34 +4484,42 @@ msgstr ""
 "pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
 "ŭruchomić Gajima nanoŭ."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Kali opcyja maje vartaść True, nacisk klavišy Escape začyniaje kartku/akno."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Chavaje knopki ŭ aknie pakoju."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Chavaje baner u aknie pakoju"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Chavaje baner u aknie pryvatnaj razmovy"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Chavaje śpis naviednikaŭ pakoju."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4340,29 +4527,29 @@ msgstr ""
 "U pakoji pakazvaj mianušku pierad paviedamleńniem, tolki kali jaho napisała "
 "nia taja asoba, što napisała papiaredniaje paviedamleńnie."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Dašli paviedamleńnie i začyni akno"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Śpis koleraŭ dla farbavańnia mianušak u pakojach."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab pierachodzić na nastupnuju kartku, kali na dziejnaj niama "
 "niečytanych paviedamleńniaŭ."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4370,7 +4557,7 @@ msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4379,7 +4566,7 @@ msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4388,7 +4575,7 @@ msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4398,7 +4585,7 @@ msgstr ""
 "madyfikacyi kontu. UHAVA: kali ty dałučajeśsia z admoŭnym pryjarytetam, to "
 "nia budzieš atrymvać paviedamleńniaŭ z servera."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4406,7 +4593,7 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
 "Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4415,7 +4602,7 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
 "Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4423,7 +4610,7 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie pakazvać kolkaść dałučanych "
 "kantaktaŭ i ahulnuju kolkaść kantaktaŭ u radkach kontaŭ i hrupaŭ."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4431,91 +4618,105 @@ msgstr ""
 "Moža być pustym albo mieć vartaść 'chat' ci 'normal'. Kali vartaść nie "
 "pustaja, traktuj usie ŭvachodnyja paviedamleńni jak paviedamleńni hetaha typu"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4523,85 +4724,98 @@ msgstr ""
 "Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
 "akreślivajucca ŭ opcyjach autopriority_*."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Abychod dla Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4609,141 +4823,190 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
 "adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s choča dasłać tabie fajł."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Užyvaj aŭtaryzacyju"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Užyvaj aŭtaryzacyju"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Mova, dla jakoj treba praviarać pravapis"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "\"all\" albo statusy, padzielenyja prabiełami"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' albo 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Splu"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuju"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4751,27 +5014,184 @@ 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:499
+#: ../src/common/config.py:527
 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:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zialony"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "bakaleja"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "čałaviek"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marski"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Da"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "zapyt adpiski ad %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Aŭtaryzacyja anulavanaja"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Niapravilny JID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "pamyłka dasyłańnia %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Novaje asobnaje paviedamleńnie"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Novaje pryvatnaje paviedamleńnie"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Novaje pryvatnaje paviedamleńnie ŭ pakoji %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Novaje paviedamleńnie ad %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Novaje paviedamleńnie"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Novaje paviedamleńnie ad %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s źmianiŭ status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s maje ciapier status %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kantakt źmianiŭ status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s dałučyŭsia"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kantakt dałučyŭsia"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s adłučyŭsia"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kantakt adłučyŭsia"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Niemahčyma adčytać modulu idle"
@@ -4781,215 +5201,193 @@ msgstr "Niemahčyma adčytać modulu idle"
 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:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Zarehistrujsia na %s"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "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: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 ""
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4998,108 +5396,118 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Pieradałučysia samastojna."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Niapravilny adkaz"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Niemahčyma złučycca z \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Pravier złučeńnie albo pasprabuj paźniej."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Niemahčyma złučycca z \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5108,68 +5516,68 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kantakty"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nia ściahnuta z-za niabačnaha statusu"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transparty"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Nie staje fajłaŭ padtrymki Python dla D-Bus na hetym kamputary"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Niemahčyma vykarystać mahčymaści D-Bus dla Gajima"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Busu niama na hetym kamputary, albo nie staje modula Python"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Busu niama na hetym kamputary, albo nie staje modula Python"
@@ -5185,7 +5593,7 @@ msgstr ""
 "Servis niedastupny: Gajim nie vykonvajecca, albo opcyja remote_control maje "
 "vartaść False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Busu niama na hetym kamputary, albo nie staje modula Python"
 
@@ -5370,224 +5778,232 @@ msgstr "Kaniec tydnia"
 msgid "Weekend!"
 msgstr "Vychodny!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Niapravilny znak u imiani karystalnika."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Niapravilny znak u naźvie hostu."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Patrabujecca adras servera."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Niapravilny znak u naźvie krynicy."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Niedastupny"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Adłučany"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "N_iabačny"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Niabačny"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?kantakt maje status:Nieviadomy"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?kantakt maje status:Jość pamyłki"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Ad"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Zapyt (aŭtaryzacyi):Niama"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Aŭtaryzuj"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administratar"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5595,22 +6011,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5618,21 +6034,40 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Niemahčyma adčytać vyjavu"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Niemahčyma adčytać vyjavu"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kanfihuracyja pakoju"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5644,111 +6079,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Pamier: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Fajł: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zialony"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
+msgid "Error: cannot open %s for reading"
+msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
@@ -6456,50 +6905,133 @@ msgstr ""
 msgid "Writing"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Zmoŭčany"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marski"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Vypichvajecca %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Krajina:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Kont"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Apisańnie"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Pamyłka Avahi"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "pieršaja"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "pakoj"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Niemahčyma dałučycca da portu %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ anulavanaja."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Pamyłka Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6508,46 +7040,45 @@ msgstr ""
 "%s\n"
 "Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Niemahčyma ŭruchomić lakalny servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niemahčyma dałučycca da portu %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Niemahčyma źmianić status kontu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6560,26 +7091,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Pamyłka dadańnia servisu. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Ukluč"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6588,215 +7119,216 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nazva"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Pieradałučycca?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Kali chočaš zadziejničać źmieny, treba pieradałučycca."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Akno razmovy adčynienaje dla kontu %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Prahrama dałučanaja da servera"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "Kab źmianić nazvu kontu, treba pračytać usie novyja paviedamleńni."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Taki kont užo zaniaty"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Nazva kontu nia moža być pustoj."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Nazva kontu nia moža ŭtrymlivać prabiełaŭ."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kiruj kontami"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "JID musić mieć formu \"user@servername\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Niemahčyma atrymać sakretnyja klučy"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Vybar kluča OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Abiary svoj kluč OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Takoha kontu niama"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "Treba stvaryć kont, kab redahavać asabistyja źviestki."
 
-#: ../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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Server nie padtrymvaje Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Kont Local užo isnuje."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Źmiani %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Zarehistrujsia na %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Śpis udzielnikaŭ"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Śpis ułaśnikaŭ"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Śpis administrataraŭ"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Pryčyna"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Mianuška"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Funkcyja"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Blakavańnie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6804,11 +7336,11 @@ msgstr ""
 "<b>Kaho chočaš zablakavać?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Dadajecca ŭdzielnik..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6816,11 +7348,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić udzielnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Dadajecca ŭłaśnik..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6828,11 +7360,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić ułaśnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Dadajecca administratar..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6840,7 +7372,7 @@ msgstr ""
 "<b>Kaho chočaš zrabić administrataram?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6857,115 +7389,111 @@ msgstr ""
 "4. damen (adpaviadaje damen, jak karystalnik@damen,\n"
 "damen/krynica ci paddamen)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Vydalajecca kont %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Vydal kont _tolki dla Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Usie"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Tolki ŭvachod i vychad"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Niama"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Kali łaska, pravier, ci vyznačanyja pali servera i pakoju, albo vydal hetuju "
 "zakładku."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Niapravilnaje imia karystalnika"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6975,34 +7503,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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Novy kont paśpiachova stvorany"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7012,7 +7540,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7020,81 +7548,98 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Praciahni"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Dziejny"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Padzieja"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Atrymanaje pieršaje paviedamleńnie"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Atrymanaje pieršaje paviedamleńnie"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Novy list na skryncy GMail"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7103,242 +7648,243 @@ msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Skonč pracu"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Šukaj u Web"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Učora"
 msgstr[1] "Učora"
 msgstr[2] "Učora"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazva kantaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Hrupa"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "U hrupie"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ID kluča"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nazva kantaktu"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Vyznač MOTD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Paviedamleńnie statusu %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 #, 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Zapišy jak šablon paviedamleńnia statusu"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Adras AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Adras MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Adras Yahoo!:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Jabber-klijent dla GTK+"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Klijent Jabber dla GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Versija GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Versija PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Dziejnyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Byłyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "PADZIAKI:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7349,109 +7895,161 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Złučeńnie"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "_Do not ask me again"
+msgstr "_Bolš nie pytajsia"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aŭtaryzacyi ad %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Užo ŭdzielničaješ u razmovie ŭ pakoji %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dałučysia da pakoju dla kontu %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Niapravilnaja spasyłka"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Heta nie pakoj"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Niapravilny JID pakoju"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Naźvie %s nie adpaviadaje nivodny pakoj."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 #, 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:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Pačni razmovu dla kontu %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7460,168 +8058,138 @@ msgstr ""
 "paviedamleńnie:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, 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:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Niemahčyma razabrać \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 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:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Niapravilny parol"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
-#. default value
-#: ../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:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Kantakt adłučyŭsia"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Novaje paviedamleńnie"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Novaje pryvatnaje paviedamleńnie"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Zaprašeńnie ŭ pakoj"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kantakt źmianiŭ status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Kansol XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Zatrymana"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Vydal"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7629,194 +8197,191 @@ 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:3220 ../src/dialogs.py:3266
-#, fuzzy
-msgid "Add"
-msgstr "Adras"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "JID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Hrupa"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Dadaj kantakt"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Dadaj kantakt"
+msgstr[1] "_Dadaj kantakt"
+msgstr[2] "_Dadaj kantakt"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Vydalaje kantakt sa śpisu"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Vydalaje kantakt sa śpisu"
+msgstr[1] "Vydalaje kantakt sa śpisu"
+msgstr[2] "Vydalaje kantakt sa śpisu"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Vyjavy"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Umova"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "kali maju "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7824,38 +8389,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7865,77 +8430,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "dla kontu %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Inšyja"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Kanferencyja"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Prahlad servisaŭ"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7943,443 +8546,428 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoŭ."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Taki servis nia ŭtrymlivaje elementaŭ dla ahladańnia."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Prahladaj"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia ŭtrymlivaje elementaŭ dla prahladu."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Vykanaj zahad..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanavańnie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Karystalniki"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Apisańnie"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Zakładka ŭžo dadana"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka paśpiachova dadanaja"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Aŭtaryzavany"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Nijaki"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Novy zapis"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Zahady: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Šyfravańnie OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "_Uvachodnaje paviedamleńnie:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Paroli roźniacca"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Madyfikacyja kontu"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Dastasuj da statusu"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Šyfravańnie OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Uvachodnaje paviedamleńnie:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Ahulnaja"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Dastupny"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Zdolnaści serveraŭ"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Fajł"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Prahres"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazva fajłu: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Pamier: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Pieradača fajłu skončana"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Pieradača fajłu anulavana"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "NIemahčyma złučycca ź inšym bokam."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Atrymoŭca: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Pieradača fajłu spyniena"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Apisańnie: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim nia moža dastupicca da hetaha fajłu"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Hety fajł vykarystoŭvajecca inšym pracesam."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Fajł: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Typ: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Apisańnie: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-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:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8387,33 +8975,64 @@ 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Zapišy fajł jak..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Fajł: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Typ: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Apisańnie: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s choča dasłać tabie fajł:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Dasyłańnie profilu..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Pamyłka pieradačy fajłu"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8421,69 +9040,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Niapravilny fajł"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Fajł: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nazva:"
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Prypyni"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "paviedamleńnie"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Smajliki:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Redaktar dadatkovych naładaŭ"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Kanfihuracyja pakoju"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu patrebny X-server. Vychad..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8492,12 +9148,11 @@ msgstr ""
 "kali łaska, pravier, ci instalavanaja biblijateka Pywin32. Jaje možna "
 "ściahnuć z %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim užo vykonvajecca"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8505,28 +9160,28 @@ msgstr ""
 "Gajim užo vykonvajecca\n"
 "Usio adno ŭruchomić?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Pakazvaje daviedku pa akreślenym zahadzie"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "zahad"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "pakažy daviedku pa zahadzie"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8534,51 +9189,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "kont"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "pakažy kantakty akreślenaha kontu"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Pakazvaje śpis zarehistravanych kontaŭ"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "paviedamleńnie"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "paviedamlennie statusu"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8587,20 +9246,48 @@ msgstr ""
 "dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Źmianiaje status kontu albo kontaŭ"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Pryjary_tet:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Ja chaču za_rehistravać novy kont"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8610,35 +9297,30 @@ msgstr ""
 "kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki 'kont', "
 "biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8648,135 +9330,132 @@ 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-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fajł"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Kali akreślena, fajł budzie dasłany z hetaha kontu"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "kluč=vartaść"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Vydalaje naładu"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "kluč"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nazva vydalenaj nałady"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dadaje kantakt u śpis kantaktaŭ"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Adčyniaje akno 'Pačni razmovu'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Pačynaje razmovu dla hetaha kontu"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Dasyłaje svoj XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML dla dasyłańnia"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8784,46 +9463,99 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Źmiani status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Mianuška nia znojdziena: %s"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for 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:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "źmiest paviedamleńnia"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Dałučysia da pakoju"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "pakoj"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "Room JID"
+msgstr "Pakoj:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "mianuška"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Mianuška nia znojdziena: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "parol"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Paroli roźniacca"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 #, 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
+#: ../src/gajim-remote.py:301
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8832,165 +9564,42 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Užyvańnie: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\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-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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Niapravilnaja spasyłka"
-
-#: ../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: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: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 ""
-"Viartaje dziejnaje paviedamleńnie statusu (hlabalnaha, kali nie akreśleny "
-"kont)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Źmiani status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Mianuška nia znojdziena: %s"
-
-#: ../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 ""
-"Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
-"dasłany na ŭsie konty"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "źmiest paviedamleńnia"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Pakoj:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Mianuška nia znojdziena: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "Paroli roźniacca"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8999,7 +9608,7 @@ msgstr ""
 "Nadta šmat arhumentaŭ. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9008,10 +9617,14 @@ msgstr ""
 "Arhument \"%s\" nie akreśleny. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Niapravilnaja spasyłka"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -9035,203 +9648,237 @@ msgid "You cannot delete your current theme"
 msgstr "Niemahčyma vydalić dziejnuju temu"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Kali łaska, zadziejničaj spačatku inšuju temu."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s ciapier viadomy jak %s"
+
+#: ../src/groupchat_control.py:236
 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:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Suviaź: "
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
@@ -9256,64 +9903,58 @@ msgstr "_Paviedam pra pamyłku"
 msgid "Details"
 msgstr "Padrabiaznaści"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie akreśleny jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chočaš zrabić Gajim zmoŭčanym klijentam Jabber?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Zapišy vyjavu jak..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9323,191 +9964,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:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Ty zablakavany ŭ hetym pakoji."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Takoha pakoju niama."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Stvareńnie pakojaŭ abmiežavanaje."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Dałučany biez kluča OpenPGP."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Musiš vyznačyć parol"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Vyznač parol GPG dla kontu %s."
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
 "źmiennaja asiarodździa niapravilna akreślenaja)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9515,7 +10142,7 @@ msgstr[0] "%d novy list"
 msgstr[1] "%d novyja listy"
 msgstr[2] "%d novych listoŭ"
 
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9525,103 +10152,88 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Vydalaje kantakt sa śpisu"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-#, fuzzy
-msgid "Error opening file"
-msgstr "Pamyłka adčytańnia fajłu:"
+msgid "File Transfer Failed"
+msgstr "Pieradačy fajłaŭ"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Dla kožnaha _paviedamleńnia"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9629,15 +10241,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9648,32 +10265,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9681,109 +10279,112 @@ msgid ""
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Vybar kluča OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Niapravilny parol"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "stvarajecca kataloh %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kantakty"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Mianuška"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Paviedamleńnie"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Chočaš ačyścić bazu źviestak? (NIE REKAMENDUJECCA RABIĆ Z AKTYŬNYM GAJIMAM)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9797,98 +10398,110 @@ msgstr ""
 "\n"
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Ekspartavańnie žurnałaŭ..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s a %(time)s napisaŭ: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Sapraŭdy chočaš vydalić žurnał razmoŭ z abranym kantaktam?"
-msgstr[1] "Sapraŭdy chočaš vydalić žurnały razmoŭ z abranymi kantaktami?"
-msgstr[2] "Sapraŭdy chočaš vydalić žurnały razmoŭ z abranymi kantaktami?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Sapraŭdy chočaš vydalić žurnał razmoŭ z abranym kantaktam?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Vynikaŭ hetaj aperacyi niemahčyma anulavać."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Źviestki ab kantakcie"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[1] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 msgstr[2] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Žurnał razmoŭ z %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s maje ciapier status %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Dziejny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Niemahčyma adčytać vyjavu"
+msgid "Loading"
+msgstr "Uvod paviedamleńnia"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Razmovy"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Pakoji"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Paviedamleńni"
 
@@ -9900,155 +10513,167 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s źmianiŭ status"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "dziaviataja"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s dałučyŭsia"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s adłučyŭsia"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Blakavańnie %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Niemahvyma dałučycca"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Novaje pryvatnaje paviedamleńnie ŭ pakoji %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Novaje paviedamleńnie ad %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Hety fajł užo isnuje"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Novaje paviedamleńnie ad %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "dziaviataja"
+msgid "Configuration"
+msgstr "Kanfihuracyja pakoju"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Ściežka da fajłu"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Atrymańnie profilu..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Ściežka da fajłu"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Takoha pakoju niama."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Farmat: HHHH-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Źviestki atrymanyja"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Dasyłańnie profilu..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Źviestki NIE apublikavanyja"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 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:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, 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:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, 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:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10056,39 +10681,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Anuluj pieradaču fajła"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10097,16 +10722,16 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10114,11 +10739,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10127,69 +10752,69 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetymi "
 "transpartami:%s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 #, 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10198,12 +10823,12 @@ msgstr ""
 "jon zaŭsiody budzie bačyć ciabie adłučanym."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10211,16 +10836,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10230,46 +10855,46 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 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:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10279,12 +10904,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:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10292,12 +10917,17 @@ 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Dašli %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Zrabi z %s i %s metakantakt"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
@@ -10307,138 +10937,138 @@ msgstr "Zrabi z %s i %s metakantakt"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "da kontu %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "praz kont %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Kiruj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "kontu %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "dla kontu %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Šukaj servisy..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Źmiani _hrupy"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Dašli asobnaje paviedamleńnie"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Vykanaj zahad..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Źmiani _nazvu"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Źmiani paviedamleńnie statusu..."
 
@@ -10455,31 +11085,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10489,149 +11109,154 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "Ź_miani paviedamleńnie statusu..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "JID:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Krynica: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s hetaha pakoju"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Apošni status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " ad %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Złučeńnie"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Aŭtaryzacyja: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " ad %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Pakoj:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Dziejny"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Typ:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Madyfikacyja kontu"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Ściahni"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Zaciahni na server"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Pierasłany: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nie pačata"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Spyniena"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Zavieršana"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?status pieradačy:Prypyniena"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Zatrymana"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Pieradajecca"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Hety servis dahetul nie adkazaŭ na zapyt padrabiaznych źviestak"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10639,70 +11264,406 @@ msgstr ""
 "Hety servis nia zmoh adkazać na zapyt padrabiaznych źviestak.\n"
 "Servis sastareły albo złamany"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "ad %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 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:359
+#: ../src/vcard.py:410
 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:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Abiary fajł dla adsyłańnia..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " akno/kartka razmovy z hetym kantaktam adčynienaja "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Dziejańni</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Umovy</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Admysłovyja dziejańni"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Pašyranyja nałady nahadvańnia"
+
+#~ msgid "All statuses"
+#~ msgstr "Usie statusy"
+
+#~ msgid "Busy "
+#~ msgstr "Zaniaty"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kantakt źmianiŭ status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kantakt adłučyŭsia"
+
+#~ msgid "Don't have "
+#~ msgstr "Razmaŭlaju "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Pieradača fajłu spyniena"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Novaje paviedamleńnie ŭ pakoji"
+
+#~ msgid "Have "
+#~ msgstr "Nie razmaŭlaju "
+
+#~ msgid "Launch a command"
+#~ msgstr "Vykanaj zahad"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Adzin ci niekalki admysłovych statusaŭ..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Dałučany / Achvotna parazmaŭlaju"
+
+#~ msgid "Play a sound"
+#~ msgstr "Ahuč"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Novaje pryvatnaje paviedamleńnie"
+
+#~ msgid "When "
+#~ msgstr "Kali "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr "_Mirgaj vyjavaj na paneli zadańniaŭ"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Nie adčyniaj aŭtamatyčna voknaŭ razmovy"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Nie pakazvaj vypłyŭnych voknaŭ"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Nie ahučvaj hetaj padzieji"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Nie pakazvać paviedamleńniaŭ u śpisie kantaktaŭ"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Nie pakazvać paviedamleńniaŭ u śpisie kantaktaŭ"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Paviedam mnie ŭ vypłyŭnym aknie"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Adčyni akno razmovy z karystalnikam"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+
+#~ msgid "and I "
+#~ msgstr "u časie, kali "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kantakty"
+
+#~ msgid "for "
+#~ msgstr "dla "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Hrupa"
+
+#~ msgid "when I'm in"
+#~ msgstr "kali maju "
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Dadaje kantakt u śpis kantaktaŭ"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Dazvol jamu/joj _bačyć moj status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Apisańnie: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Pašyranyja"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+#~ "śpisie kantaktaŭ i ŭ pakojach"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+#~ "śpisie kantaktaŭ i ŭ pakojach"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
+#~ "śpisie kantaktaŭ i ŭ pakojach"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Dašli _asobnaje aviedamleńnie..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Kamunikatar Gajim"
+
+#~ msgid "English"
+#~ msgstr "Anhielskaja"
+
+#~ msgid "Belarusian"
+#~ msgstr "Biełaruskaja"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Baŭharskaja"
+
+#, fuzzy
+#~ msgid "Breton"
+#~ msgstr "Brytonskaja"
+
+#~ msgid "Czech"
+#~ msgstr "Českaja"
+
+#~ msgid "German"
+#~ msgstr "Niamieckaja"
+
+#~ msgid "Greek"
+#~ msgstr "Hreckaja"
+
+#~ msgid "British"
+#~ msgstr "Brytanskaja"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Hišpanskaja"
+
+#~ msgid "French"
+#~ msgstr "Francuzkaja"
+
+#~ msgid "Croatian"
+#~ msgstr "Charvackaja"
+
+#~ msgid "Italian"
+#~ msgstr "Italijskaja"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Narveskaja (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Halandzkaja"
+
+#~ msgid "Norwegian"
+#~ msgstr "Narveskaja"
+
+#~ msgid "Polish"
+#~ msgstr "Polskaja"
+
+#~ msgid "Portuguese"
+#~ msgstr "Partuhalskaja"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazilskaja partuhalskaja"
+
+#~ msgid "Russian"
+#~ msgstr "Rasiejskaja"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbskaja"
+
+#~ msgid "Slovak"
+#~ msgstr "Słavackaja"
+
+#~ msgid "Swedish"
+#~ msgstr "Švedzkaja"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kitajskaja (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Mova spraŭdžvańnia pravapisu"
+
+#~ msgid "all or space separated status"
+#~ msgstr "\"all\" albo statusy, padzielenyja prabiełami"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no' albo 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' albo ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Pravier złučeńnie albo paŭtary paźniej"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Niemahčyma dałučycca da portu %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ "
+#~ "anulavanaja."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Jabber-klijent dla GTK+"
+
+#~ msgid "Condition"
+#~ msgstr "Umova"
+
+#~ msgid "when I am "
+#~ msgstr "kali maju "
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Užyvańnie: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Kantakty"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Tema: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Pakoj:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Dziejny"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Nie pakazvać padziejaŭ u poli nahadvańnia"
 
@@ -10720,30 +11681,12 @@ msgstr " krynica z pryjarytetam "
 #~ 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"
 
@@ -10828,9 +11771,6 @@ msgstr " krynica z pryjarytetam "
 #~ "Kantakt\n"
 #~ "Baner"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Kiruj kontami"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Vydal"
@@ -10933,9 +11873,6 @@ msgstr " krynica z pryjarytetam "
 #~ "sent."
 #~ msgstr "Ty nie dałučany albo niebačny. Ty nia možaš dasyłać paviedamleńni."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
-
 #~ msgid "%i days ago"
 #~ msgstr "%i dzion tamu"
 
@@ -10948,12 +11885,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "Commands: %s"
 #~ msgstr "Zahady: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10962,10 +11893,6 @@ msgstr " krynica z pryjarytetam "
 #~ "Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad "
 #~ "treciaj asoby). (naprykład, /%s rahoča, jak koń.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Niama daviedki pa /%s"
 
@@ -10982,10 +11909,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgstr "%(contact_jid)s zaprošany ŭ %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Mianuška nia znojdziena: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10997,13 +11920,6 @@ msgstr " krynica z pryjarytetam "
 #~ "nie padtrymvajucca."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
-#~ "asobaj."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -11043,9 +11959,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgstr ""
 #~ "Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Užyvańnie: /%s, pakazvaje imiony naviednikaŭ pakoju."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11081,10 +11994,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Pakažy _śpis kantaktaŭ"
-
 #~ msgid "Modify Account"
 #~ msgstr "Madyfikuj kont"
 
@@ -11172,9 +12081,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "_Uklučy miascovyja paviedamleńni"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Klikni, kab pahladzieć tekt papiarednich razmoŭ z hetym kantaktam"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Kampaktny vyhlad    Alt+K"
 
@@ -11187,9 +12093,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "Query Builder..."
 #~ msgstr "Stvaralnik zapytaŭ..."
 
-#~ msgid "Accept"
-#~ msgstr "Dazvol"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Atrymanaje zaprašeńnie"
 
@@ -11284,9 +12187,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "The auto away status message"
 #~ msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Adyjšoŭ\""
 
-#~ msgid "The auto not available status message"
-#~ msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Niedastupny\""
-
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Traktuj usie ŭvachodnyja paviedamleńni jak:"
 
@@ -11321,9 +12221,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "Company:"
 #~ msgstr "Firma:"
 
-#~ msgid "Country:"
-#~ msgstr "Krajina:"
-
 #~ msgid "Given:"
 #~ msgstr "Imia:"
 
diff --git a/po/bg.po b/po/bg.po
index 4d7a1b513..fc5dff678 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,15 +4,11 @@
 #
 #
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -22,312 +18,303 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Състояние"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Лични събития"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Започване на разговор…"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Влизане в стая…"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 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:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Изпълнение на команда…"
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Промяна на акаунт"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Отваряне на пощенската кутия на Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Лични събития"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Започване на разговор…"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Състояние"
+msgid "_Modify Account"
+msgstr "_Промяна на акаунт"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Помощник за създаване на акаунт"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Свързване със сървъра</b>\n"
-"\n"
-"Изчакайте…"
+"Трябва да имате акаунт, за да се свържете с\n"
+"мрежата на Джабър."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "I already have an account I want to _use"
+msgstr "_Вече имам регистриран акаунт, който искам да използвам"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "_Искам да регистрирам нов акаунт"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Изберете една от опциите по-долу:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Попълнете данните за съществуващия ви акаунт</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Изберете сървър</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Парола:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Добавяне на този сертификат към списъка с доверени сертификати.\n"
-"Отпечатък тип SHA1 на сертификата:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Запазване на паро_ла"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Използване на удостоверяване"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Свързване при натискане на бутона „Приключване“"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Помощник за създаване на акаунт"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Използване на удостоверяване"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "_Вече имам регистриран акаунт, който искам да използвам"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Изберете сървър</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "_Искам да регистрирам нов акаунт"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "С_ървър:"
 
 #: ../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 "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
+msgid "Prox_y:"
+msgstr "_Сървър-посредник:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 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: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 "Няма"
+msgid "Use custom hostname/port"
+msgstr "Използване на нестандартен хост/порт"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "_Сървър-посредник:"
+msgid "_Hostname:"
+msgstr "_Хост:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Запазване на паро_ла"
+msgid "_Port:"
+msgstr "По_рт:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Настройване на профила при свързване"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "На_преднали"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Използване на нестандартен хост/порт"
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Трябва да имате акаунт, за да се свържете с\n"
-"мрежата на Джабър."
+"Добавяне на този сертификат към списъка с доверени сертификати.\n"
+"Отпечатък тип SHA1 на сертификата:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Приключване"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Хост:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Свързване със сървъра</b>\n"
+"\n"
+"Изчакайте…"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Свързване при натискане на бутона „Приключване“"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Парола:"
+msgid "Set my profile when I connect"
+msgstr "Настройване на профила при свързване"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "По_рт:"
+msgid "_Finish"
+msgstr "_Приключване"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "С_ървър:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Разни</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Няма"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Акаунти"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Лични данни</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Сървър-посредник</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Изтриване"
 
-#: ../data/gui/accounts_window.ui.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Съгласуване спрямо състоянието"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Пре_именуване"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Акаунт"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+#, fuzzy
+msgid "_Enable"
+msgstr "Активиране"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Акаунти"
-
-#: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Административни операции"
-
-#: ../data/gui/accounts_window.ui.h:9
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Използване на удостоверяване"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"Ресурсът се изпраща до Джабър сървъра, за да „раздели“ един и същи JID на "
+"две или повече части в зависимост от броя на клиентите, свързани с един "
+"сървър и един и същ акаунт. Така може да сте свързани със същия акаунт и "
+"ресурси „Вкъщи“ и „На работа“ по едно и също време. Ресурсът с най-голям "
+"приоритет ще получава събитията. (вижте по-долу)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Автоматично свързване при разпадане на връзката"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Синхронизиране на контакти"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Търсене"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Натиснете, за да изискате упълномощаване от всички контакти на друг акаунт"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "С_вързване при стартиране"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Пром_яна на парола"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's 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 ""
-"Ако тази опция е избрана, ще се изисква потвърждение преди изпращането на "
-"паролата ви чрез несигурна връзка."
+msgid "Administration operations"
+msgstr "Административни операции"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Избор на файл за изпращане…"
+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 ""
+"Приоритетът в Джабър се използва, за да се определи кой да получава "
+"събитията от Джабър сървър, когато два или повече клиента са свързани с един "
+"и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Избор на _ключ…"
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Съгласуване спрямо състоянието"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Натиснете, за да смените паролата на акаунта"
+msgid "Priority will change automatically according to your status."
+msgstr "Приоритетът ще се сменя автоматично в зависимост от състоянието ви."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Натиснете, за да изискате упълномощаване от всички контакти на друг акаунт"
+msgid "Priori_ty:"
+msgstr "Приори_тет:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Само-подписан сертификат"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "С_вързване при стартиране"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Свързване"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Е-поща:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Собствено име:"
+msgid "Resour_ce:"
+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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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:25
+#, fuzzy
+msgid "Browse..."
+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 адреси освен вашия "
-"собствен, така че файловият трансфер има повече шансове да работи добре."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Сертификатът е отхвърлен"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Ако тази опция е избрана, паролата ще се взима от агент на GPG като Seahorse."
+#, fuzzy
+msgid "Client certificate"
+msgstr "Само-подписан сертификат"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Акаунт"
 
 #: ../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 "C_onnect on Gajim startup"
+msgstr "С_вързване при стартиране"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -338,6 +325,18 @@ msgstr ""
 "използвайки този акаунт."
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Автоматично свързване при разпадане на връзката"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Запазване на история на _разговорите за всички контакти"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -346,187 +345,216 @@ 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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ако стандартния порт за входящи съобщения е неудобен за настройките ви, може "
-"да изберете друг тук.\n"
-"Може да помислите и да промените настройките на огнената стена, евентуално."
-
-#: ../data/gui/accounts_window.ui.h:34
-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:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Използване на сървъри-посредници за файлови трансфери"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Фамилия:"
+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:37
-msgid "Mer_ge accounts"
-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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Общи"
 
-#: ../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:38
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Лични данни"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Управление на…"
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Сървър-посредник</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Приори_тет:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Приоритетът в Джабър се използва, за да се определи кой да получава "
-"събитията от Джабър сървър, когато два или повече клиента са свързани с един "
-"и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
+"Ако тази опция е избрана, ще се изисква потвърждение преди изпращането на "
+"паролата ви чрез несигурна връзка."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Приоритетът ще се сменя автоматично в зависимост от състоянието ви."
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Изпращане на пакети за поддържане на връзката"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Пре_именуване"
+#: ../data/gui/accounts_window.ui.h:44
+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:45
-msgid "Resour_ce:"
-msgstr "_Ресурс:"
+#, fuzzy
+msgid "Use cust_om hostname/port"
+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 ""
-"Ресурсът се изпраща до Джабър сървъра, за да „раздели“ един и същи JID на "
-"две или повече части в зависимост от броя на клиентите, свързани с един "
-"сървър и един и същ акаунт. Така може да сте свързани със същия акаунт и "
-"ресурси „Вкъщи“ и „На работа“ по едно и също време. Ресурсът с най-голям "
-"приоритет ще получава събитията. (вижте по-долу)"
+#, fuzzy
+msgid "_Hostname: "
+msgstr "_Хост:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Запазване на история на _разговорите за всички контакти"
+#, fuzzy
+msgid "_Port: "
+msgstr "По_рт:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Разни</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Изпращане на пакети за поддържане на връзката"
+msgid "Connection"
+msgstr "Свързване"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Няма избран ключ"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
+msgid "Choose _Key..."
+msgstr "Избор на _ключ…"
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Синхронизиране на контакти"
+#, fuzzy
+msgid "Use G_PG Agent"
+msgstr "Използване на агент на _GPG"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
+"Ако тази опция е избрана, паролата ще се взима от агент на GPG като Seahorse."
 
 #: ../data/gui/accounts_window.ui.h:54
-#, fuzzy
-msgid "Use G_PG Agent"
-msgstr "Използване на агент на _GPG"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Използване на нестандартен хост/порт"
+msgid "_Edit Personal Information..."
+msgstr "Редактиране на личните данни…"
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Използване на нестандартен порт:"
+msgid "Information about you, as stored in the server"
+msgstr "Вашите лични данни, както са запазени на сървъра"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Използване на сървъри-посредници за файлови трансфери"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Лични данни</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Лични данни"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Редактиране на личните данни…"
+msgid "Co_nnect on Gajim startup"
+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
 #, fuzzy
-msgid "_Enable"
-msgstr "Активиране"
+msgid "Synchroni_ze account status with global status"
+msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "_Хост:"
+msgid "Use cust_om port:"
+msgstr "Използване на нестандартен порт:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Управление на…"
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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"
+"Може да помислите и да промените настройките на огнената стена, евентуално."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Собствено име:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "По_рт:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Фамилия:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "Предупре_ждаване преди използване на несигурна връзка"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Е-поща:"
 
 #: ../data/gui/accounts_window.ui.h:67
-#, fuzzy
-msgid "_use HTTP__PROXY environment variable"
-msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Смесване на акаунти"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Акаунт:"
+msgid "Add New Contact"
+msgstr "Добавяне на нов контакт"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "_Позволяване на този контакт да вижда състоянието ми"
+msgid "A_ccount:"
+msgstr "_Акаунт:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Добавяне на нов контакт"
+msgid "_Protocol:"
+msgstr "П_ротокол:"
 
-#: ../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 "Бих искал(а) да ви добавя към списъка си."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Идентификатор на потребител:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "Псе_вдоним:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Група:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "_Позволяване на този контакт да вижда състоянието ми"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Записване"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -538,7 +566,11 @@ msgstr ""
 "протокол.  Натиснете бутона „Регистриране“,\n"
 "за да продължите."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Регистриране"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -546,596 +578,374 @@ msgstr ""
 "Трябва да сте свързани към транспорта, за да може\n"
 "да добавите контакт от този протокол."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Група:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "Псе_вдоним:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "П_ротокол:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Регистриране"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Записване"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Идентификатор на потребител:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Възникна грешка:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Специални команди - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Изберете команда за изпълнение:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Изчакайте, докато се извлече списъка с команди…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Специални команди - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Изберете команда за изпълнение:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Проверка наново"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Описание на грешката…"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Изчакайте, докато командата се изпраща…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Приключване"
+msgid "Please wait..."
+msgstr "Изчакайте…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Изчакайте, докато се извлече списъка с команди…"
+msgid "This jabber entity does not expose any commands."
+msgstr "Този Джабър контакт не предлага никакви команди."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Изчакайте, докато командата се изпраща…"
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Възникна грешка:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Изчакайте…"
+msgid "Error description..."
+msgstr "Описание на грешката…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Този Джабър контакт не предлага никакви команди."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Приключване"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Редактор на настройки за напреднали"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Филтър:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>ЗАБЕЛЕЖКА:</b> Трябва да рестартирате Gajim, за да влязат в сила някои от "
 "настройките"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Редактор на настройки за напреднали"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Филтър:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Възстановяване на стандартните _цветове"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Изтриване на MOTD"
+msgid "Show _XML Console"
+msgstr "Показване на _XML конзола"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "_Филтри за уединение…"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Администратор"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
+msgid "_Send Server Message..."
+msgstr "_Изпращане на съобщение от сървъра…"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Изпраща съобщение на всички потребители, свързани със сървъра в момента"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Настройване на MOTD…"
-
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Показване на _XML конзола"
+msgid "Set MOTD..."
+msgstr "Настройване на MOTD…"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Актуализиране на MOTD…"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "Актуализиране на MOTD…"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Администратор"
+msgid "Delete MOTD"
+msgstr "Изтриване на MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Изпращане на съобщение от сървъра…"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " отворен прозорец/подпрозорец с този контакт "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Действия</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Условия</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Звуци</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Действия за напреднали"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Контрол на уведомления за напреднали"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Всички състояния"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Отсъствам"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Зает "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Контактът промени състоянието си"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Изключване на контакт"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "нямам "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Файлови трансфери"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Запитване за файлов трансфер"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Файловият трансфер е преустановен"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Осветено съобщение в стая"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Получено съобщение в стая"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "имам "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Невидим"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Изпълнение на команда"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Не съм на разположение"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Едно или повече определени състояния…"
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "На линия / Свободен за разговор"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Изпълнение на звук"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Ново лично съобщение"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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 ""
-"_Активиране на подсказката за спешност на мениджъра на прозорци, за да мига "
-"прозореца в панела"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Изключване на автоматичното появяване на прозорец за разговор"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Изключване на съществуващ изскачащ прозорец"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Изключване на съществуващ звук за това събитие"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Изключване на показване на събитието в списъка"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Изключване на показване на събитието в списъка"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Информиране с изскачащ прозорец"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Отваряне на прозорец за разговор с потребителя"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Показване на събитието в спис_ъка"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Показване на събитието в спис_ъка"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "и аз "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Контакти"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "за "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Група"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "когато съм"
+msgid "Deletes Message of the Day"
+msgstr "Изтрива съобщението за деня"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Няма"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Настройки"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Автоматично влизане"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Няма"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Настройки"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Автоматично влизане"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Запис:"
+msgid "New entry received"
+msgstr "Получен е нов запис"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Получихте нов запис:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Име на емисията:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Запис:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Последно променена:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Получен е нов запис"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Получихте нов запис:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Деблокиране"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Съобщение:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Задаване на дейност"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Задаване на дейност"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Съобщение:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Настроение:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Съобщение:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Промяна на парола"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Въведете я отново за потвърждение:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Въведете нова парола:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Въведете я отново за потвърждение:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Напишете новото съобщение за състояние</b>"
+msgid "Save as Preset..."
+msgstr "Запазване като настроено…"
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Дейност:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Настроение:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Дейност:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Настроени съобщения:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Запазване като настроено…"
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Напишете новото съобщение за състояние</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "_Влизане в стая"
+msgid "_Copy Link Location"
+msgstr "_Копиране на адреса на връзката"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "Добавяне към _списъка…"
+msgid "_Open Link in Browser"
+msgstr "_Отваряне на връзката в браузър"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "Копиране на _JID/Е-поща"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Копиране на адреса на връзката"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Отваряне на пощенската програма"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Отваряне на връзката в браузър"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "№"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "_Влизане в стая"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "Добавяне към _списъка…"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Списък с емотикони (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Добавяне на контакт към списъка (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Покана на контакти в разговора (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Покана на контакти в разговора (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Разглеждане на историята на разговорите (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Меню с функции за напреднали (Ctrl+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "№"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Изпращане"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "По_кана"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Поканете приятели!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Сървър за стаи"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Изберете сървър за стаи."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1143,120 +953,137 @@ msgstr ""
 "На път сте да започнете разговор в стая.\n"
 "Изберете контактите, които искате да поканите."
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Запитване за виждане на състоянието на контакта"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Изберете сървър за стаи."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Добавяне на специално _уведомление…"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Сървър за стаи"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Задаване на ключ Open_PGP…"
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "По_кана"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Изпълнение на команда…"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Започване на _разговор"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Редактиране на _групи…"
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Изпращане на _еднократно съобщение…"
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Изпращане на _файл…"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "По_кана в"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Покана на _контакти"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "П_ремахване"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Превключване на шифриране тип „Open_PGP“"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Превключване на шифриране тип „End to End“"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Изпращане на _специфично състояние"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Изпълнение на команда…"
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Изпращане на _еднократно съобщение…"
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Управление на контакт"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Изпращане на _файл…"
+msgid "_Rename..."
+msgstr "_Преименуване…"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Задаване на друг _аватар…"
+msgid "Edit _Groups..."
+msgstr "Редактиране на _групи…"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Започване на _разговор"
+msgid "Assign Open_PGP Key..."
+msgstr "Задаване на ключ Open_PGP…"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Превключване на шифриране тип „End to End“"
+msgid "Set Custom _Avatar..."
+msgstr "Задаване на друг _аватар…"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Превключване на шифриране тип „Open_PGP“"
+msgid "Add Special _Notification..."
+msgstr "Добавяне на специално _уведомление…"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Записване"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Позволение за виждане на състоянието ми"
+#, fuzzy
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr "_Блокиране"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "_Запитване за виждане на състоянието на контакта"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:5755
-msgid "_History"
-msgstr "Ист_ория"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Игнориране"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Блокиране"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Управление на контакт"
+msgid "_Unignore"
+msgstr "_Премахване на игнорирането"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Преименуване…"
+msgid "_Ignore"
+msgstr "_Игнориране"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Записване"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "П_ремахване"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Премахване на игнорирането"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "Ист_ория"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Попълнете формуляра."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Настройки на стаята"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Попълнете формуляра."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Редактиране на групи"
@@ -1269,56 +1096,48 @@ msgstr "(Информация за <b>Е-сесия</b>)"
 msgid "_Verify"
 msgstr "_Проверка"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Възможности"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Списък с възможни функционалности на Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Възможности"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
+msgid "File Transfers"
+msgstr "Файлови трансфери"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Отменя файловия трансфер"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Показва списък с файловите трансфери между вас и останалите"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Отменя избрания файлов трансфер"
+msgid "file transfers list"
+msgstr "списък с файлови трансфери"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Отменя избрания файлов трансфер и изтрива непълния файл"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Из_чистване"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Уведомяване при завършване на файловия трансфер"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Файлови трансфери"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Скрива прозореца"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr ""
+"Премахва завършилите, прекъснатите или провалени файлови трансфери от списъка"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Премахване на файловия трансфер от списъка."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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"
@@ -1326,82 +1145,108 @@ msgstr ""
 "Това действие премахва файлов трансфер от списъка. Ако трансферът е активен, "
 "първо се прекъсва и след това се премахва."
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Из_чистване"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "П_ауза"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Отменя избрания файлов трансфер и изтрива непълния файл"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "П_родължаване"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Отменя файловия трансфер"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Уведомяване при завършване на файловия трансфер"
+msgid "Cancels the selected file transfer"
+msgstr "Отменя избрания файлов трансфер"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Отваряне на папката"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Скрива прозореца"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "П_ауза"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "П_родължаване"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "списък с файлови трансфери"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Отваряне на папката"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Цветове на подпрозорците</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Акаунт"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Получер"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Група"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Контакт"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Пише"
+msgid "Gajim Themes Customization"
+msgstr "Персонализиране на темите на Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Контакт"
+msgid "Text _color:"
+msgstr "_Цвят на текста:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Стил на шрифта:"
+msgid "_Background:"
+msgstr "_Фон:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Персонализиране на темите на Gajim"
+msgid "Text _font:"
+msgstr "_Шрифт на текста:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Отсъства"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Група"
+msgid "Font style:"
+msgstr "Стил на шрифта:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Бездеен"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Получер"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Курсив"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Временно преустановен"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Пише"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Бездеен"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Цветове на подпрозорците</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Отсъства"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1409,7 +1254,7 @@ msgstr ""
 "Съобщения\n"
 "в стая"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1417,105 +1262,99 @@ msgstr ""
 "Съобщения\n"
 "за стая"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Временно преустановен"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Цвят на текста:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Шрифт на текста:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Фон:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Смяна на псе_вдоним…"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Управление на стаята"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Промяна на _темата…"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Настройки на _стаята…"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Добавяне на стаята към отметките"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Унищожаване на стаята"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Управление на стаята"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Минимизиране при затваряне"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Глас"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Добавяне на стаята към отметките"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "_Председател"
+msgid "_Send Private Message"
+msgstr "_Изпращане на лично съобщение"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "_Действия на участника"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Изпращане на _файл"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "_Действия на участника"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "Добавяне към _списъка…"
+msgid "_Voice"
+msgstr "_Глас"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "_Председател"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Член"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Администратор"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Забраняване на достъпа"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "Со_бственик"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Изритване"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Член"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "Со_бственик"
+msgid "_Ban"
+msgstr "_Забраняване на достъпа"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Изпращане на лично съобщение"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Глас"
+msgid "_Add to Roster"
+msgstr "Добавяне към _списъка…"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Списък с емотикони (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Смяна на псевдоним (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1527,40 +1366,19 @@ msgid "From:"
 msgstr "От:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 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."
-msgstr ""
-"<b>ПРЕДУПРЕЖДЕНИЕ:</b>\n"
-"Ако планирате да изтривате масово, уверете се, че Gajim не е стартиран. По "
-"принцип избягвайте да изтривате история за контакти, с които разговаряте в "
-"момента."
+msgid "Gajim History Logs Manager"
+msgstr "Мениджър на историята на разговорите"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Изтриване"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Изнасяне"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Мениджър на историята на разговорите"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1574,172 +1392,199 @@ msgstr ""
 "Използвайте тази програма за изтриване или изнасяне на дневници. Може да ги "
 "избирате от списъка вляво и/или да търсите в базата от данни по-долу."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>ПРЕДУПРЕЖДЕНИЕ:</b>\n"
+"Ако планирате да изтривате масово, уверете се, че Gajim не е стартиран. По "
+"принцип избягвайте да изтривате история за контакти, с които разговаряте в "
+"момента."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Търсене в базата от данни"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Всички състояния"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "История на разговорите"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Изнасяне"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Име на контакта"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Стаи"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Всички състояния"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "История на разговорите"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Търсене:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "Запазване на промените на _състоянията на контактите"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Сгорещен"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "JID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Сгорещен"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Влизане в тази стая автоматично при свързване"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Стая:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Скоро посетени:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Скоро посетени:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Влизане в тази стая автоматично при свързване"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Стая:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Сървър:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+msgid "Bro_wse Rooms"
+msgstr "_Търсене"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Влизане"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Автоматично влизане"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Управление на отметките"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Минимизиране при автоматично влизане"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Заглавие:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Изписване на състоянията:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Автоматично влизане"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Заглавие:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Минимизиране при автоматично влизане"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1750,103 +1595,106 @@ msgid "_Configure"
 msgstr "_Настройване"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Настройки</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"Свързване по HTTP\n"
+"SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Настройки</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"Свързване по HTTP\n"
-"SOCKS5"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Паро_ла:"
+msgid "_Name:"
+msgstr "_Име:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Сървър-посредник:"
+msgid "<b>Properties</b>"
+msgstr "<b>Настройки</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-#, fuzzy
-msgid "Proxy _Port:"
-msgstr "По_рт:"
+msgid "Use HTTP prox_y"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
+msgid "_BOSH URL:"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Използване на удостоверяване"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "И_ме на потребител:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr ""
+msgid "Pass_word:"
+msgstr "Паро_ла:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Име:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Сървър-посредник:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
+msgid "Proxy _Port:"
+msgstr "По_рт:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "И_ме на потребител:"
+msgid "<b>Settings</b>"
+msgstr "<b>Настройки</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Управление на акаунти"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Парола"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Упълномощаване"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "На _линия"
+msgid "Version:"
+msgstr "Версия на GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Настройване"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Описание: "
+msgid "Authors:"
+msgstr "_Упълномощаване"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1854,39 +1702,32 @@ msgid "Homepage:"
 msgstr "<b>Страница в Интернет:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Блокирал"
+msgid "Description:"
+msgstr "Описание: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+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 ""
+msgid "Installed"
+msgstr "Блокирал"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1900,1035 +1741,1045 @@ msgid "Event desc"
 msgstr "Събитие"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Редактор на настройките за напреднали</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Програми</b>"
+msgid "Custom"
+msgstr "Персонални"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Действия</b>"
+msgid "All chat states"
+msgstr "Всички състояния"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Автоматично състояние</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Пише"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Изглед на разговорите</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Изключени"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Цветове за разговорите</b>"
+#, fuzzy
+msgid "Never"
+msgstr "Сървър"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Уведомления за състояния на разговора</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Условия</b>"
+msgid "Always"
+msgstr "Отсъствам"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr ""
 
-#. 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>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Уведомяване за _изключващи се контакти"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Шрифт</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Показване на събитието в спис_ъка"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Настройки за GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Настроени съобщения за състояние</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Уединение</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Изглед на списъка</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Последно състояние: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Съобщения за състояние</b>"
+msgid "Preferences"
+msgstr "Настройки"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Теми</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Показване на _аватари на контактите в списъка"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Презиме:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
+"и стаите"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Зрителни уведомления</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
+"показват под имената им в списъка и в стаите"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Напреднали"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Показване на _настроенията на контактите в списъка"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Напреднали…"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
+"списъка."
 
 #: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Всички състояния"
+msgid "Sort contacts by status"
+msgstr "Подреждане на контактите по състояние"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Позволяване изпращането на _информация за ОС"
+msgid "in _roster"
+msgstr "в с_писъка"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Позволяване изпращането на _информация за ОС"
+msgid "in _group chats"
+msgstr "в _стаи"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
-"Зает/Невидим"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Изглед на списъка</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr ""
+msgid "_Window behavior:"
+msgstr "_Поведение на прозорците:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Отсъствам"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
+"съответните анимирани или статични емотикони."
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Питане за съобщение за състояние при преминаване в режим:"
+msgid "_Emoticons:"
+msgstr "_Емотикони:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "_Компактни прозорци за разговор"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Скриване на всички бутони в прозорците за разговор."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Съобщение от разговор:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
+"н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
 
 #: ../data/gui/preferences_window.ui.h:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
+msgid "_Highlight misspelled words"
+msgstr "_Осветяване на неправилно изписаните думи"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Пише"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Настройване на цвят и шрифт на интерфейса"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "П_оказване на списъка"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Съобщение от разговор:"
+msgid "Show icon when your messages are received"
+msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Име на контакта"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Персонални"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Изглед на разговорите</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "При получаване на ново събитие:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Уведомяване за _включващи се контакти"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Уведомяване за _изключващи се контакти"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
+"изключване на контакти"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Изключени"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
+"Зает/Невидим"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Показване на _дейност на контактите в списъка"
+msgid "Notify on new _GMail email"
+msgstr "Уведомяване при нова поща от _GMail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Показване на _допълнителни данни за е-поща"
+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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Показване на _настроенията на контактите в списъка"
+msgid "Display _extra email details"
+msgstr "Показване на _допълнителни данни за е-поща"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Показване на _слушаната от контактите музика в списъка"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
+"писма."
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Настройки за GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Показване на _настроенията на контактите в списъка"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Демон за уведомления"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Показване на _съобщенията за състояние на контактите в списъка"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Зрителни уведомления</b>"
 
 #: ../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 може да изпраща и получава мета-информация, свързана с разговора с "
-"даден контакт. Тук може да укажете кои състояния бихте искали да се показват "
-"в прозорците за разговор."
+msgid "Play _sounds"
+msgstr "Изпълнение на з_вуци"
 
 #: ../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 може да изпраща и получава мета-информация, свързана с разговора с "
-"даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
+msgid "Ma_nage..."
+msgstr "_Управление…"
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 msgstr ""
-"Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
-"изключване на контакти"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Звуци</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "Скриване на всички бутони в прозорците за разговор."
+msgid "Notifications"
+msgstr "Уведомления"
 
 #: ../data/gui/preferences_window.ui.h:59
 msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
+"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:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
-"писма."
+msgid "_Display chat state notifications:"
+msgstr "Показване на уведомления при _разговор:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
-"разположение“ когато компютърът не се използва по-дълго време."
+msgid "_Send chat state notifications:"
+msgstr "Изпращане на уведомления при _разговор:"
 
 #: ../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 ще изобразява аватари на контакти в списъка "
-"и стаите"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Уведомления за състояния на разговора</b>"
 
 #: ../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 ""
-"Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
-"показват под имената им в списъка и в стаите"
+msgid "Personal Events"
+msgstr "Лични събития"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
-"списъка."
+msgid "_Away after:"
+msgstr "„_Отсъствам“ след:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
-"списъка."
+"Ако тази опция е избрана, Gajim ще променя състоянието на „Отсъствам“ когато "
+"компютърът не се използва."
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
-"списъка."
+msgid "_Not available after:"
+msgstr "„Не съм на _разположение“ след:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите музика "
-"в списъка."
+"Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
+"разположение“ когато компютърът не се използва по-дълго време."
 
 #: ../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 ""
-"Ако тази опция е избрана, ще се осветяват правописни грешки в полетата за "
-"въвеждане на текст в прозорците за разговор. Ако не е избран език чрез "
-"натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
-"езикът по подразбиране."
+msgid "minutes"
+msgstr "минути"
 
 #: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
 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 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 show a notification when a new e-mail is received via "
-"GMail"
+"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 ще показва уведомление при получаването на "
-"ново писмо чрез GMail."
+"Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
+"сменя текущото съобщение."
 
 #: ../data/gui/preferences_window.ui.h:73
+#, fuzzy
 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 ""
-"Ако тази опция е избрана, ще се използват специфични за протокола икони за "
-"състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
-"състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
-"съответните анимирани или статични емотикони."
+"Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
+"няма да се сменя текущото съобщение."
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Запазване на дневник на _шифрираната сесия"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Автоматично състояние</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "_Компактни прозорци за разговор"
+msgid "Ask status message when I:"
+msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "_Управление…"
+msgid "Sign _in"
+msgstr "_Включване"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "Сървър"
+msgid "Sign _out"
+msgstr "Изкл_ючване"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Уведомления"
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Уведомяване за _включващи се контакти"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Съобщения за състояние</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Уведомяване за _изключващи се контакти"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Настроени съобщения за състояние</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "Уведомяване за _изключващи се контакти"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Състояние"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Уведомяване при нова поща от _GMail"
+msgid "Use system _default"
+msgstr "Използване на стан_дартните за системата"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+msgid "Chat message:"
+msgstr "Съобщение от разговор:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Лични събития"
+msgid "<b>Font</b>"
+msgstr "<b>Шрифт</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Изпълнение на з_вуци"
+msgid "Use _transports icons"
+msgstr "Използване на и_кони за транспортите"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 msgstr ""
+"Ако тази опция е избрана, ще се използват специфични за протокола икони за "
+"състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
+"състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Настройки"
+msgid "Status _iconset:"
+msgstr "_Набор икони за състояние:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Настройване на цвят и шрифт на интерфейса"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Тема:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Сървър:"
+msgid "<b>Themes</b>"
+msgstr "<b>Теми</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Демон за уведомления"
+msgid "Contact's nickname:"
+msgstr "Име на контакта"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Показване на събитието в спис_ъка"
+msgid "Your nickname:"
+msgstr "Псевдоним:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Включване"
+msgid "_Status message:"
+msgstr "С_ъобщение за състояние:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Изкл_ючване"
+msgid "_URL highlight:"
+msgstr "_Адреси:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "Възстановяване на стандартните _цветове"
 
 #: ../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 ""
-"Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
-"н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Съобщение от разговор:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Подреждане на контактите по състояние"
+#, fuzzy
+msgid "Your message:"
+msgstr "Грешка: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Състояние"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Осветено съобщение в стая"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "_Набор икони за състояние:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Цветове за разговорите</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стил"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Тема:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
-msgid ""
-"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"
+msgid "<b>Audio</b>"
+msgstr "<b>Действия</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
-"сменя текущото съобщение."
 
 #: ../data/gui/preferences_window.ui.h:107
-#, fuzzy
-msgid ""
-"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"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
-"няма да се сменя текущото съобщение."
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Използване на и_кони за транспортите"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Презиме:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Използване на стан_дартните за системата"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сървър:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Условия</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "При получаване на ново събитие:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Грешка: %s"
+msgid "_File manager:"
+msgstr "_Файлов мениджър:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Псевдоним:"
+msgid "_Mail client:"
+msgstr "_Програма за е-поща:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "„_Отсъствам“ след:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Показване на уведомления при _разговор:"
+msgid "<b>Custom</b>"
+msgstr "<b>Персонални</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Емотикони:"
+msgid "<b>Applications</b>"
+msgstr "<b>Програми</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Файлов мениджър:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Осветяване на неправилно изписаните думи"
+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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "Прене_брегване на събития от контакти, които не са в списъка"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Позволяване изпращането на _информация за ОС"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "Запазване на промените на _състоянията на контактите"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Позволяване изпращането на _информация за ОС"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Програма за е-поща:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "„Не съм на _разположение“ след:"
+msgid "Log _encrypted chat session"
+msgstr "Запазване на дневник на _шифрираната сесия"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Отваряне…"
+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:132
-msgid "_Reset to Default Colors"
-msgstr "Възстановяване на стандартните _цветове"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Позволяване изпращането на _информация за ОС"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "Изпращане на уведомления при _разговор:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "С_ъобщение за състояние:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "_Адреси:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Уединение</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Поведение на прозорците:"
+msgid "_Log status changes of contacts"
+msgstr "Запазване на промените на _състоянията на контактите"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "в _стаи"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "в с_писъка"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "минути"
+msgid "_Open..."
+msgstr "_Отваряне…"
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Редактор на настройките за напреднали</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Напреднали"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Филтри за уединение:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Добавяне / Редактиране на правило</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Филтър за уединение"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Списък с правила</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Филтър за уединение</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Активен за тази сесия"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Активен при всяко стартиране"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Списък с правила</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Всички"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Добавяне / Редактиране на правило</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "всички със записване"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Позволяване на"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Отказване"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "всички в групата"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ред:"
+msgid "all by subscription"
+msgstr "всички със записване"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Филтър за уединение"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Всички"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "всички със записване"
+msgid "to send me messages"
+msgstr "да ми изпраща съобщения"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "всички в групата"
+msgid "to send me queries"
+msgstr "да ми изпращат лични съобщения"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Двустранно"
+msgid "to view my status"
+msgstr "да виждат състоянието ми"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "От"
+msgid "to send me status"
+msgstr "да ми изпращат състоянието си"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "един"
+msgid "All (including subscription)"
+msgstr "всички със записване"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "два"
+msgid "Order:"
+msgstr "Ред:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "да ми изпраща съобщения"
+#, fuzzy
+msgid "none"
+msgstr "един"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "да ми изпращат лични съобщения"
+#, fuzzy
+msgid "both"
+msgstr "Двустранно"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "да ми изпращат състоянието си"
+#, fuzzy
+msgid "from"
+msgstr "От"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "да виждат състоянието ми"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Адрес</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Аватар:</b>"
+#, fuzzy
+msgid "to"
+msgstr "два"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Рожден ден:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Град:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Фамилия:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Фирма:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Държава:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Презиме:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Отдел:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>Е-поща:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Представка:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Допълнителен адрес:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Собствено:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Фамилия:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Наставка:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Име</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Улица:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Собствено:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Град:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Страница в Интернет:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Област/Щат:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Допълнителен адрес:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Презиме:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Пощенски код:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Име:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Държава:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Псевдоним:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Адрес</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Телефон:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Страница в Интернет:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Дейност:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Име:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Пощенски код:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Псевдоним:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Телефон:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Представка:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Формат: гггг-мм-дд"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Роля:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Рожден ден:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Област/Щат:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>Е-поща:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Улица:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Аватар:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Натиснете, за да настроите аватара си"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Наставка:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Лични данни"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Фирма:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Относно"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Дейност:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Натиснете, за да настроите аватара си"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Отдел:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Формат: гггг-мм-дд"
+msgid "<b>Role:</b>"
+msgstr "<b>Роля:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Лични данни"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Работа"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Какво искате да направите?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Относно"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Премахване на акаунт _само от Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Премахване на акаунт от Gajim и от с_ървъра"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Какво искате да направите?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Да"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Добавяне на контакт…"
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "_Възможности"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Действия"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Файлови трансфери"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Добавяне на контакт…"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Често задавани въпроси (в Интернет)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Редактиране"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Помощ в Интернет"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Акаунти"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "_Профил, аватар"
+
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "_Профил, аватар"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Изглед"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Показване на изкл_ючените контакти"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Показване на т_ранспорти"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Показване на изкл_ючените контакти"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "П_оказване на списъка"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Акаунти"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+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:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Действия"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "Помо_щ"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Ръководства"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Редактиране"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Помощ в Интернет"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "Помо_щ"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Изпращане на _еднократно съобщение…"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Често задавани въпроси (в Интернет)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Изглед"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Изчакайте, докато се извлече формуляра за търсене…"
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Възможности"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Търсене"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Изчакайте, докато се извлече формуляра за търсене…"
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Добавяне на _контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Информация"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Търсене"
 
@@ -2948,41 +2799,37 @@ msgstr "Регистриране към"
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Отговор на това съобщение"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "До:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Изпращане"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Изпращане на съобщение"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Изпращане на съобщението и затваряне на прозореца"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Отговор"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "До:"
+msgid "Reply to this message"
+msgstr "Отговор на това съобщение"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Отговор"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Изпра_щане и затваряне"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Изпращане на съобщението и затваряне на прозореца"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Упълномощаване"
+msgid "Subscription Request"
+msgstr "Искане за записване"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
+msgid "_Deny"
+msgstr "_Отказване"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2991,263 +2838,275 @@ msgid ""
 msgstr ""
 "Отказване на упълномощаване на контакт, така че да не знае кога сте свързани"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Искане за записване"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Упълномощаване"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Отказване"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Синхронизиране на контакти"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Изберете акаунт, с който искате да синхронизирате"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Изберете контактите, които искате да синхронизирате"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхронизиране: избор на контакти"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Изключване на звука"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Изпращане на _еднократно съобщение"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Показване на всички _чакащи събития"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Изберете контактите, които искате да синхронизирате"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "С_ъстояние"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "С_тая"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Запитване:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Изпращане на _еднократно съобщение"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Клиент:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Показване на всички _чакащи събития"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Област/Щат:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Изключване на звука"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Информация за контакта"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Състояние:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Записване:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Клиент:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Система:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Коментари"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Област/Щат:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Аватар:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Настроен аватар:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Контакт"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Записване:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Информация за контакта"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Запитване:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Още"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Аватар:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Контакт"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Шрифт</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Коментари"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Джабър трафик</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Вход в XML формат</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Информация/запитване (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Шрифт</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "I_Q"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Информация/запитване (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "С_ъстояние"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Съобщение"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "С_ъстояние"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Вход в XML формат</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Промяна на акаунт…"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Локален JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Лични данни"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Състояние:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Джабър клиент за GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Лични данни"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Моментни съобщения (Gajim)"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Джабър клиент за бързи съобщения"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Джабър клиент за GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Отмяна на потвърждението"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "На път сте да изпълните команда. Наистина ли искате да я отмените?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Невалиден формат"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Услугата изпрати лошо форматирани данни"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Услугата промени идентификатора на сесията."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Специални команди - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Услугата върна грешка."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Активирана"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Изключена"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Булев израз"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Число"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Цвят"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Име на опцията"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Стойност"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Няма)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Скрита"
 
@@ -3258,244 +3117,186 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Получихте нов запис:"
 msgstr[1] "Получихте нов запис:"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "английски"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "белоруски"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "български"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "бретонски"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "чешки"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "немски"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "гръцки"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "британски английски"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "есперанто"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "испански"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "баски"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "френски"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "хърватски"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "италиански"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "норвежки (Bokmål)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "холандски"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "норвежки (Nynorsk)"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "полски"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "португалски"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "бразилски португалски"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "руски"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "сръбски"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "словашки"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Пинг?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "шведски"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "китайски"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Понг! (%s сек)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Език за проверка на правописа"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Грешка."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "Неопределен"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Болен"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информация за контакта"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Наистина ли да се изпрати файла?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "Шифрирането чрез GPG е включено"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Не е в списъка"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+msgid "Feature not available, see Help->Features"
+msgstr ""
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Изпращане на _файл"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщенията с GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "Шифрирането чрез GPG е изключено"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "ЩЕ СЕ запазва дневник за сесията"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "НЯМА да се запазва дневник за сесията"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "е"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "НЕ е"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "Ще"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "НЯМА да"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3504,32 +3305,32 @@ msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Договорката за сесията отменена"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "НЯМА да се запазва дневник за сесията"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Тази сесия е шифрирана"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " и ЩЕ СЕ запазва дневник"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " и НЯМА да се запазва дневник"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3537,25 +3338,25 @@ msgstr ""
 "Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
 "щита за повече информация."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Следното съобщение беше шифрирано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3563,13 +3364,14 @@ 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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3578,221 +3380,586 @@ msgstr ""
 "Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
 "поправите или изтриете (цялата история ще бъде загубена)."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Неуспех при дешифрирането на съобщение от %s\n"
+"Възможно е да е било фалшифицирано."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s вече е %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Файлови трансфери"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Размер: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "_Акаунти"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Файловият трансфер завърши"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Покана за разговор в стая"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Премахване на контакт от списъка"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Грешка при четене на файл:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Файловият трансфер е преустановен"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Файловият трансфер е прекъснат"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Не може да бъде установен контакт с отсрещната машина."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Употреба: /%s, скрива бутоните за разговор."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Употреба: /%s, изпраща съобщение до контакта."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s не е намерен"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Отсъствам"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "На _линия"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Употреба: /%s, изчиства текстовия прозорец."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Превключване на шифриране тип „Open_PGP“"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Употреба: /%s, изпраща „ping“ до контакта."
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Командата не се поддържа за акаунт тип „zeroconf“."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s не е валидно ниво за дневник"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "В момента няма връзка"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "В момента няма връзка"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Смяна на псевдоним (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Невалиден псевдоним"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
+"участник."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Псевдонимът не е намерен: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
+"участник."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Изпращане на %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Поканени сте в стая."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Невалиден сървър"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "рангът е променен"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Употреба: /%s, показва имената на участниците в стаята."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Липсващ аргумент „contact_jid“"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: ../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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Промяна на информацията за състоянието"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Промяна на състоянието"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Настройване на съобщението за състояние и описанието му"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "На линия"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Не съм на разположение"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Не ме притеснявайте"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Изключен - изключване"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Описание на състоянието:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Състоянието беше променено."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Излизане от стаите"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s от стая %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Не сте влезли в стая."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Стаи"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Напуснахте следните стаи:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Препращане на непрочетени съобщения"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Всички непрочетени съобщения бяха препратени."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Препращане на непрочетени съобщения"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Използване на DBus и Notification-Daemon за показване на уведомленията"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Отсъствам поради липса на активност над $T мин)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време в минути, след което състоянието да се променя на „Не съм на "
 "разположение“."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Не съм на разположение поради липса на активност над $T мин)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Невалиден псевдоним"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "текст на съобщението за състояние"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Показване на събитието в спис_ъка"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Показване на събитието в спис_ъка"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Показване на нови съобщения в изскачащ прозорец?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Запитване за файлов трансфер"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Файловият трансфер е прекъснат"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Покана за разговор в стая"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Невалиден псевдоним"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Промяна на псевдонима"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "текст на съобщението за състояние"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3800,17 +3967,17 @@ msgstr ""
 "свиват автоматично."
 
 #. sorted alphanum
-#: ../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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "по подразбиране"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Език, който да се използва за проверката на правописа"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3821,7 +3988,7 @@ msgstr ""
 "„print_ichat_every_foo_minutes“.\n"
 "„never“ - никога да не се изписва часа."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3832,18 +3999,18 @@ msgstr ""
 "1 е най-прецизния часовник, 4 е най-относителния. Това е в сила само ако "
 "опцията „print_time“ е настроена на „sometimes“."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако е активирана, не се премахват */_. Така *абв* ще е в получер стил, но "
 "със символите * *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3854,7 +4021,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Ако искате да използвате "
 "това, инсталирайте docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3862,7 +4029,7 @@ msgstr ""
 "Знак за добавяне след името на псевдонима при използване на автоматично "
 "допълване (TAB) в стая."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3870,7 +4037,13 @@ msgstr ""
 "Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
 "той вече е използван от някой в стаята."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3881,60 +4054,70 @@ msgstr ""
 "документацията на Питон относно „strftime“ за повече информация: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Знаци, които се изобразяват в разговори след псевдонима"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Добавяне на * и [n] към заглавието на списъка?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колко минути да отделят последните редове от предишния разговор."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3943,13 +4126,13 @@ msgstr ""
 "Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
 "„WIKTIONARY“, което означава използване на wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3961,14 +4144,14 @@ msgstr ""
 "„listen_to_network_manager“ и се синхронизират с общото състояние) в "
 "зависимост от състоянието на мрежовата връзка."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3976,7 +4159,7 @@ msgstr ""
 "Показвани уведомления за състоянието на разговора в прозорците за разговор. "
 "Може да бъде „all“, „composing_only“, „disabled“."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3984,33 +4167,35 @@ msgstr ""
 "Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
 "„sometimes“), да се показва на всеки x минути."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4019,28 +4204,34 @@ msgstr ""
 "към локалните интерфейси за файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Уведомяване за събития в областта за уведомяване."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4052,18 +4243,18 @@ msgstr ""
 "15, 16, 17 и 18. По-големите числа са по-сигурни, но изчисленията отнемат "
 "повече време в началото на сесията."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Показване на нови съобщения в изскачащ прозорец?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4073,14 +4264,14 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ако е активирана, Gajim ще проверява дали е стандартния Джабър клиент при "
 "всяко стартиране."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4088,7 +4279,7 @@ msgstr ""
 "Ако е активирана, ще се изобразява икона във всеки подпрозорец, съдържащ "
 "непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4096,12 +4287,12 @@ msgstr ""
 "Ако е активирана, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Позиция на аватара в списъка.  Може да е ляво (left) или дясно (right)."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4109,7 +4300,7 @@ msgstr ""
 "Ако е активирана, ще се изпраща запитване за аватар до всеки контакт, който "
 "е нямал такъв последния път или пък има остарял кеширан аватар."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4117,9 +4308,10 @@ msgstr ""
 "Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4131,30 +4323,34 @@ msgstr ""
 "съобщения за състояние. Ако е „in_and_out“, ще се изписва само „Сульо влезе "
 "в стаята“ или „Сульо напусна“."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Цвят на фона на контактите, които се включват."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Цвят на фона на контактите, които се изключват."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ако е активирана, ще се използва по-малък шрифт от стандартния за "
 "възстановените съобщения."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Да не се показва аватара на транспорта."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Да не се показва списъка в панела."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4164,7 +4360,7 @@ msgstr ""
 "прозорецът ще мига (стандартното поведение при повечето мениджъри на "
 "прозорци) при задържане на чакащи събития."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4175,7 +4371,8 @@ msgstr ""
 "информация от тип SHA при присъствие в стаи."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4183,7 +4380,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Контролира прозореца, където се отварят нови съобщения.\n"
@@ -4195,34 +4392,42 @@ msgstr ""
 "„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
 "специфичен прозорец."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
 "подпрозореца."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Скрива бутоните в прозорците за разговор."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрива лентата в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4230,15 +4435,15 @@ msgstr ""
 "В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
 "който е написал предното съобщение."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прелистване на съобщение в прозореца за разговор"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4246,11 +4451,11 @@ msgstr ""
 "Списък с цветове, разделени с „:“, които да се използват за оцветяване на "
 "псевдонимите в стаите."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4258,7 +4463,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4267,7 +4472,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4276,7 +4481,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4286,7 +4491,7 @@ msgstr ""
 "прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
 "отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4294,7 +4499,7 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4303,7 +4508,7 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4311,7 +4516,7 @@ msgstr ""
 "Ако е активирана, Gajim ще показва броя на включените контакти и общия брой "
 "в редовете за акаунти и групи."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4319,7 +4524,7 @@ msgstr ""
 "Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
 "съобщения се третират като от указания тип."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4328,21 +4533,13 @@ msgstr ""
 "изпратил последното съобщение, в случай, че прозорецът за разговор не е вече "
 "отворен."
 
-#: ../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“ низа между $$ и $$ в "
-"изображение преди да го вмъкне в прозореца за разговор."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Необходимо време без активност преди прозорецът за промяна на състоянието да "
 "се затвори."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4350,7 +4547,7 @@ msgstr ""
 "Максимален брой редове, които да се показват в разговорите. Най-старите "
 "редове се изчистват."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4359,19 +4556,11 @@ msgstr ""
 "Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
 "прикрепени към иконата в областта за уведомяване."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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. По-голяма стойност означава по-голям размер."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4380,47 +4569,76 @@ msgstr ""
 "Валидни схеми на адреси. Само схемите в този списък ще бъдат достъпни като "
 "„истински“ адреси."
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
+"използва стандартно зададеното."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4428,7 +4646,7 @@ msgstr ""
 "Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
 "Приоритетите се настройват в опциите „autopriority_*“."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4437,38 +4655,38 @@ msgstr ""
 "„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
 "„restore_last_status“ е изключена."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Ако е активирана, възстановява се последното използвано състояние."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ако е изключена, не се се подписват съобщенията за състояние с ключ на GPG, "
 "дори и да е конфигуриран."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Активира шифриране тип „ESessions“ за този акаунт."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Дали Gajim да започва шифрирана сесия автоматично, ако е възможно?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4476,54 +4694,68 @@ msgstr ""
 "Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
 "„ssl“ или „plain“."
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показване на предупреждение преди използване на стандартната библиотека на "
 "SSL."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Колко секунди да се чака за отговор на изпратен пакет за поддържане на "
 "връзката, преди да да се опита свързване наново."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Заобикалка заради Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4531,15 +4763,34 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Отговор на заявки"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Изпратени заявки"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s иска да ви изпрати файл."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4547,127 +4798,157 @@ msgstr ""
 "Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
 "съобщения да се запазват в дневник?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Използване на удостоверяване"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Използване на удостоверяване"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Активиран ли е OpenPGP за този контакт?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Език, за който желаете да се проверяват сгрешените думи."
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "„all“ или състояния, разделени с интервал"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "„yes“, „no“ или „both“"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, така че ми оставете съобщение."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4675,27 +4956,186 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "За"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "искане за отписване от %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Грешка при запис"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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) или изтриете "
+"(цялата история ще бъде загубена)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Стаята е била унищожена"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Вместо това може да влезете в тази стая: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Невалиден Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "грешка при изпращане на %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Неизвестна грешка на SSL: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Ново еднократно съобщение"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ново еднократно съобщение от %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Ново лично съобщение"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Ново лично съобщение от стая „%s“"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Съобщение от %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Ново съобщение"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Ново съобщение от %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s промени състоянието си"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s вече е %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Контактът промени състоянието си"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s се включи"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Включи се контакт"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s се изключи"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Изключи се контакт"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Неуспех при зареждането на модула „idle“"
@@ -4705,218 +5145,195 @@ msgstr "Неуспех при зареждането на модула „idle�
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Регистриране в %s"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 "Грешка при запис"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
 msgstr ""
+"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
+"roster."
 
-#: ../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.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Неуспех при получаването на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Неуспех при дешифрирането на подписа на сертификата"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Неуспех при декодирането на публичния ключ на издателя"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Грешка при проверката на подписа на сертификата"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Сертификатът все още не е валиден"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "Валидността на списъка с отменени сертификати е изтекла"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
 "сертификати"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
 "сертификати"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Изчерпана памет"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Само-подписан сертификат"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Само-подписан сертификат в удостоверителската верига"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Неуспех при проверката на първия сертификат"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Удостоверителската верига е твърде дълга"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Сертификатът е отменен"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Невалиден сертификат на удостоверителя"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Максималната дължина на пътя е надвишена"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Неподдържана цел на сертификата"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Сертификатът не е доверен"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Сертификатът е отхвърлен"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Несъответствие на издателя на сертификата"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Несъответствие на идентификатора и сертифициращия орган"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Основната употреба не включва подписване на сертификати"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4925,80 +5342,81 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Свържете се наново."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: "
 "%(error)s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сървърът „%s“ предостави различна форма за регистрация"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Неизвестна грешка на SSL: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, python-format
 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:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Неуспех при свързване с „%s“"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, 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:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -5007,7 +5425,7 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -5016,24 +5434,33 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Проверете връзката или опитайте отново по-късно"
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Автентичността на сертификата на %s може да е под въпрос."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Неуспех при свързване с „%s“"
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Грешка при премахването на списъка за уединение"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5042,68 +5469,68 @@ msgstr ""
 "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
 "свързаните ви ресурси. Изключете го и опитайте отново."
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Покана на _контакти"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Не е в списъка"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Възможностите за D-Bus не могат да бъдат използвани"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
@@ -5118,7 +5545,7 @@ msgstr ""
 "Услугата не е налична: Gajim не е стартиран или „remote_control“ е "
 "„Изключена“"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
 
@@ -5303,267 +5730,294 @@ msgstr "Края на седмицата"
 msgid "Weekend!"
 msgstr "Събота и неделя!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Не съм на разположение"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Временно прекъснат"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Временно прекъснат"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Невидим"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "От"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Собственик"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Член"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "пише съобщение…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " от стая %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " от потребител %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Изтече времето за зареждане на изображението"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Изображението е твърде голямо"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "Списъкът с отменени сертификати все още не е валиден"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Изтече времето за зареждане на изображението"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Настройки на стаята"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5575,111 +6029,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Грешка: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s не е валидно ниво за дневник"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Стандартно съобщение"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Размер: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Файл: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "зелена"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "грешка: %s не може да бъде отворен за четене"
+msgid "Error: cannot open %s for reading"
+msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "синьозелена"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
@@ -6316,19 +6784,115 @@ msgstr "Уча"
 msgid "Writing"
 msgstr "Пиша"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "по подразбиране"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "морска"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Крия се"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Акаунт"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Акаунт"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Описание"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Грешка."
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "един"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "стая"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "адрес"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Неизвестен изпълнител"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Неизвестно заглавие"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Неизвестен източник"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6337,22 +6901,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> на <i>%(artist)s</i>\n"
 "от <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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. Файловият трансфер ще "
-"бъде отменен."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6360,11 +6910,11 @@ msgstr ""
 "[Това е част от шифрирана сесия. Ако виждате това съобщение, нещо не е както "
 "трябва.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Грешка на Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6374,44 +6924,43 @@ msgstr ""
 "Изпращането и получаването на съобщения тип „link-local“ може и да не "
 "функционира правилно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Неуспех при стартирането на локална услуга"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Неуспех при свързването с порт %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Проверете дали е стартиран avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Съобщението ви не можа да бъде изпратено."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6424,24 +6973,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка при добавянето на услугата. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Стандартно съобщение"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Няма наличен речник за %s език"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6450,220 +6999,221 @@ msgstr ""
 "За да използвате проверката за правопис, трябва да инсталирате %s речник или "
 "да изберете друг език чрез настройването на опцията „speller_language“."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Свързване наново?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Имате активни разговори за акаунт „%s“"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Преименуване на акаунт"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Въведете ново име за акаунт „%s“"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия ключ на OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Сървърът ви не поддържа визитки"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Списък с отлъчени"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Отлъчване…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6671,11 +7221,11 @@ msgstr ""
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Добавяне на член…"
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6683,11 +7233,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик…"
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6695,11 +7245,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор…"
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6707,7 +7257,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6724,111 +7274,108 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Емотиконите са изключени"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Какво искате да направите?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Премахване на акаунт _само от Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "Всички"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "Без"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Нова стая"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Невалиден псевдоним"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Невалиден сървър"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6838,33 +7385,33 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Задайте сървър, където искате да се регистрирате."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6879,7 +7426,7 @@ msgstr ""
 "Грешка на SSL: %(error)s\n"
 "Все още ли искате да се свържете с този сървър?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6890,72 +7437,89 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "Възелът на PEP не беше премахнат"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Настройване"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Първо получено съобщение"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Следващо получено съобщение в прозорец на фокус"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Следващо получено съобщение в прозорец без фокус"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Получена поща от Gmail"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6965,7 +7529,7 @@ msgstr ""
 "получено от отсрещния контакт. Ако иконата остане\n"
 "дълго време, най-вероятно съобщението е било изгубено."
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6973,236 +7537,237 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто\n"
 "за последен път сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Изход"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Вчера"
 msgstr[1] "Вчера"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Неуспех при зареждането на модула „idle“"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "В списъка вече има такъв Jabber ID"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Идентификатор на ключ"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Задаване на настроение"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Презаписване на съобщението за състояние?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Адрес на AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Номер на GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Номер на ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Адрес на MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Адрес на Yahoo!:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Не може да добавите себе си към списъка."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
 msgstr "Джабър клиент за GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Версия на GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Версия на PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Текущи разработчици:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Бивши разработчици:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@gnu.org>\n"
@@ -7211,7 +7776,7 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7224,102 +7789,157 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Несигурна връзка"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"На път сте да изпратите паролата си чрез несигурна връзка. Трябва да "
+"инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
+"да го направите?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Да, наистина искам да се свържа по несигурен начин"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Да _не се задава този въпрос отново"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Грешен адрес"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Това не е стая"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не е име на стая."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7328,168 +7948,138 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Неуспех при анализирането на „%s“."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Включи се контакт"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Изключи се контакт"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Ново съобщение"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Ново еднократно съобщение"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Ново лично съобщение"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Покана за разговор в стая"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Контактът промени състоянието си"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML конзола"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Тъжен"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "П_ремахване"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7497,194 +8087,190 @@ msgid ""
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Добавяне на _контакт"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Добавяне на _контакт"
+msgstr[1] "Добавяне на _контакт"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Премахване на контакт от списъка"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Премахване на контакт от списъка"
+msgstr[1] "Премахване на контакт от списъка"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Невалидно име на сървър"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Услугата върна грешка."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Поканени сте в стая."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Искате ли да приемете поканата?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Условие"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "когато съм "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7695,19 +8281,19 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Вече се проверили идентичността на този контакт."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Идентичността на контакта проверена"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Проверка наново…"
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7717,19 +8303,19 @@ msgstr ""
 "съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
 "му като натиснете бутона по-долу."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Идентичността на контакта НЕ Е проверена"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Проверка…"
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Проверихте ли идентичността на контакта?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7744,84 +8330,125 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "Има зададен ключ на GPG за този контакт, но <b>вие не му се доверявате</b>, "
 "така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
 "този ключ, използвайте клиент на GPG."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "Има зададен ключ на GPG за този контакт и вие му се доверявате, така че "
 "съобщенията ще бъдат шифрирани."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "за акаунт „%s“"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Само-подписан сертификат"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Други"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Стаи за разговор"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7829,312 +8456,298 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Невалидно име на сървър"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %(address)s от акаунт „%(account)s“"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Изпълнение на команда"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканиране на %(current)d / %(total)d…"
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Идентификатор"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Записан"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Ново съобщение"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
-#: ../src/features_window.py:49
+#: ../src/features_window.py:50
 #, fuzzy
-msgid "SSL certificat validation"
+msgid "SSL certificate validation"
 msgstr "Грешка в сертификата на SSL"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Изисква python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Разговори с автоматично открити контакти в локалната мрежа (без сървър)."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Изисква python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Команди: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипт за управление на Gajim от командния ред."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Шифриране на съобщения с ключове на GPG."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Изисква gpg и python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Автоматично засичане на състоянието на мрежата."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Изисква gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Управление на сесии"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Запазва сесията на Gajim при излизане и я възстановява при влизане."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Изисква python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Парола за влизане в стаята"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Паролите могат да се съхраняват по сигурен начин, вместо в обикновен текст."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 #, fuzzy
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Изисква gnome-keyring и python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Възможност за свързване към сървъри, които използват записи SRV."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Изисква dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Проверка на правописа"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Проверка на изходящите съобщения за правописни грешки."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Изисква python-sexy."
 
 #: ../src/features_window.py:85
 #, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Изисква python-sexy."
+
+#: ../src/features_window.py:86
+#, fuzzy
 msgid "Notification"
 msgstr "Уведомления"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Изскачащи прозорци с уведомления за нови събития."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "Изисква python-notify или python-dbus заедно с notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Възможност за измерване на времето на бездействие, с цел да се установи "
 "автоматично съобщение за състояние."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Изисква python-gnome2."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Трансформира изрази на LaTex, разграничени с $$ $$."
-
-#: ../src/features_window.py:95
-#, 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
-#, 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. Трябва да активирате опцията "
-"„use_latex“ в редактора на настройки за напреднали."
-
-#: ../src/features_window.py:97
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Шифриране тип „End to End“"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Шифриране на разговорите."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Изисква python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "Генератор на RST"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8142,173 +8755,200 @@ 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:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Изисква python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Изисква python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Изисква python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Изисква python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "На линия"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Функционалност"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Файл:"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Време"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Напредък"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Вие"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Файловият трансфер завърши"
-
-#: ../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
-msgid "Connection with peer cannot be established."
-msgstr "Не може да бъде установен контакт с отсрещната машина."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получател: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Грешка: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Файловият трансфер е преустановен"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Избор на файл за изпращане…"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Описание: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Този файл се използва от друг процес."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Файл: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Тип: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Описание: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s иска да ви изпрати файл:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Неуспех при презаписването на съществуващия файл „%s“"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папката „%s“ не е разрешена за запис"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Нямата права да създавате файлове в тази папка."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Запазване на файла като…"
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Файл: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Тип: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Описание: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s иска да ви изпрати файл:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Изпращане на профила…"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Грешка при файловия трансфер"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8316,69 +8956,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Невалиден файл"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "съобщение"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Емотикони:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Показване на събитието в спис_ъка"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Редактор на настройки за напреднали"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Настройки на стаята"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Необходим е X сървър. Спиране на програмата…"
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim изисква GTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim изисква pywin32"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8386,12 +9063,11 @@ msgid ""
 msgstr ""
 "Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim вече е стартиран"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8399,28 +9075,28 @@ msgstr ""
 "Изглежда вече е стартирана друга инстанция на Gajim\n"
 "Продължаване въпреки това?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Показва помощ за специфична команда"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8428,54 +9104,58 @@ 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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "акаунт"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "състояние"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "съобщение"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8484,22 +9164,50 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Промяна на състоянието на акаунта или акаунтите"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Приори_тет:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Искам да регистрирам нов акаунт"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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.py:130
 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.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8509,35 +9217,30 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8547,135 +9250,132 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 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.py:176
 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.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "име на настройката за изтриване"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Добавяне на контакт към списъка"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Добавяне на нов контакт към този акаунт"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:243
 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-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отваря прозореца „Започване на разговор“"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Започване на разговор, като се използва този акаунт"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Изпраща указан XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML за изпращане"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8683,44 +9383,94 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Промяна на състоянието"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Псевдоним"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
+"акаунти"
+
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработка на адрес тип xmpp://"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "адрес"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "Адрес за обработка"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Акаунт, за който искате да го обработите"
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "текст на съобщението"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Влизане в стая"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "стая"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "JID на стая"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "псевдоним"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Псевдоним"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "парола"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Парола за влизане в стаята"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Акаунт, от който искате да влезете в стаята"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Показва или скрива прозореца на IPython"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8729,166 +9479,45 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"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-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\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 "Грешен адрес"
-
-#: ../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
-#, 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: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; ако не е указан, ще се изпрати до всички "
-"акаунти"
-
-#: ../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
-#, fuzzy
-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
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8897,7 +9526,7 @@ msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8906,10 +9535,14 @@ msgstr ""
 "Не е указан аргумент „%(arg)s“.\n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Грешен адрес"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тема"
@@ -8932,178 +9565,216 @@ msgid "You cannot delete your current theme"
 msgstr "Не може да изтриете текущата тема"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s вече е познат като %(new_nick)s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s зададе темата на %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "На всеки участник е позволено да вижда вашия JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Стаята показва отсъстващ член"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "Стаята не показва отсъстващи членове"
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Възникна промяна в конфигурацията на стаята (не е свързана с настройки за "
+"уединение)"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Воденето на дневник на стаята е включено"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Воденето на дневник на стаята е изключено"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Стаята не е анонимна"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Стаята е полу-анонимна"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Стаята е напълно анонимна"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Беше създадена нова стая"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "рангът е променен"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "Изключване на системата"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Jabber ID на стаята съдържа непозволени знаци."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Унищожаване на %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9111,22 +9782,22 @@ msgstr ""
 "Определено сте на път да унищожите тази стая.\n"
 "Може да укажете причина по-долу:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Може да въведете и друго място за срещи:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
@@ -9150,68 +9821,62 @@ msgstr "_Докладване на грешка"
 msgid "Details"
 msgstr "Подробности"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не е стандартния Джабър клиент"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Искате ли Gajim да бъде стандартния Джабър клиент?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Винаги да се проверява дали Gajim е стандартния Джабър клиент при всяко "
 "стартиране"
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Разширението не се поддържа"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Запазване на изображението като…"
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9222,93 +9887,87 @@ msgstr ""
 "участник.\n"
 "Укажете друг псевдоним по-долу:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Вие сте отлъчени от стаята %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Стаята %s не съществува."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Искане за записване"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9316,113 +9975,104 @@ msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Отписване"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Неуспех при установяването на контакт с „%s“"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s зададе темата на %(subject)s"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr "Стаята показва отсъстващ член"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "Стаята не показва отсъстващи членове"
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
-"Възникна промяна в конфигурацията на стаята (не е свързана с настройки за "
-"уединение)"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "Воденето на дневник на стаята е включено"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Воденето на дневник на стаята е изключено"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Стаята не е анонимна"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Стаята е полу-анонимна"
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Стаята е напълно анонимна"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
 "или е предоставил грешна парола.\n"
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Валидността на сертификата е изтекла"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
+
+#: ../src/gui_interface.py:704
 #, fuzzy
-msgid "GPG key not trusted"
+msgid "OpenPGP key not trusted"
 msgstr "GPG не е използваем"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 #, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
 "променливата на обкръжението не е настроена)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9437,103 +10087,86 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Премахване на контакт от списъка"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Error opening file"
-msgstr "Грешка при четене на файл:"
+msgid "File Transfer Failed"
+msgstr "Файлови трансфери"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Неуспех при дешифрирането на съобщение от %s\n"
-"Възможно е да е било фалшифицирано."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Неуспех при дешифриране на съобщението"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Пинг?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Понг! (%s сек)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Грешка."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Конфликт на ресурсите"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при проверка на сертификата на SSL"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9544,15 +10177,20 @@ msgstr ""
 "%(error)s\n"
 "Все още ли искате да се свържете със сървъра?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Грешка в сертификата на SSL"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Грешка в сертификата на SSL"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9568,28 +10206,7 @@ msgstr ""
 "\n"
 "Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-msgid "Insecure connection"
-msgstr "Несигурна връзка"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-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:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr "Да, наистина искам да се свържа по несигурен начин"
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9598,7 +10215,7 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9608,17 +10225,17 @@ msgstr ""
 "че искате да го направите?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Емотиконите са изключени"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Темата с емотикони не беше намерена, така че са изключени."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9628,86 +10245,88 @@ msgstr ""
 "формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
 "повече подробности."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: ../src/gui_interface.py:3426
+#: ../src/gui_interface.py:3058
 #, fuzzy
-msgid "GPG key expired"
+msgid "OpenPGP key expired"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Нова стая"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "създаване на папка %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Контакти"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Съобщение"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9715,7 +10334,7 @@ msgstr ""
 "Искате ли да изчистите базата от данни? (ИЗОБЩО НЕ СЕ ПРЕПОРЪЧВА АКО GAJIM Е "
 "СТАРТИРАН)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9729,96 +10348,111 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте…"
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Грешка в базата от данни"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Изнасяне на записите на разговорите…"
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)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] "Наистина ли искате да изтриете дневниците на избраните контакти?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Наистина ли искате да изтриете избраното съобщение?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Наистина ли искате да изтриете дневниците на избрания контакт?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Отмяна на потвърждението"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Грешка при запис/четене от диска"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 #, fuzzy
 msgid "Error"
 msgstr "Грешка."
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Изтече времето за зареждане на изображението"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Програмирам"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Изображението е твърде голямо"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Съобщения"
 
@@ -9830,152 +10464,165 @@ msgstr "— ще бъде воден дневник за съобщенията"
 msgid "- messages will not be logged"
 msgstr "— няма да бъде воден дневник за съобщенията"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s промени състоянието си"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "_Игнориране"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s се включи"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s се изключи"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Отлъчване на %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Ново еднократно съобщение от %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Неуспех при свързването"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Ново лично съобщение от стая „%s“"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Услугата изпрати лошо форматирани данни"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Съобщение от %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Този файл вече съществува"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Ново съобщение от %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "_Игнориране"
+msgid "Configuration"
+msgstr "Настройки на стаята"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Файлът не съдържа нищо"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Извличане на профила…"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Файлът не съдържа нищо"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Информация за контакта"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Получена информация"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Изпращане на профила…"
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Информацията НЕ Е публикувана"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG не е използваем"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9983,39 +10630,39 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "без синхронизация"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Отменя файловия трансфер"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10023,16 +10670,16 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10040,11 +10687,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10053,70 +10700,70 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "тези транспорти: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10125,11 +10772,11 @@ msgstr ""
 "ще ви вижда изключен."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10137,16 +10784,16 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10155,50 +10802,51 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10208,23 +10856,28 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Изпращане на %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Изпращане на файл до контакт"
+
+#: ../src/roster_window.py:4834
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Изпращане на файл до контакт"
@@ -10234,131 +10887,131 @@ msgstr "Изпращане на файл до контакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Управление на отметките…"
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Настройване на услуги…"
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Изпращане на еднократно съобщение"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Изпълнение на команда…"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Изключване"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Изключване"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние…"
 
@@ -10375,24 +11028,14 @@ msgstr "Грешка в получените данни"
 msgid "No result"
 msgstr "Няма резултати"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Грешка при запис на диска"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Тема: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Потвърждение на тези настройки на сесията"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10404,7 +11047,7 @@ msgstr ""
 "\n"
 "\tДопустими ли са тези настройки?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10419,147 +11062,152 @@ msgstr ""
 "\n"
 "Продължаване с тази сесия?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Активиран ли е OpenPGP за този контакт?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние…"
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "в с_писъка"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s на тази стая"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [минимизиран]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Последно състояние: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " от %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " от %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Настроение:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Дейност:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Песен:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Уведомления"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Временно прекъснат"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10567,33 +11215,33 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е извън употреба или повредена"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10601,7 +11249,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10609,13 +11257,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10623,18 +11271,396 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Няма чакащо запитване за записване."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Избор на файл за изпращане…"
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " отворен прозорец/подпрозорец с този контакт "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Действия</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Условия</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Действия за напреднали"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Контрол на уведомления за напреднали"
+
+#~ msgid "All statuses"
+#~ msgstr "Всички състояния"
+
+#~ msgid "Busy "
+#~ msgstr "Зает "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Контактът промени състоянието си"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Изключване на контакт"
+
+#~ msgid "Don't have "
+#~ msgstr "нямам "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Файловият трансфер е преустановен"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Осветено съобщение в стая"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Получено съобщение в стая"
+
+#~ msgid "Have "
+#~ msgstr "имам "
+
+#~ msgid "Launch a command"
+#~ msgstr "Изпълнение на команда"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Едно или повече определени състояния…"
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "На линия / Свободен за разговор"
+
+#~ msgid "Play a sound"
+#~ msgstr "Изпълнение на звук"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Ново лично съобщение"
+
+#~ msgid "When "
+#~ msgstr "Когато "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Активиране на подсказката за спешност на мениджъра на прозорци, за да "
+#~ "мига прозореца в панела"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Изключване на автоматичното появяване на прозорец за разговор"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Изключване на съществуващ изскачащ прозорец"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Изключване на съществуващ звук за това събитие"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Изключване на показване на събитието в списъка"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Изключване на показване на събитието в списъка"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Информиране с изскачащ прозорец"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Отваряне на прозорец за разговор с потребителя"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Показване на събитието в спис_ъка"
+
+#~ msgid "and I "
+#~ msgstr "и аз "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Контакти"
+
+#~ msgid "for "
+#~ msgstr "за "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Група"
+
+#~ msgid "when I'm in"
+#~ msgstr "когато съм"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Показване на профила на контакта (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Позволение за виждане на състоянието ми"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Описание: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Напреднали…"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Показване на _дейност на контактите в списъка"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Показване на _слушаната от контактите музика в списъка"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Показване на _настроенията на контактите в списъка"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
+#~ "списъка."
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите "
+#~ "в списъка."
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите "
+#~ "музика в списъка."
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Изпращане на _еднократно съобщение…"
+
+#~ msgid "User avatar:"
+#~ msgstr "Аватар:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Моментни съобщения (Gajim)"
+
+#~ msgid "English"
+#~ msgstr "английски"
+
+#~ msgid "Belarusian"
+#~ msgstr "белоруски"
+
+#~ msgid "Bulgarian"
+#~ msgstr "български"
+
+#~ msgid "Breton"
+#~ msgstr "бретонски"
+
+#~ msgid "Czech"
+#~ msgstr "чешки"
+
+#~ msgid "German"
+#~ msgstr "немски"
+
+#~ msgid "Greek"
+#~ msgstr "гръцки"
+
+#~ msgid "British"
+#~ msgstr "британски английски"
+
+#~ msgid "Esperanto"
+#~ msgstr "есперанто"
+
+#~ msgid "Spanish"
+#~ msgstr "испански"
+
+#~ msgid "Basque"
+#~ msgstr "баски"
+
+#~ msgid "French"
+#~ msgstr "френски"
+
+#~ msgid "Croatian"
+#~ msgstr "хърватски"
+
+#~ msgid "Italian"
+#~ msgstr "италиански"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "норвежки (Bokmål)"
+
+#~ msgid "Dutch"
+#~ msgstr "холандски"
+
+#~ msgid "Norwegian"
+#~ msgstr "норвежки (Nynorsk)"
+
+#~ msgid "Polish"
+#~ msgstr "полски"
+
+#~ msgid "Portuguese"
+#~ msgstr "португалски"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "бразилски португалски"
+
+#~ msgid "Russian"
+#~ msgstr "руски"
+
+#~ msgid "Serbian"
+#~ msgstr "сръбски"
+
+#~ msgid "Slovak"
+#~ msgstr "словашки"
+
+#~ msgid "Swedish"
+#~ msgstr "шведски"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "китайски"
+
+#~ msgid "Spelling language"
+#~ msgstr "Език за проверка на правописа"
+
+#~ 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 ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Променете стойността за увеличаване или намаляване размера на "
+#~ "изобразените формули на LaTeX. По-голяма стойност означава по-голям "
+#~ "размер."
+
+#~ msgid "all or space separated status"
+#~ msgstr "„all“ или състояния, разделени с интервал"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "„yes“, „no“ или „both“"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "„yes“, „no“ или „“"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Проверете връзката или опитайте отново по-късно"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "грешка: %s не може да бъде отворен за четене"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Неуспех при свързването с порт %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Навярно имате стартирана друга инстанция на Gajim. Файловият трансфер ще "
+#~ "бъде отменен."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Джабър клиент за GTK+"
+
+#~ msgid "Condition"
+#~ msgstr "Условие"
+
+#~ msgid "when I am "
+#~ msgstr "когато съм "
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Изисква gpg и python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Трансформира изрази на 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“ в редактора на настройки за напреднали."
+
+#, 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. Трябва да активирате опцията "
+#~ "„use_latex“ в редактора на настройки за напреднали."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Изисква python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "едно от: offline (изключен), online (на линия), chat (свободен за "
+#~ "разговор), away (отсъствам), xa (не съм на разположение), dnd (зает), "
+#~ "invisible (невидим)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr ""
+#~ "Връща текущото съобщение за състояние (общото, в случай, че не е указан "
+#~ "акаунт)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Твърде много аргументи. \n"
+#~ "Напишете „%(basename)s help %(command)s“ за повече информация"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Не е указан аргумент „%(arg)s“.\n"
+#~ "Напишете „%(basename)s help %(command)s“ за повече информация"
+
+#~ msgid "Contacts"
+#~ msgstr "Контакти"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Грешка при запис на диска"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Тема: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Настроение:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Дейност:"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Изключване на показване на събитието в областта за уведомяване"
 
@@ -10652,34 +11678,12 @@ 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 "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 "Промяна на акаунт"
 
@@ -10782,9 +11786,6 @@ msgstr " ресурс с приоритет "
 #~ "История на разговори в стаи\n"
 #~ "История на всички разговори"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Управление на акаунти"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10952,18 +11953,9 @@ msgstr " ресурс с приоритет "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Задаване на ключ на Open_PGP"
 
-#~ 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.)"
@@ -10971,12 +11963,6 @@ msgstr " ресурс с приоритет "
 #~ "Употреба: /%(command)s <действие>, изпраща действие до текущата стая. "
 #~ "Използва се трето лице (напр. „/%(command)s експлодира“)."
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Употреба: /%s, изпраща „ping“ до контакта."
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Употреба: /%s, изпраща съобщение до контакта."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Няма помощна информация за /%s"
 
@@ -10994,10 +11980,6 @@ msgstr " ресурс с приоритет "
 #~ msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Псевдонимът не е намерен: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -11009,13 +11991,6 @@ msgstr " ресурс с приоритет "
 #~ "псевдонима."
 
 #~ 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 ""
@@ -11055,9 +12030,6 @@ msgstr " ресурс с приоритет "
 #~ 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 ""
@@ -11092,9 +12064,6 @@ msgstr " ресурс с приоритет "
 #~ msgid "_Host:"
 #~ msgstr "_Хост:"
 
-#~ msgid "Show _roster"
-#~ msgstr "П_оказване на списъка"
-
 #, fuzzy
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Изберете акаунт, с който искате да синхронизирате"
diff --git a/po/br.po b/po/br.po
index e957c0c08..8614ff461 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,15 +7,11 @@
 # , 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -27,326 +23,306 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Stad"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Titouroù hiniennel"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Kregiñ da flapiñ"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Ouzhpennañ un darempred..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 #, fuzzy
 msgid "_Execute Command..."
 msgstr "urzhiad"
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "_Kemmañ ar gont..."
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Digeriñ ar bostelerez"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Titouroù hiniennel"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Kregiñ da flapiñ"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Stad"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "_Kemmañ ar gont..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim : Assistant de création de compte"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>O krouiñ ar gont</b>\n"
-"\n"
-"Gortozit marplij..."
+"Rankout a rit kaout ur gont evit en em lugañ\n"
+"d'ar rouedad Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Diuzit unan eus an dibaboù dindan :</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Ger-kuzh:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Enrollañ ar _ger-kuzh"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Implij an diskleriañ"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Kevreañ pa bouezan war Echuiñ"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "ID _Jabber:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim : Assistant de création de compte"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Implij an diskleriañ"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Servijer:"
 
 #: ../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"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proksi:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Kemmañ..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Implij un anv ostiz/porzh personelaet"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Proksi:"
+msgid "_Hostname:"
+msgstr "Servijer:"
 
 #: ../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"
+msgid "_Port:"
+msgstr "_Porzh:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Aozañ ma aelad pa lugan"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Mont pelloc'h"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Rankout a rit kaout ur gont evit en em lugañ\n"
-"d'ar rouedad Jabber."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Echuiñ"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Servijer:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>O krouiñ ar gont</b>\n"
+"\n"
+"Gortozit marplij..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "ID _Jabber:"
+msgid "Connect when I press Finish"
+msgstr "Kevreañ pa bouezan war Echuiñ"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Ger-kuzh:"
+msgid "Set my profile when I connect"
+msgstr "Aozañ ma aelad pa lugan"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Porzh:"
+msgid "_Finish"
+msgstr "_Echuiñ"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servijer:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>A bep seurt</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Hini ebet"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Titouroù hiniennel</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Perzhioù</b>"
+msgid "Accounts"
+msgstr "Kontoù"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 #, fuzzy
-msgid "A_djust to status"
-msgstr "Goulenn evit gwelet e/he stad"
+msgid "Add"
+msgstr "Chomlec'h"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Kont"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Dilemel"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Kontoù"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "_Adenvel"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "Roll ar verourien"
+msgid "_Enable"
+msgstr "Enaouiñ"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Implij an diskleriañ"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
-msgid "Auto-reconnect when connection is lost"
-msgstr "Adkevreañ war-eeun pa vez kollet ar gevreadenn"
+msgid "Synchronize contacts"
+msgstr "Diskouez an darempredoù _ezlinenn"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Furchal"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "K_evreañ en ur loc'hañ Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "C_heñch ar ger-kuzh"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klikit evit cheñch ger-kuzh ar gont"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "Roll ar verourien"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Dibabit ur restr da gas..."
+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 ""
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Dibabit un _alc'hwezh..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Goulenn evit gwelet e/he stad"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klikit evit cheñch ger-kuzh ar gont"
+msgid "Priority will change automatically according to your status."
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
+msgid "Priori_ty:"
 msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Anv-arveriad-ez direizh"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "K_evreañ en ur loc'hañ Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Kevreadenn"
+msgid "Resour_ce:"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Postel:"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
+#: ../data/gui/accounts_window.ui.h:25
 #, fuzzy
-msgid "First Name:"
-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: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: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"
+msgid "Browse..."
+msgstr "_Furchal"
 
 #: ../data/gui/accounts_window.ui.h:26
 #, fuzzy
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la "
-"votre, les transferts de fichiers ont ainsi plus de chance de fonctionner."
+msgid "Certificate is e_ncrypted"
+msgstr "[Sifret eo ar gemennadenn-mañ]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
+msgid "Client certificate"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Kont"
 
 #: ../data/gui/accounts_window.ui.h:29
-#, fuzzy
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Si cette case est cochée, Gajim enverra des paquets de maintien de connexion "
-"pour prévenir des temps de latence pouvant entraîner des déconnexions"
+msgid "C_onnect on Gajim startup"
+msgstr "K_evreañ en ur loc'hañ Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -357,6 +333,19 @@ msgstr ""
 "loc'hañ"
 
 #: ../data/gui/accounts_window.ui.h:31
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Adkevreañ war-eeun pa vez kollet ar gevreadenn"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -365,232 +354,255 @@ msgstr ""
 "M'eo enaouet, kement cheñchamant graet war ar stad hollek (meret gant ar "
 "voestig e traoñ ar roll-darempredoù) a gemmo stad ar gont-mañ ivez"
 
-#: ../data/gui/accounts_window.ui.h:32
+#: ../data/gui/accounts_window.ui.h:35
+msgid "Use file transfer proxies"
+msgstr "Implij ar proksioù evit treuzkas restroù"
+
+#: ../data/gui/accounts_window.ui.h:36
+#, fuzzy
 msgid ""
-"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."
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
 msgstr ""
+"Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la "
+"votre, les transferts de fichiers ont ainsi plus de chance de fonctionner."
 
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "Titouroù diwar ho penn, miret war ar servijer"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Hollek"
 
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "ID Jabber:"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
 #, fuzzy
-msgid "Last Name:"
-msgstr "Anv:"
+msgid "_Manage..."
+msgstr "Kemmañ..."
 
-#: ../data/gui/accounts_window.ui.h:37
+#: ../data/gui/accounts_window.ui.h:40
 #, fuzzy
-msgid "Mer_ge accounts"
-msgstr "_Strollañ ar c'hontoù"
-
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Alc'hwez ebet diuzet"
-
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Titouroù hiniennel"
+msgid "<b>Proxy</b>"
+msgstr "<b>Perzhioù</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
+msgid "_Warn before using an insecure connection"
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr ""
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "_Adenvel"
+#: ../data/gui/accounts_window.ui.h:44
+#, fuzzy
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Si cette case est cochée, Gajim enverra des paquets de maintien de connexion "
+"pour prévenir des temps de latence pouvant entraîner des déconnexions"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr ""
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Implij un anv ostiz/porzh personelaet"
 
 #: ../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 ""
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Servijer:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porzh:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>A bep seurt</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
+msgid "Connection"
+msgstr "Kevreadenn"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Alc'hwez ebet diuzet"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr ""
+msgid "Choose _Key..."
+msgstr "Dibabit un _alc'hwezh..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Diskouez an darempredoù _ezlinenn"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
+"Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Implij un anv ostiz/porzh personelaet"
+msgid "_Edit Personal Information..."
+msgstr "Kemmañ an titouroù hiniennel..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Implij un anv ostiz/porzh personelaet"
+msgid "Information about you, as stored in the server"
+msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Implij ar proksioù evit treuzkas restroù"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Titouroù hiniennel</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Titouroù hiniennel"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Kemmañ an titouroù hiniennel..."
+msgid "Co_nnect on Gajim startup"
+msgstr "K_evreañ en ur loc'hañ Gajim"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-#, fuzzy
-msgid "_Enable"
-msgstr "Enaouiñ"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Servijer:"
+msgid "Use cust_om port:"
+msgstr "Implij un anv ostiz/porzh personelaet"
+
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
 
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
 #, fuzzy
-msgid "_Manage..."
-msgstr "Kemmañ..."
+msgid "First Name:"
+msgstr "Anv:"
 
 #: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/zeroconf_information_window.ui.h:9
 #, fuzzy
-msgid "_Port: "
-msgstr "_Porzh:"
+msgid "Last Name:"
+msgstr "Anv:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Postel:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "ID Jabber:"
 
-#: ../data/gui/add_new_contact_window.ui.h:1
+#: ../data/gui/accounts_window.ui.h:68
 #, fuzzy
-msgid "A_ccount:"
-msgstr "Kont"
+msgid "Mer_ge accounts"
+msgstr "_Strollañ ar c'hontoù"
+
+#: ../data/gui/add_new_contact_window.ui.h:1
+msgid "Add New Contact"
+msgstr "Ouzhpennañ un darempred nevez"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
 #, fuzzy
-msgid "A_llow this contact to view my status"
-msgstr "He/E aotren da welet ma stad"
+msgid "A_ccount:"
+msgstr "Kont"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Ouzhpennañ un darempred nevez"
+#, fuzzy
+msgid "_Protocol:"
+msgstr "Protokol:"
 
-#: ../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 "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
+#: ../data/gui/add_new_contact_window.ui.h:4
+#, fuzzy
+msgid "_User ID:"
+msgstr "ID arveriad-ez:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
-msgid ""
-"You have to register with this transport\n"
-"to be able to add a contact from this\n"
-"protocol. Click on register button to\n"
-"proceed."
-msgstr ""
-
-#: ../data/gui/add_new_contact_window.ui.h:9
-msgid ""
-"You must be connected to the transport to be able\n"
-"to add a contact from this protocol."
-msgstr ""
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+#, fuzzy
+msgid "_Nickname:"
+msgstr "Lesanv:"
 
-#: ../data/gui/add_new_contact_window.ui.h:11
+#: ../data/gui/add_new_contact_window.ui.h:6
 #, fuzzy
 msgid "_Group:"
 msgstr "Strollad:"
 
-#: ../data/gui/add_new_contact_window.ui.h:12
+#: ../data/gui/add_new_contact_window.ui.h:7
 #, fuzzy
-msgid "_Nickname:"
-msgstr "Lesanv:"
+msgid "A_llow this contact to view my status"
+msgstr "He/E aotren da welet ma stad"
 
-#: ../data/gui/add_new_contact_window.ui.h:13
+#: ../data/gui/add_new_contact_window.ui.h:8
 #, fuzzy
-msgid "_Protocol:"
-msgstr "Protokol:"
+msgid "_Save subscription message"
+msgstr "_Koumanant"
 
-#: ../data/gui/add_new_contact_window.ui.h:14
+#: ../data/gui/add_new_contact_window.ui.h:9
+msgid ""
+"You have to register with this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/gui/add_new_contact_window.ui.h:13
 #, fuzzy
 msgid "_Register"
 msgstr "_Emezelañ"
 
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Koumanant"
+#: ../data/gui/add_new_contact_window.ui.h:14
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:16
-#, fuzzy
-msgid "_User ID:"
-msgstr "ID arveriad-ez:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-#, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "Une erreur de protocole s'est produite :"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr ""
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
@@ -599,78 +611,84 @@ msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
-msgid "Error description..."
-msgstr "Taolennadur"
+msgid "Please wait while the command is being sent..."
+msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Echuiñ"
+msgid "Please wait..."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-#, fuzzy
-msgid "Please wait while retrieving command list..."
-msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
+msgid "This jabber entity does not expose any commands."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
 #, fuzzy
-msgid "Please wait while the command is sending..."
-msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
+msgid "<b>An error has occurred:</b>"
+msgstr "Une erreur de protocole s'est produite :"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr ""
+#, fuzzy
+msgid "Error description..."
+msgstr "Taolennadur"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr ""
+#, fuzzy
+msgid "F_inish"
+msgstr "_Echuiñ"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Aozer kefluniañ dre ar munut"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Sil:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Taolennadur</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTENN :</b> Dav eo deoc'h adloc'hañ Gajim evit ma vo efedus kemmoù 'zo"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Aozer kefluniañ dre ar munut"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Sil:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Distreiñ gant al livioù dre-ziouer"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Dilemel MOTD"
+#, fuzzy
+msgid "Show _XML Console"
+msgstr "Diskouez ar gonsol _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Flapoù prevez"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Merour-ez"
+
 #: ../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ñ"
+msgid "_Send Server Message..."
+msgstr "_Kas ur gemennadenn d'ar servijer"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Lakaat MOTD"
+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:7
 msgid "Sets Message of the Day"
@@ -678,284 +696,90 @@ msgstr "A laka kemennadenn an devezh"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
 #, fuzzy
-msgid "Show _XML Console"
-msgstr "Diskouez ar gonsol _XML"
+msgid "Set MOTD..."
+msgstr "Lakaat MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "A hiziva kemennadenn an devez"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Hizivaat MOTD"
 
-#: ../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:11
-msgid "_Administrator"
-msgstr "_Merour-ez"
+msgid "Delete MOTD"
+msgstr "Dilemel MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Kas ur gemennadenn d'ar servijer"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-#, fuzzy
-msgid "<b>Actions</b>"
-msgstr "<b>Poelladoù</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-#, fuzzy
-msgid "<b>Conditions</b>"
-msgstr "<b>Sonioù</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sonioù</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-#, fuzzy
-msgid "Advanced Actions"
-msgstr "Actions a_vancées"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-#, fuzzy
-msgid "Advanced Notifications Control"
-msgstr "Aozer kefluniañ dre ar munut"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-#, fuzzy
-msgid "All statuses"
-msgstr "Stad:"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Ezvezant"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Darempred diluget"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Darempred diluget"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Treuzkasoù"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Goulenn treuzkas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Sac'het an treuzkas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Message d'un Salon mis en Sur-brillance"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Kemennadenn digant ur sal-flapiñ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Diwelus"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-#, fuzzy
-msgid "Launch a command"
-msgstr "urzhiad"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Dihegerz"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-#, fuzzy
-msgid "Online / Free For Chat"
-msgstr "Prest da flapiñ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-#, fuzzy
-msgid "Play a sound"
-msgstr "_Seniñ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Kemennadenn hiniennel nevez"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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 ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-#, fuzzy
-msgid "_Disable auto opening chat window"
-msgstr "A guzha an nozelennoù er prenestroù webgaoz"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-#, fuzzy
-msgid "_Open chat window with user"
-msgstr "Utiliser une seule fenê_tre de discussion avec des onglets"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Diskouez er _roll hepken"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-#, fuzzy
-msgid "_Show event in roster"
-msgstr "Diskouez er _roll hepken"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Darempredoù"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-#, fuzzy
-msgid "for "
-msgstr "Porzh:"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Strollad"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr ""
+msgid "Deletes Message of the Day"
+msgstr "A zilam kemennadenn an devezh"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Hini ebet"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Penndibaboù"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-msgid "Auto"
+msgid "Concede"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Hini ebet"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Penndibaboù"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
+msgid "Auto"
 msgstr ""
 
 #: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
-msgid "Entry:"
-msgstr "Bro:"
+msgid "New entry received"
+msgstr "Pa resever un darvoud nevez"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr ""
+
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Feed name:"
 msgstr "anv ar gwiskadur"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
-msgid "Last modified:"
-msgstr "Anv:"
+msgid "Entry:"
+msgstr "Bro:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
+#: ../data/gui/atom_entry_window.ui.h:5
 #, fuzzy
-msgid "New entry received"
-msgstr "Pa resever un darvoud nevez"
+msgid "Last modified:"
+msgstr "Anv:"
 
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
 msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
@@ -964,28 +788,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Titouroù-stad raklakaet</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -993,326 +812,319 @@ msgstr "<b>Titouroù-stad raklakaet</b>"
 msgid "<b>Mood:</b>"
 msgstr "<b>Sonioù</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Titouroù-stad raklakaet</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cheñch ar ger-kuzh"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Roit anezhañ en-dro evit kadarnaat:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Roit ur ger-kuzh nevez:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Roit anezhañ en-dro evit kadarnaat:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Roit un titour-stad nevez</b>"
+#, fuzzy
+msgid "Save as Preset..."
+msgstr "Enrollañ evel raklakaet..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Oberiant"
+msgid "Mood:"
+msgstr "Webgaoz:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Webgaoz:"
+msgid "Activity:"
+msgstr "Oberiant"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Kemennadennoù raklakaet:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-#, fuzzy
-msgid "Save as Preset..."
-msgstr "Enrollañ evel raklakaet..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Roit un titour-stad nevez</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Ebarzhiñ ur _webgaoz"
+msgid "_Copy Link Location"
+msgstr "_Kopiañ chomlec'h an ere"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Ouzhpennañ er roll"
+msgid "_Open Link in Browser"
+msgstr "_Digerién an ere er furcher web"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiañ ar JID/Chomlec'h postel"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiañ chomlec'h an ere"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Digeriñ ar bostelerez"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Digerién an ere er furcher web"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Kregiñ da flapiñ"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr ""
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Ebarzhiñ ur _webgaoz"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Ouzhpennañ er roll"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "a zo aketus d'ar gaozeadenn"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "a zo aketus d'ar gaozeadenn"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Kas ur gemennadenn"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Kas"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Diwelus"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Sellerien"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-
-#: ../data/gui/contact_context_menu.ui.h:1
 #, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Goulenn evit gwelet e/he stad"
+msgid "MUC server"
+msgstr "Sellerien"
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Ouzhpennañ ur gelaouenn _ispisial"
+msgid "In_vite"
+msgstr "Diwelus"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Assigner une clé OpenPGP"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Kregiñ da _flapiñ"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "urzhiad"
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Kas ur gemennadenn _simpl..."
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Kemmañ ar _strolladoù"
+msgid "Send _File..."
+msgstr "Kas ur _restr"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Darempredoù"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Dilemel"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr ""
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Goulenn evit gwelet e/he stad"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "urzhiad"
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Kas ur gemennadenn _simpl..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Darempredoù"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Kas ur _restr"
+msgid "_Rename..."
+msgstr "_Adenvel"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Kemmañ ar _strolladoù"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Kregiñ da _flapiñ"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Assigner une clé OpenPGP"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
+msgid "Set Custom _Avatar..."
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr ""
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Ouzhpennañ ur gelaouenn _ispisial"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Koumanant"
 
 #: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
-msgid "_Allow him/her to see my status"
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Goulenn evit gwelet e/he stad"
 
 #: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
-msgid "_Forbid him/her to see my status"
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Istoradur"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Darempredoù"
+msgid "_Unignore"
+msgstr "_Kenderc'hel"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Adenvel"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Koumanant"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Dilemel"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "_Kenderc'hel"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Istoradur"
 
 #: ../data/gui/data_form_window.ui.h:1
+msgid "Room Configuration"
+msgstr "Kefluniañ ar webgaoz"
+
+#: ../data/gui/data_form_window.ui.h:2
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Er strollad"
 
-#: ../data/gui/data_form_window.ui.h:2
-msgid "Room Configuration"
-msgstr "Kefluniañ ar webgaoz"
-
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Kemmañ ar strolladoù"
@@ -1326,58 +1138,50 @@ msgstr "<b>Taolennadur</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Perzhioù ar servijerien"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
+msgid "File Transfers"
+msgstr "Treuzkasoù"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Nullañ an treuzkas"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr "A ziskouez ur roll eus an dreuzkasoù etrezoc'h hag ar re all"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "A nulla an treuzkas dibabet"
+msgid "file transfers list"
+msgstr "roll an treuzkasadoù"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "A nulla an treuzkas dibabet hag a zilam ar restr diglok"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Naetaat"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Treuzkasoù"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "A guzha ar prenestr"
+#, fuzzy
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Diverkañ an treuzkasadoù echu, nullaet pe sac'het"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Dilemel an treuzkas restroù diwar ar roll"
 
 #: ../data/gui/filetransfers.ui.h:9
-#, fuzzy
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Diverkañ an treuzkasadoù echu, nullaet pe sac'het"
-
-#: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr "A ziskouez ur roll eus an dreuzkasoù etrezoc'h hag ar re all"
-
-#: ../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"
@@ -1385,82 +1189,108 @@ msgstr ""
 "An ober-mañ a zilam an treuzkasoù diouzh ar roll. Ma 'z eus un treuzkas "
 "oberiant, e vo arsavet anezhañ ha dilamet da c'houde"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Naetaat"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Ehan"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "A nulla an treuzkas dibabet hag a zilam ar restr diglok"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Kenderc'hel"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Nullañ an treuzkas"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
+msgid "Cancels the selected file transfer"
+msgstr "A nulla an treuzkas dibabet"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Digeriñ ar renkell pal"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "A guzha ar prenestr"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Ehan"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Kenderc'hel"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "roll an treuzkasadoù"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Digeriñ ar renkell pal"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Liv-stad an ivinelloù</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Kont"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Tev"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Strollad"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Darempredoù"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "O skrivañ"
+msgid "Gajim Themes Customization"
+msgstr "Personelaat gwiskadurioù Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Darempredoù"
+msgid "Text _color:"
+msgstr "_Liv ar skrid:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Neuz an nodrezh:"
+msgid "_Background:"
+msgstr "_Drekleur:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personelaat gwiskadurioù Gajim"
+msgid "Text _font:"
+msgstr "_Nodrezh ar skrid:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Aet kuit"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Strollad"
+msgid "Font style:"
+msgstr "Neuz an nodrezh:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Dizoberiant"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Tev"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Stouet"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Ehan"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "O skrivañ"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Dizoberiant"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Liv-stad an ivinelloù</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Aet kuit"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1468,7 +1298,7 @@ msgstr ""
 "Kemennadennoù\n"
 "webgaoz"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1477,22 +1307,6 @@ msgstr ""
 "kaset davet\n"
 "webkaozioù"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Ehan"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Liv ar skrid:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Nodrezh ar skrid:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Drekleur:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1500,91 +1314,100 @@ msgstr "Cheñch _lesanv"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Merañ ar sinedoù"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Kemmañ ar _sujed"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Ke_fluniañ ar flap"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Taolennadur: %s"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Merañ ar sinedoù"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr ""
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+msgid "_Request Voice"
+msgstr ""
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Ka_sour-ez"
+msgid "_Send Private Message"
+msgstr "_Kas ur gemennadenn brevez"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Kas ur _restr"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Galloudoù an darempred"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Kas ur _restr"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Ouzhpennañ er roll"
+msgid "_Voice"
+msgstr ""
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Ka_sour-ez"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Ezel"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Merour-ez"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Argas"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Perc'hener-ez"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Ermaeziañ"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Ezel"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Perc'hener-ez"
+msgid "_Ban"
+msgstr "_Argas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Kas ur gemennadenn brevez"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr ""
+msgid "_Add to Roster"
+msgstr "_Ouzhpennañ er roll"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+msgid "Show a list of formattings"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cheñch _lesanv"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Cheñch _lesanv"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1596,37 +1419,20 @@ msgid "From:"
 msgstr "Digant:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Titl:"
 
 #: ../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."
-msgstr ""
+msgid "Gajim History Logs Manager"
+msgstr "Merour istoradur Gajim"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 #, fuzzy
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Dilemel"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Ezporzhiañ"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Merour istoradur Gajim"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1635,174 +1441,194 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Klask en titourva"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Stad:"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Istoradur ar gaoz"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Ezporzhiañ"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Anv an darempred"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Flapoù a-stroll"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Stad:"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Istoradur ar gaoz"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Klask"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Ostiz:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
+#: ../src/gajim-remote.py:230
+msgid "jid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Ostiz:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Aozañ ma aelad pa lugan"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Webgaoz:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Lesanv:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Nevez 'zo:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Ger-kuzh:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Nevez 'zo:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Aozañ ma aelad pa lugan"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Webgaoz:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Servijer:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+msgid "Bro_wse Rooms"
+msgstr "_Furchal"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "E_barzhiñ"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr ""
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Merañ ar sinedoù"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titl:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
 #, fuzzy
-msgid "Print status:"
+msgid "Pr_int status:"
 msgstr "Diskouez an eur:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "A_uto join"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titl:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1815,104 +1641,106 @@ msgid "_Configure"
 msgstr "_Kenderc'hel"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Perzhioù</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Kevreadenn HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Dibarzhioù</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Kevreadenn HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Merañ an aeladoù proksi"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Doare:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Ger-kuzh:"
+#, fuzzy
+msgid "_Name:"
+msgstr "_Anv:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proksi:"
+msgid "<b>Properties</b>"
+msgstr "<b>Perzhioù</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Porzh:"
+msgid "Use HTTP prox_y"
+msgstr "_Implij ur proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Implij ur proxy"
+msgid "_BOSH URL:"
+msgstr "_URL :"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Implij an diskleriañ"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Anv:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL :"
+msgid "Pass_word:"
+msgstr "_Ger-kuzh:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
 #, fuzzy
-msgid "_Name:"
-msgstr "_Anv:"
+msgid "Proxy _Host:"
+msgstr "Proksi:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Doare:"
+msgid "Proxy _Port:"
+msgstr "_Porzh:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Anv:"
+msgid "<b>Settings</b>"
+msgstr "<b>Dibarzhioù</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Merañ ar c'hontoù"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Ger-kuzh"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Aotren"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
-msgid "Available"
-msgstr "Dihegerz"
+msgid "Version:"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Kenderc'hel"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Taolennadur: %s"
+msgid "Authors:"
+msgstr "_Aotren"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1920,37 +1748,31 @@ msgid "Homepage:"
 msgstr "Lec'hienn hiniennel:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
-msgid "Installed"
-msgstr ""
+#, fuzzy
+msgid "Description:"
+msgstr "Taolennadur: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Kenderc'hel"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
+msgid "Installed"
 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"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1964,1095 +1786,1096 @@ msgid "Event desc"
 msgstr "Darvoudoù"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Aozer kefluniañ munut</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Poelladoù</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personelaet</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Poelladoù</b>"
+msgid "All chat states"
+msgstr "Stad:"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Poelladoù</b>"
+msgid "Composing only"
+msgstr "O skrivañ"
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Furmad ul linenn</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Dizoberiant"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Liv-stad an ivinelloù</b>"
+msgid "Never"
+msgstr "_Morse"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Kelaouennoù dre welet</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Sonioù</b>"
+msgid "Always"
+msgstr "Ezvezant"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "Di_foupañ"
 
-#. 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>Personelaet</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Kelaouiñ ac'hanon"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Sonioù</b>"
+msgid "Show only in roster"
+msgstr "Diskouez er _roll hepken"
 
 #: ../data/gui/preferences_window.ui.h:12
-#, fuzzy
-msgid "<b>GMail Options</b>"
-msgstr "<b>Poelladoù</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Titouroù-stad raklakaet</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<b>Perzhioù</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Titouroù-stad raklakaet</b>"
+msgid "Last state"
+msgstr "Stad diwezhañ: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Penndibaboù"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Perzhioù</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Furmad ul linenn</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+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:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Kelaouennoù dre welet</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Dre ar munut"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Dre ar munut"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+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:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Stad:"
+msgid "Sort contacts by status"
+msgstr "_Urzhiañ an darempredoù hervez o stad"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Aotren e vefe kaset titouroù diwar-benn an _OS"
+#, fuzzy
+msgid "in _roster"
+msgstr "Ket er roll"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Aotren e vefe kaset titouroù diwar-benn an _OS"
+msgid "in _group chats"
+msgstr "Ebarzhiñ ur _webgaoz"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Aotren ar c'helaouennoù p'emaon _ezvezant/dihegerz/busy/diwelus"
+msgid "<b>Roster Appearance</b>"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Ezvezant"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Goulenn an titour-stad pa:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Boulomelloù:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Ur prenestr-flapiñ:"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
+msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "_Titour-stad:"
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
+msgid "_Highlight misspelled words"
+msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "O skrivañ"
+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:38
-msgid "Configure color and font of the interface"
-msgstr ""
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Diskouez ar _roll-darempredoù"
 
 #: ../data/gui/preferences_window.ui.h:39
-#, fuzzy
-msgid "Contact's message:"
-msgstr "_Titour-stad:"
+msgid "Show icon when your messages are received"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Anv an darempred"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Personelaet</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Furmad ul linenn</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Pa resever un darvoud nevez"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, 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:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, 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:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Dizoberiant"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Aotren ar c'helaouennoù p'emaon _ezvezant/dihegerz/busy/diwelus"
 
 #: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+msgid "Notify on new _GMail email"
+msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+msgid "Display _extra email details"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+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:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+#, fuzzy
+msgid "<b>GMail Options</b>"
+msgstr "<b>Poelladoù</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+msgid "Show notification area icon:"
+msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Kelaouennoù dre welet</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-#, fuzzy
-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 peut envoyer et recevoir des meta-informations concernant les "
-"conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
-"spécifier quel état de conversation vous voulez envoyer à vos contacts"
+msgid "Play _sounds"
+msgstr "_Seniñ"
 
 #: ../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 peut envoyer et recevoir des meta-informations concernant les "
-"conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
-"spécifier quel état de conversation vous voulez envoyer à vos contacts"
+msgid "Ma_nage..."
+msgstr "Me_rañ..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 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:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sonioù</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "A guzha an nozelennoù er prenestroù webgaoz"
+msgid "Notifications"
+msgstr "Kemmañ ar gont"
 
 #: ../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"
+"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 peut envoyer et recevoir des meta-informations concernant les "
+"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
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Titou_roù-stad ar flap:"
 
 #: ../data/gui/preferences_window.ui.h:61
-#, fuzzy
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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 ""
-"Si cette case est cochée, Gajim placera une icône dans la zone de "
-"notification"
+"Gajim peut envoyer et recevoir des meta-informations concernant les "
+"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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Titou_roù-stad ar flap:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
-"fenêtre principale et les salons"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Kelaouennoù dre welet</b>"
 
 #: ../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 ""
-"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"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Titouroù hiniennel"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
-"fenêtre principale et les salons"
+msgid "_Away after:"
+msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
-"fenêtre principale et les salons"
+"Si cette case est cochée, Gajim placera une icône dans la zone de "
+"notification"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
-"fenêtre principale et les salons"
+msgid "_Not available after:"
+msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 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: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 ""
+msgid "minutes"
+msgstr "munutenn"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
 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 ""
-"Cochez cette option seulement si quelqu'un n'appartenant pas à votre liste "
-"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: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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux "
-"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: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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"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:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Poelladoù</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Ur prenestr-flapiñ:"
+msgid "Ask status message when I:"
+msgstr "Goulenn an titour-stad pa:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Me_rañ..."
+msgid "Sign _in"
+msgstr "_Lugañ"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Morse"
+msgid "Sign _out"
+msgstr "_Dilugañ"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Kemmañ ar gont"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Titouroù-stad raklakaet</b>"
 
 #: ../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:"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Kelaouiñ ac'hanon"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Stad"
 
 #: ../data/gui/preferences_window.ui.h:84
-#, fuzzy
-msgid "Notify on new _GMail email"
-msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
+msgid "Use system _default"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Titour-stad:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Titouroù hiniennel"
+msgid "<b>Font</b>"
+msgstr "<b>Sonioù</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "_Seniñ"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Implij arlunioù an _dorioù"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "Di_foupañ"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux "
+"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:89
-msgid "Preferences"
-msgstr "Penndibaboù"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "_Arlunioù-stad dre-ziouer:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
+msgid "Configure color and font of the interface"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Gwiskadur:"
+
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Servijer:"
+msgid "<b>Themes</b>"
+msgstr "<b>Perzhioù</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "_Implij an arlun-gelaouiñ (trayicon)"
+msgid "Contact's nickname:"
+msgstr "Anv an darempred"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Diskouez er _roll hepken"
+msgid "Your nickname:"
+msgstr "_A-raok al lesanv:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Lugañ"
+msgid "_Status message:"
+msgstr "_Titour-stad:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Dilugañ"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Distreiñ gant al livioù dre-ziouer"
 
 #: ../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 ""
+#, fuzzy
+msgid "Contact's message:"
+msgstr "_Titour-stad:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "_Urzhiañ an darempredoù hervez o stad"
+msgid "Your message:"
+msgstr "Fazi en ur lenn ar restr:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Stad"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Message d'un Salon mis en Sur-brillance"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "_Arlunioù-stad dre-ziouer:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Liv-stad an ivinelloù</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Gwiskadur:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Poelladoù</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Implij arlunioù an _dorioù"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Furmad ul linenn</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr ""
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servijer:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Pa resever un darvoud nevez"
+msgid "<b>Connection</b>"
+msgstr "<b>Sonioù</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Fazi en ur lenn ar restr:"
+msgid "_File manager:"
+msgstr "Merour _restroù:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "_A-raok al lesanv:"
+msgid "_Mail client:"
+msgstr "_Meziant posteliñ:"
 
 #: ../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:121
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Titou_roù-stad ar flap:"
+msgid "<b>Custom</b>"
+msgstr "<b>Personelaet</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Boulomelloù:"
+msgid "<b>Applications</b>"
+msgstr "<b>Poelladoù</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "Merour _restroù:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Islinennañ ar fazioù reizhskrivañ"
+#, fuzzy
+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 ""
+"Cochez cette option seulement si quelqu'un n'appartenant pas à votre liste "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Chom hep teurel pled eus ar c'hemennadennoù kaset gant tud dianav"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Aotren e vefe kaset titouroù diwar-benn an _OS"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr ""
+#, 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:128
-msgid "_Log status changes of contacts"
-msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Aotren e vefe kaset titouroù diwar-benn an _OS"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Meziant posteliñ:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Digeriñ..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Distreiñ gant al livioù dre-ziouer"
-
-#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Titou_roù-stad ar flap:"
+msgid "Allow my _idle time to be sent"
+msgstr "Aotren e vefe kaset titouroù diwar-benn an _OS"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Titour-stad:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<b>Perzhioù</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "in _group chats"
-msgstr "Ebarzhiñ ur _webgaoz"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Ket er roll"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "munutenn"
+msgid "_Open..."
+msgstr "_Digeriñ..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Aozer kefluniañ munut</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Dre ar munut"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Flapoù prevez"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr ""
-
-#: ../data/gui/privacy_list_window.ui.h:2
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
 #, fuzzy
-msgid "<b>List of rules</b>"
-msgstr "<b>Furmad ul linenn</b>"
+msgid "Privacy List"
+msgstr "Roll argas"
 
-#: ../data/gui/privacy_list_window.ui.h:3
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 #, fuzzy
 msgid "Active on each startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+#, fuzzy
+msgid "<b>List of rules</b>"
+msgstr "<b>Furmad ul linenn</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
+msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "_Koumanant"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Nac'hañ"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "ID Jabber:"
 
-#: ../data/gui/privacy_list_window.ui.h:11
+#: ../data/gui/privacy_list_window.ui.h:10
 #, fuzzy
-msgid "Order:"
-msgstr "Servijer:"
+msgid "all in the group"
+msgstr "Er strollad"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
+#: ../data/gui/privacy_list_window.ui.h:11
 #, fuzzy
-msgid "Privacy List"
-msgstr "Roll argas"
+msgid "all by subscription"
+msgstr "_Koumanant"
+
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:13
 #, fuzzy
-msgid "all by subscription"
-msgstr "_Koumanant"
+msgid "to send me messages"
+msgstr "Kas ur gemennadenn"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-#, fuzzy
-msgid "all in the group"
-msgstr "Er strollad"
+msgid "to send me queries"
+msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:15
 #, fuzzy
-msgid "both"
-msgstr "An daou"
+msgid "to view my status"
+msgstr "He/E aotren da welet ma stad"
 
 #: ../data/gui/privacy_list_window.ui.h:16
 #, fuzzy
-msgid "from"
-msgstr "Digant"
+msgid "to send me status"
+msgstr "Goulenn evit gwelet e/he stad"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "Hini ebet"
+msgid "All (including subscription)"
+msgstr "_Koumanant"
 
 #: ../data/gui/privacy_list_window.ui.h:18
 #, fuzzy
-msgid "to"
-msgstr "piv"
+msgid "Order:"
+msgstr "Servijer:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
-msgid "to send me messages"
-msgstr "Kas ur gemennadenn"
+msgid "none"
+msgstr "Hini ebet"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr ""
+#, fuzzy
+msgid "both"
+msgstr "An daou"
 
 #: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
-msgid "to send me status"
-msgstr "Goulenn evit gwelet e/he stad"
+msgid "from"
+msgstr "Digant"
 
 #: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "to view my status"
-msgstr "He/E aotren da welet ma stad"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-#, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Furmad ul linenn</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-#, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Dibab ur _skeudenn"
+msgid "to"
+msgstr "piv"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Deiz-ha-bloaz:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Personelaet</b>"
+msgid "<b>Family:</b>"
+msgstr "Familh:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Personelaet</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Sonioù</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Furmad ul linenn</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Departamant:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "Postel:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Perzhioù</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Chomlec'h 2:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familh:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sonioù</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Personelaet</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Dibarzhioù</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Personelaet</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Lec'hienn hiniennel:"
+msgid "<b>State:</b>"
+msgstr "<b>Dibarzhioù</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Chomlec'h 2:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Furmad ul linenn</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Kod postel:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Personelaet</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Sonioù</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Lesanv:"
+msgid "<b>Address</b>"
+msgstr "<b>Furmad ul linenn</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Pellgomz:"
+msgid "<b>Homepage:</b>"
+msgstr "Lec'hienn hiniennel:"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Sonioù</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Personelaet</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Kod postel:"
+msgid "<b>Nickname:</b>"
+msgstr "Lesanv:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Perzhioù</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Pellgomz:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Stumm : BBBB-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Sonioù</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Deiz-ha-bloaz:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Dibarzhioù</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "Postel:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Dibarzhioù</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Dibab ur _skeudenn"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr ""
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sonioù</b>"
+msgid "Personal Info"
+msgstr "Titouroù hiniennel"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Personelaet</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Diwar-benn"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Sonioù</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr ""
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Departamant:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Stumm : BBBB-MM-DD"
-
-#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
 #, fuzzy
-msgid "Personal Info"
-msgstr "Titouroù hiniennel"
+msgid "<b>Role:</b>"
+msgstr "<b>Sonioù</b>"
 
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Labour"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Petra 'fell deoc'h ober ?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Diwar-benn"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Dilemel ar gont diwar Gajim _hepken"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Dilemel ar gont diwar Gajim ha diwar ar _servijer"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Petra 'fell deoc'h ober ?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Dilemel"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Mat eo"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Ouzhpennañ un darempred..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Oberoù"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Perzhioù ar servijerien"
+msgid "Add _Contact..."
+msgstr "_Ouzhpennañ un darempred..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Treuzkasoù"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Aozañ"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Marc'had Ar Goulennoù (FAQ enlinenn)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoù"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Skoazell enlinenn"
+#: ../data/gui/roster_window.ui.h:11
+#, fuzzy
+msgid "Profile, A_vatar"
+msgstr "Aelad, Avatar"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr ""
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Diskouez an darempredoù _ezlinenn"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:16
 #, fuzzy
-msgid "Show Trans_ports"
+msgid "Show T_ransports"
 msgstr "Dorioù"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Diskouez an darempredoù _ezlinenn"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Kontoù"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Treuzkasoù"
 
-#. 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 "_Oberoù"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Skoazell"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Endalc'hadoù"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Aozañ"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Skoazell enlinenn"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Skoazell"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Kas ur gemennadenn _simpl..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Marc'had Ar Goulennoù (FAQ enlinenn)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
+msgid "Fea_tures"
+msgstr "Perzhioù ar servijerien"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Klask"
 
+#: ../data/gui/search_window.ui.h:2
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
+
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Ouzhpennañ un _darempred"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Klask"
 
@@ -3072,43 +2895,37 @@ msgstr "En em enrollañ war"
 msgid "_Cancel"
 msgstr "_Nullañ"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Respont d'ar gemennadenn-mañ"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Da:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Kas"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Kas ur gemennadenn"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Respont"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Da:"
+msgid "Reply to this message"
+msgstr "Respont d'ar gemennadenn-mañ"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Respont"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Kas & Serriñ"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-#, fuzzy
-msgid "Au_thorize"
-msgstr "_Aotren"
+msgid "Subscription Request"
+msgstr "Goulenn koumanantiñ"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-#, fuzzy
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Aotren an darempred da welet hag emaon kevreet pe get"
+msgid "_Deny"
+msgstr "_Nac'hañ"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
@@ -3118,281 +2935,294 @@ msgid ""
 msgstr ""
 "Nac'hañ aotre an darempred evit ma ne welo ket hag eñ oc'h kevreet pe get"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Goulenn koumanantiñ"
+#: ../data/gui/subscription_request_window.ui.h:6
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Aotren"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Nac'hañ"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Aotren an darempred da welet hag emaon kevreet pe get"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Diskouez an darempredoù _ezlinenn"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-#, fuzzy
-msgid "Select the contacts you want to synchronise"
-msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/gui/systray_context_menu.ui.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
-msgid "Mute Sounds"
-msgstr "Sonioù wav"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Kas ur gemennadenn _simpl"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
+msgid "Select the contacts you want to synchronise"
+msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "S_tad"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Webkaozioù"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Poelladoù</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Kas ur gemennadenn _simpl"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Personelaet</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: ../data/gui/vcard_information_window.ui.h:8
+#: ../data/gui/systray_context_menu.ui.h:6
 #, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Dibarzhioù</b>"
+msgid "Mute Sounds"
+msgstr "Sonioù wav"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Titouroù"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID Jabber:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Une erreur de protocole s'est produite :"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Taolennadur</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Personelaet</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
-msgid "Comments"
-msgstr "Evezhiadenn: %s"
+msgid "<b>Contact time:</b>"
+msgstr "<b>Dibarzhioù</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>User avatar:</b>"
+msgstr "Dibab ur _skeudenn"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Ke_fluniañ ar flap"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
-msgid "Contact"
-msgstr "Darempredoù"
+msgid "<b>Subscription:</b>"
+msgstr "<b>Taolennadur</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Titouroù"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Poelladoù</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Muioc'h"
 
-#: ../data/gui/vcard_information_window.ui.h:48
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
 #, fuzzy
-msgid "User avatar:"
-msgstr "Choisissez un Avatar"
+msgid "Contact"
+msgstr "Darempredoù"
 
-#: ../data/gui/xml_console_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:49
 #, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Sonioù</b>"
+msgid "Comments"
+msgstr "Evezhiadenn: %s"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr ""
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Titour/Goulenn"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sonioù</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Titour/Goulenn"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Bezañs"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Kemennadenn"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Bezañs"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr ""
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Kemmañ ar gont..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr ""
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-#, fuzzy
-msgid "Personal"
-msgstr "Titouroù hiniennel"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr ""
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Stad:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Ur flaperez Jabber e GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+#, fuzzy
+msgid "Personal"
+msgstr "Titouroù hiniennel"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Flaperez Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Flaperez Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Ur flaperez Jabber e GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Titouroù"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Road direizh"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr ""
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Activated"
 msgstr "Oberiant"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Deactivated"
 msgstr "Dizoberiant"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 #, fuzzy
 msgid "Integer"
 msgstr "Er strollad"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Dibab"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Talvoud"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Doare"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Hini ebet)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Elfennoù kuzh"
 
@@ -3403,245 +3233,178 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] ""
 msgstr[1] ""
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "German"
-msgstr "Hollek"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Greek"
-msgstr "Glas"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Croatian"
-msgstr "Chomlec'h"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Italian"
-msgstr "Stouet"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Polish"
-msgstr "_Embann"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Serbian"
-msgstr "Hollek"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
+#: ../src/chat_control.py:209
+msgid "Ping?"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
+#: ../src/chat_control.py:219
+msgid "Error."
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "Islinennañ"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Lesanv"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Nodrezh:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Titouroù"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Kas ur restr"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
@@ -3649,66 +3412,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, 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:2566
+#: ../src/chat_control.py:2797
 #, 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:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3716,355 +3479,734 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Treuzkasoù"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Taille : "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Asantiñ"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Echu eo an treuzkas"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Pedadenn evit ur sal-flapiñ"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Dilemel an darempred diouzh ar roll"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fazi en ur lenn ar restr:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Sac'het an treuzkas"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Nullet eo bet an treuzkas"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Usage: /%s, cache les boutons de discussion."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Usage: /%s, cache les boutons de discussion."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "N'eo ket bet kavet %s"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Ezvezant"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Dihegerz"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Usage : /%s, nettoie la fenêtre."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Encryption OpenPGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Klikit amañ evit gwelout kaozioù kent gant an darempred-mañ"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "N'eus ket tu da gevreañ"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "N'eus ket tu en em lugañ"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Cheñch _lesanv"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
+"spécifié."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
+"spécifié."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Kas %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Vous êtes banni de ce salon."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Anv-arveriad-ez direizh"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+msgid "Invalid affiliation given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Kemennadenn gaset"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Titouroù"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Darempred diluget"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "_Kenderc'hel"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Taolennadur"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Flap a-stroll"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Er strollad"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 #, fuzzy
 msgid "Groupchats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - %d gemennadenn nevez"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Gajim - %d gemennadenn nevez"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Implij DBus ha Notification-Daemon evit diskouez ar c'hemennadennoù-kelaouiñ"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel ezvezant."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ezvezant rak dizoberiant"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel dihegerz."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Dihegerz rak dizoberiant."
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "korf ar gemennadenn stad"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Diskouez er _roll hepken"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Diskouez er _roll hepken"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Noti_fications d'état de discussion"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Goulenn treuzkas"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Nullet eo bet an treuzkas"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Pedadenn evit ur sal-flapiñ"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Cheñch lesanv"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "korf ar gemennadenn stad"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 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:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
 "* *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 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
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
 "ivinell pe ur prenestr."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "E-pad pet munutenn e rank linennoù diwezhañ ar gaozeadenn kent bezañ "
 "gwarezet."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4072,11 +4214,11 @@ msgstr ""
 "Kas ar gemennadenn gant Ctrl+Kas ha mont d'al linenn gant Kas (emzalc'h dre-"
 "ziouer ar poellad ICQ Mirabilis)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Niver a linennoù da zerc'hel soñj evit Ctrl+BirLaez"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4085,12 +4227,12 @@ msgstr ""
 "Pe un url personelaet gant %s ennañ, %s o vezañ ar ger-kuzh pe 'WIKTIONARY' "
 "hag a dalvez implij wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "M'eo diuzet, e vo tu da sturiañ Gajim a-bell en ur implij gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4098,79 +4240,85 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
 "mañ."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
 "esaouenn er roll-mañ."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 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
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4178,34 +4326,34 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_fications d'état de discussion"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 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 ""
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 msgstr ""
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -4214,60 +4362,64 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -4279,7 +4431,7 @@ msgstr ""
 "l'information sha dans les présences des salons"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4288,7 +4440,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "A reolia ar prenestr a vez lakaet ar c'hemennadennoù nevez enni.\n"
@@ -4297,448 +4449,688 @@ msgstr ""
 "'peracct' - An holl gaozioù en ur prenestr hervez ar gont.\n"
 "'pertype' - Bep a brenestr gant ur stumm flapiñ (webgaoz/flap)."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "M'eo gwir, klikit war an douchenn Echap evit serriñ un ivinell/prenestr"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 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
+#: ../src/common/config.py:287
 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
+#: ../src/common/config.py:288
 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
+#: ../src/common/config.py:289
 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
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "Fellout a ra da %s kas deoc'h ur restr."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Implij an diskleriañ"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Implij an diskleriañ"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr ""
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../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 ''"
+#: ../src/common/config.py:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "Glas-mor"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Da"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Requête de désinscription de la part de %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Dilamet eo bet an aotre"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "ID jabber direizh"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fazi en ur gas %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Aozadur D-Bus dianav: %s"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Kemennadenn simpl nevez"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Kemennadenn simpl nevez digant %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Kemennadenn hiniennel nevez"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Kemennadenn hiniennel nevez digant ar sal %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s : %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Kemennadenn nevez digant %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Kemennadenn nevez"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Kemennadenn nevez digant %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, fuzzy, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s a zo bremañ %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s a zo bremañ %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+#, fuzzy
+msgid "Contact Changed Status"
+msgstr "Darempred diluget"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Emañ %(nickname)s o paouez lugañ"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Darempred luget"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Emañ %(nickname)s o paouez dilugañ"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Darempred diluget"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
@@ -4751,214 +5143,192 @@ msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "ID jabber direizh"
-
-#: ../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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4967,180 +5337,190 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../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:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Dibosupl eo en em lugañ da \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Kevreadenn"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Darempredoù"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Dorioù"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ket er roll"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 "N'eus ket eus D-Bus war an urzhiataer-mañ, pe mankout a ra ur mollad python"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
@@ -5157,7 +5537,7 @@ msgstr ""
 "Servij dihegerz: n'eo ket loc'het Gajim, pe lakaet eo bet remote_control war "
 "False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "N'eus ket eus D-Bus war an urzhiataer-mañ, pe mankout a ra ur mollad python"
@@ -5352,271 +5732,298 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Chomlec'h ar servijer dre ret"
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr ""
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Dihegerz"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Diskouez an eur:"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Diwelus"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Digant"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "An daou"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 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:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Kas ur gemennadenn"
 msgstr[1] "Kas ur gemennadenn"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "L'image est trop grande"
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kefluniañ ar webgaoz"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5628,111 +6035,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Titour-stad"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Ment: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Restr: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "Glas"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
+msgid "Error: cannot open %s for reading"
+msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "Cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
@@ -6434,95 +6855,178 @@ msgstr ""
 msgid "Writing"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Dilemel"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "Glas-mor"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Skarzhañ %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Bro:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Kont"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Taolennadur"
+
+#: ../src/common/pep.py:204
+msgid "error"
+msgstr ""
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "Hini ebet"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+#, fuzzy
+msgid "room"
+msgstr "Digant"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr ""
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Impossible de rejoindre le salon"
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6533,96 +7037,96 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Titour-stad"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Enaouiñ"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Anv"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Rankout a rit lenn an holl zarvoudoù-mañ evit gellout cheñch anv ar gont."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6630,148 +7134,148 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Merañ ar c'hontoù"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, 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:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+msgid "Your server doesn't support vCard"
 msgstr ""
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 #, 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:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, 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:2517
+#: ../src/config.py:2604
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6779,11 +7283,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6791,11 +7295,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6804,11 +7308,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6816,7 +7320,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6834,118 +7338,114 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Kevreadenn"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Dilemel ar gont diwar Gajim _hepken"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Gwiriekait ho peus leuniet an takadoù servijer ha sal-flapiñ pe lamit ar "
 "sined-mañ."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Anv-arveriad-ez direizh"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Road direizh"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6956,34 +7456,34 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 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:3600
+#: ../src/config.py:3703
 #, 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:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6993,7 +7493,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7001,83 +7501,100 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Kenderc'hel"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Kemennadenn gentañ"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7086,137 +7603,137 @@ 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:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Kuitaat"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, 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:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Dec'h"
 msgstr[1] "Dec'h"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Flaperez Jabber"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Strollad"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Er strollad"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Anv an darempred"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Lakaat MOTD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7224,112 +7741,113 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Chomlec'h 2:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Ur flaperez jabber e GTK+"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Ur flaperez Jabber e GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7338,109 +7856,160 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Kevreadenn"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Chom hep goulenn ket"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "The nickname contains invalid characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Ger-kuzh faos"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Anv-kont direizh"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, 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:2349 ../src/groupchat_control.py:1848
+#: ../src/dialogs.py:2623
 #, fuzzy
-msgid "The group chat Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 #, 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:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7450,170 +8019,139 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Darempred luget"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Darempred diluget"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Kemennadenn nevez"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Kemennadenn hiniennel nevez"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../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:2651 ../src/notify.py:239 ../src/notify.py:491
-#, fuzzy
-msgid "Contact Changed Status"
-msgstr "Darempred diluget"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr ""
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Chomlec'h"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Dilemel"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7621,199 +8159,193 @@ 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: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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Strollad"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Ouzhpennañ un _darempred"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Ouzhpennañ un _darempred"
+msgstr[1] "Ouzhpennañ un _darempred"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Dilemel an darempred diouzh ar roll"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Dilemel an darempred diouzh ar roll"
+msgstr[1] "Dilemel an darempred diouzh ar roll"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 #, 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:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, 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:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: ../src/dialogs.py:4602
-#, fuzzy
-msgid "Condition"
-msgstr "Kevreadenn"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr ""
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7821,38 +8353,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7862,77 +8394,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "evit ar gont %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Traoù all"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7940,478 +8510,493 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, 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:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "urzhiad"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Taolennadur"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Hini ebet"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Urzhioù: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Merour an istoradur"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Kemennadenn gaset"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Kemmañ ar gont"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Hollek"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Hegerz"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Perzhioù ar servijerien"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Restr"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Mare"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Araokadur"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Anv ar restr: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Ment: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "C'hwi"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Kaser: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Echu eo an treuzkas"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Nullet eo bet an treuzkas"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Sac'het an treuzkas"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Dibabit ur restr da gas..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Taolennadur: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "N'hell ket Gajim tizhout ar restr-mañ"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Implijet eo ar restr-mañ gant ur poellad all."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Restr: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Doare: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Taolennadur: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-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:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Enrollañ ar restr dindan..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Restr: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Doare: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Taolennadur: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "Fellout a ra da %s kas deoc'h ur restr:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Kas ur _restr"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Fazi treuzkas"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8419,114 +9004,150 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Restr direizh"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Restr:"
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Anv:"
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Ehan"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "kemennadenn"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Boulomelloù:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Diskouez er _roll hepken"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Aozer kefluniañ dre ar munut"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Kefluniañ ar webgaoz"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Ezhomm en deus Gajim eus ur servijer X evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 msgstr ""
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "diskouez ar skoazell evit un urzhiad resis"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "urzhiad"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8534,51 +9155,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "kont"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "stad"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "kemennadenn"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "titour stad"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8586,22 +9211,48 @@ 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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "A cheñch stad ar gont pe ar c'hontoù"
+
+#: ../src/gajim-remote.py:120
+msgid "?CLI:priority"
+msgstr ""
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8612,34 +9263,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8650,189 +9296,233 @@ 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:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "restr"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "touchenn"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 #, 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 #, 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
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 #, 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
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Darempred diluget"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#: ../src/gajim-remote.py:272
+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:278
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "korf ar gemennadenn"
+
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Ebarzhiñ ur webgaoz nevez"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "room"
+msgid "?CLI:room"
 msgstr "Digant"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "nick"
+msgid "Room JID"
+msgstr "Webgaoz:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "Lesanv"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Nickname to use"
+msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#: ../src/gajim-remote.py:291
 #, fuzzy
-msgid "password"
+msgid "?CLI:password"
 msgstr "Ger-kuzh:"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Ne glot ket ar gerioù-kuzh"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 #, 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8841,174 +9531,64 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Implij: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\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
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Ger-kuzh faos"
-
-#: ../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: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: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 ""
-"A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
-"bennak)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Darempred diluget"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "N'eus ket bet kavet al lesanv : %s"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "korf ar gemennadenn"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Webgaoz:"
-
-#: ../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 to enter the room"
-msgstr "Ne glot ket ar gerioù-kuzh"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Ger-kuzh faos"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Gwiskadur"
@@ -9032,204 +9612,239 @@ msgid "You cannot delete your current theme"
 msgstr "N'hellit ket dilemel ar gwiskadur red"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s a zo bremañ %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 #, 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
+#: ../src/groupchat_control.py:2199
+#, 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."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -9252,66 +9867,60 @@ msgstr "_Diskleriañ ar Bug"
 msgid "Details"
 msgstr "Munudoù"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:873
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9322,196 +9931,182 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Goulenn koumanantiñ"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Koumanantiñ"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Ger-kuzh ret"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9521,103 +10116,88 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, 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:1252 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Dilemel an darempred diouzh ar roll"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-#, fuzzy
-msgid "Error opening file"
-msgstr "Fazi en ur lenn ar restr:"
+msgid "File Transfer Failed"
+msgstr "Treuzkasoù"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Da _bep kemennadenn:"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 #, 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:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, 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:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9625,15 +10205,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9644,32 +10229,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9677,103 +10243,106 @@ 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:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 #, 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "a grou ar renkell %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Darempredoù"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Deiziad"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Kemennadenn"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Titl"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9781,7 +10350,7 @@ msgstr ""
 "Ha fellout a ra deoc'h naetaat an titourva? (DIALIET GROÑS M'EMAÑ GAJIM O "
 "VONT EN-DRO)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9790,97 +10359,110 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s e lâras %(who)s: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempred-mañ?"
-msgstr[1] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempredoù-mañ?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempred-mañ?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Titouroù"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar c'hemennadennoù diuzet?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istoradur flapiñ gant %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s a zo bremañ %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Dibosupl eo kargañ ar skeudenn"
+msgid "Loading"
+msgstr "O skrivañ"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "L'image est trop grande"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Kemennadennoù"
 
@@ -9892,104 +10474,115 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "_Kenderc'hel"
+
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
+
+#: ../src/plugins/gui.py:151
 #, fuzzy, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s a zo bremañ %(status)s"
+msgid "Warning: %s"
+msgstr "Argas %s"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "Emañ %(nickname)s o paouez lugañ"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "Emañ %(nickname)s o paouez dilugañ"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Kemennadenn simpl nevez digant %(nickname)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:268
-#, fuzzy, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Kemennadenn hiniennel nevez digant ar sal %s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s : %(message)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Kemennadenn nevez digant %(nickname)s"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Kefluniañ ar webgaoz"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Kemennadenn nevez digant %(nickname)s"
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/pluginmanager.py:514
 #, fuzzy
-msgid "Ignore"
-msgstr "_Kenderc'hel"
+msgid "Archive empty"
+msgstr "Treug ar restr"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Treug ar restr"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Ce salon n'existe pas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Titouroù"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Stumm : BBBB-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 #, fuzzy
 msgid "Information received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9997,51 +10590,52 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, 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:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 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:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10049,39 +10643,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, 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:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Nullañ an treuzkas"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10089,17 +10683,17 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 #, 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:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -10108,12 +10702,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10122,73 +10716,73 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, 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:2901
+#: ../src/roster_window.py:3092
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, 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:2947
+#: ../src/roster_window.py:3138
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, 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:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10197,12 +10791,12 @@ msgstr ""
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10210,17 +10804,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10229,68 +10823,73 @@ 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:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 #, 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:4191
+#: ../src/roster_window.py:4552
 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:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Kas %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Strollañ %s ha %s"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Strollañ %s ha %s"
@@ -10300,142 +10899,142 @@ msgstr "Strollañ %s ha %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Kemmañ ar _strolladoù"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Kas ur gemennadenn simpl"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Darempred diluget"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Darempred diluget"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
@@ -10452,31 +11051,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Sujed: %s\n"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10486,150 +11075,155 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ket er roll"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID Jabber:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Stad:"
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Stad diwezhañ: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "dibaoe %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Kevreadenn"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Darempred diluget"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Koumanant:"
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr "dibaoe %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr ""
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Webgaoz:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Oberiant"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Kemmañ ar gont"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Kas"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Echu"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "N'eus ket bet kaset titouroù munut gant ar servij-mañ c'hoazh"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10637,41 +11231,41 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 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:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10679,31 +11273,243 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr ""
 
 #, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Dibabit ur restr da gas..."
+
+#, fuzzy
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Poelladoù</b>"
+
+#, fuzzy
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Sonioù</b>"
+
+#, fuzzy
+#~ msgid "Advanced Actions"
+#~ msgstr "Actions a_vancées"
+
+#, fuzzy
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Aozer kefluniañ dre ar munut"
+
+#, fuzzy
+#~ msgid "All statuses"
+#~ msgstr "Stad:"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Darempred diluget"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Darempred diluget"
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Sac'het an treuzkas"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Message d'un Salon mis en Sur-brillance"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Kemennadenn digant ur sal-flapiñ"
+
+#, fuzzy
+#~ msgid "Launch a command"
+#~ msgstr "urzhiad"
+
+#, fuzzy
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Prest da flapiñ"
+
+#, fuzzy
+#~ msgid "Play a sound"
+#~ msgstr "_Seniñ"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Kemennadenn hiniennel nevez"
+
+#, fuzzy
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "A guzha an nozelennoù er prenestroù webgaoz"
+
+#, fuzzy
+#~ msgid "_Open chat window with user"
+#~ msgstr "Utiliser une seule fenê_tre de discussion avec des onglets"
+
+#, fuzzy
+#~ msgid "_Show event in roster"
+#~ msgstr "Diskouez er _roll hepken"
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Darempredoù"
+
+#, fuzzy
+#~ msgid "for "
+#~ msgstr "Porzh:"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Strollad"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Ouzhennañ an darempred d'ar roll"
+
+#, fuzzy
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "He/E aotren da welet ma stad"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Taolennadur: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Dre ar munut"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans "
+#~ "la fenêtre principale et les salons"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans "
+#~ "la fenêtre principale et les salons"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Kas ur gemennadenn _simpl..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Choisissez un Avatar"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Flaperez Gajim"
+
+#, fuzzy
+#~ msgid "German"
+#~ msgstr "Hollek"
+
+#, fuzzy
+#~ msgid "Greek"
+#~ msgstr "Glas"
+
+#, fuzzy
+#~ msgid "Croatian"
+#~ msgstr "Chomlec'h"
+
+#, fuzzy
+#~ msgid "Italian"
+#~ msgstr "Stouet"
+
+#, fuzzy
+#~ msgid "Polish"
+#~ msgstr "_Embann"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Hollek"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
+
+#, fuzzy
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Impossible de rejoindre le salon"
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Ur flaperez jabber e GTK+"
+
+#, fuzzy
+#~ msgid "Condition"
+#~ msgstr "Kevreadenn"
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Implij: %s %s %s \n"
+#~ "\t %s"
+
+#~ msgid "Contacts"
+#~ msgstr "Darempredoù"
+
+#, fuzzy
+#~ msgid "Subject: %s"
+#~ msgstr "Sujed: %s\n"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Webgaoz:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Oberiant"
+
+#, fuzzy
 #~ msgid "_Show event in systray"
 #~ msgstr "Diskouez er _roll hepken"
 
@@ -10719,31 +11525,12 @@ msgstr ""
 #~ 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"
 
@@ -10798,9 +11585,6 @@ msgstr ""
 #~ "Darempred\n"
 #~ "Titl"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Merañ ar c'hontoù"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Dilemel"
@@ -10872,9 +11656,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Sifret eo ar gemennadenn-mañ]"
-
 #~ msgid "%i days ago"
 #~ msgstr "%i devezh 'zo"
 
@@ -10884,12 +11665,6 @@ msgstr ""
 #~ msgid "Commands: %s"
 #~ msgstr "Urzhioù: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Usage : /%s, nettoie la fenêtre."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Usage: /%s, cache les boutons de discussion."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10898,15 +11673,6 @@ msgstr ""
 #~ "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la "
 #~ "troisième personne. (ex : /%s explose.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr ""
-#~ "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
-
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Usage: /%s, cache les boutons de discussion."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "N'eus skoazell hegerz ebet evit /%s"
 
@@ -10921,10 +11687,6 @@ msgstr ""
 #~ msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "N'eus ket bet kavet al lesanv : %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10935,14 +11697,6 @@ msgstr ""
 #~ "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 #~ "espaces dans le surnom."
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec "
-#~ "l'occupant spécifié."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
@@ -10987,11 +11741,6 @@ msgstr ""
 #~ msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
 #, fuzzy
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr ""
-#~ "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11022,10 +11771,6 @@ msgstr ""
 #~ msgstr "_Ostiz:"
 
 #, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Diskouez ar _roll-darempredoù"
-
-#, fuzzy
 #~ msgid "Modify Account"
 #~ msgstr "_Kemmañ ar gont..."
 
@@ -11088,9 +11833,6 @@ msgstr ""
 #~ "M'ho peus daou gont pe ouzhpenn hag eo diuzet, e vo strollet an holl "
 #~ "zarempredoù evel pa vefe ur gont hepken"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Klikit amañ evit gwelout kaozioù kent gant an darempred-mañ"
-
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Klikit amañ evit gwelout kaozioù kent ar flap-mañ"
 
@@ -11100,9 +11842,6 @@ msgstr ""
 #~ msgid "Query Builder..."
 #~ msgstr "Krouiñ ur goulenn..."
 
-#~ msgid "Accept"
-#~ msgstr "Asantiñ"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Resevet ar bedadenn"
 
@@ -11182,9 +11921,6 @@ msgstr ""
 #~ msgid "The auto away status message"
 #~ msgstr "An emc'hemennadenn evit ar stad \"Ezvezant\""
 
-#~ msgid "The auto not available status message"
-#~ msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
-
 #~ 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 "
@@ -11218,9 +11954,6 @@ msgstr ""
 #~ msgid "Company:"
 #~ msgstr "Embregerezh:"
 
-#~ msgid "Country:"
-#~ msgstr "Bro:"
-
 #~ msgid "Given:"
 #~ msgstr "Anv bihan:"
 
@@ -11408,9 +12141,6 @@ msgstr ""
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Aotren war-eeun an darempred"
 
-#~ msgid "Send File"
-#~ msgstr "Kas ur restr"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "Re_joindre un nouveau salon..."
 
@@ -11464,9 +12194,6 @@ msgstr ""
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Tous les contacts de ce groupe sont déconnectés ou ont des erreurs"
 
-#~ msgid "Size: "
-#~ msgstr "Taille : "
-
 #~ msgid "Sound"
 #~ msgstr "Son"
 
diff --git a/po/cs.po b/po/cs.po
index cbfbedd68..2b9cff660 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,11 +1,11 @@
 # translation of gajim.po to Czech
 # Czech translations for Gajim package.
 # 	Copyright (C) 2003-2005 Gajim Team
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
 # by the Free Software Foundation; version 2 only.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16,471 +16,540 @@
 # Pihhan <pihhan@seznam.cz>, 2008.
 # scippio <scippio@berounet.cz>, 2008.
 # Pihhan <pihhan@seznam.cz>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2010-01-22 14:35+0100\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
 "Language-Team: <>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Stav"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Osobní údaje"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Začít rozhovor"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Vstoupit do _Diskuze"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 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:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "Provést příkaz..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "Upravit účet"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Otevři schránku Gmailu"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Osobní údaje"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Začít rozhovor"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Stav"
+msgid "_Modify Account"
+msgstr "Upravit účet"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Průvodce vytváření účtu"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
-msgstr ""
-"<b>Vytváří se účet</b>\n"
-"\n"
-"Prosím čekejte..."
+"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:4
+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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prosím zvolte z následujících možností:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Prosím vyplňte údaje pro Váš nový účet</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Prosím Vyberte server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Heslo:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Uložit _heslo"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_ymní autentizace"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Připojit když stisknu Dokončit"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Průvodce vytváření účtu"
+msgid "Anon_ymous authentication"
+msgstr "Anon_ymní autentizace"
 
 #: ../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)"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Prosím Vyberte server</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Spravovat..."
 
 #: ../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: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ý"
+msgid "Use custom hostname/port"
+msgstr "Použít vlastní jméno počítače/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "Počítač: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Uložit _heslo"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Rozšířené"
 
 #: ../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: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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+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:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Rozšířené"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Dokončit"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Počítač: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Vytváří se účet</b>\n"
+"\n"
+"Prosím čekejte..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Připojit když stisknu Dokončit"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Heslo:"
+msgid "Set my profile when I connect"
+msgstr "Nastavit profil, když se připojuji"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Dokončit"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Příslušenství</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Žádný"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Účty"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Osobní údaje</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Přidat"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Smazat"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "_Nastavit podle stavu"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Přejme_novat"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Účet"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Povolit"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Účty"
+msgid "Anonymous authentication"
+msgstr "Anonymní autentizace"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Seznam správců"
+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 ""
+"Zdroj je odeslán Jabber serveru pro oddělení stejné JID na dvě nebo více "
+"částí závisejících na počtu připojených klientů na stejný server se stejným "
+"účtem. Takže můžete být připojeni ke stejnému účtu se zdroji 'Domov' a "
+"'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více "
+"následuje)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonymní autentizace"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automaticky se znovu připojit při ztrátě spojení"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Synchronizovat kontakty"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "Procházet..."
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Klikněte k vyžádání autorizace od všech kontaktů jiného účtu"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "_Připojit po startu Gajimu"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "_Změnit heslo"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klikněte pro změnu hesla k účtu"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Zaškrtněte pokud se má Gajim ptát předtím než odešlete vaše heslo přes nezabezpečené připojení."
+msgid "Administration operations"
+msgstr "Seznam správců"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Vyber soubor k odeslání..."
+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 ""
+"Priorita je v Jabberu použita ke zjištění, kdo obdrží zprávu od jabber "
+"serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží "
+"klient s vyšší prioritou"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Vyberte _klíč..."
+msgid "A_djust to status"
+msgstr "_Nastavit podle stavu"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klikněte pro změnu hesla k účtu"
+msgid "Priority will change automatically according to your status."
+msgstr "Priorita se automaticky změní podle vašeho stavu."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Klikněte k vyžádání autorizace od všech kontaktů jiného účtu"
+msgid "Priori_ty:"
+msgstr "Priori_ta:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Sám sebou podepsaný certifikát"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "_Připojit po startu Gajimu"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Spojení"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Křestní:"
+msgid "Resour_ce:"
+msgstr "Zd_roj: "
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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é"
+#: ../data/gui/accounts_window.ui.h:25
+msgid "Browse..."
+msgstr "Procházet..."
 
 #: ../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 "Pokud je zaškrtnuto, Gajim ohlásí navíc několik dalších IP kromě Vaší IP, takže přenos souboru má větší šanci správného fungování."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certifikát odmítnut"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Sám sebou podepsaný certifikát"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Účet"
 
 #: ../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 "Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě spojení způsobeném vypršením spojení"
+msgid "C_onnect on Gajim startup"
+msgstr "_Připojit po startu Gajimu"
 
 #: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
 
 #: ../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 "Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na spodní straně Seznamu) změní stav tohoto účtu také"
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automaticky se znovu připojit při ztrátě spojení"
 
 #: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Pokud výchozí port použitý k přijímání zpráv nevyhovuje tvému nastavení, můžeš si zvolit jiný.\n"
-"Můžeš také zvážit změnu nastavení firewallu."
+msgid "Save conversation _logs for all contacts"
+msgstr "Uložit _historii pro všechny kontakty"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
 #: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "Informace o Vás, jak jsou uloženy na serveru"
+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 ""
+"Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na "
+"spodní straně Seznamu) změní stav tohoto účtu také"
 
 #: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Použij proxy při přenosu souborů"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Příjmení:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Pokud je zaškrtnuto, Gajim ohlásí navíc několik dalších IP kromě Vaší IP, "
+"takže přenos souboru má větší šanci správného fungování."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Spojit účty"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Obecné"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Není zvolen žádný klíč"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_použít proměnnou prostředí HTTP_PROXY"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Osobní údaje"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Spravovat..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_ta:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Varovat před použitím nezabezpečeného spojení"
 
 #: ../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 "Priorita je v Jabberu použita ke zjištění, kdo obdrží zprávu od jabber serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží klient s vyšší prioritou"
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Zaškrtněte pokud se má Gajim ptát předtím než odešlete vaše heslo přes "
+"nezabezpečené připojení."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Priorita se automaticky změní podle vašeho stavu."
+msgid "Send _keep-alive packets"
+msgstr "Odesílat keep-alive pakety"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Přejme_novat"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě "
+"spojení způsobeném vypršením spojení"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Zd_roj: "
+msgid "Use cust_om hostname/port"
+msgstr "Použít vlastní _jméno počítače/port"
 
 #: ../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 "Zdroj je odeslán Jabber serveru pro oddělení stejné JID na dvě nebo více částí závisejících na počtu připojených klientů na stejný server se stejným účtem. Takže můžete být připojeni ke stejnému účtu se zdroji 'Domov' a 'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více následuje)"
+msgid "_Hostname: "
+msgstr "_Počítač: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Uložit _historii pro všechny kontakty"
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Příslušenství</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Odesílat keep-alive pakety"
+msgid "Connection"
+msgstr "Spojení"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synch_ronizovat stav účtu s globálním stavem"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Není zvolen žádný klíč"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synch_ronizovat stav účtu s globálním stavem"
+msgid "Choose _Key..."
+msgstr "Vyberte _klíč..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronizovat kontakty"
+msgid "Use G_PG Agent"
+msgstr "Použít GPG _Agenta"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Použít GPG _Agenta"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Použít vlastní _jméno počítače/port"
+msgid "_Edit Personal Information..."
+msgstr "_Upravit osobní informace..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Použít _vlastní port:"
+msgid "Information about you, as stored in the server"
+msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Použij proxy při přenosu souborů"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Osobní údaje</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Osobní údaje"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Upravit osobní informace..."
+msgid "Co_nnect on Gajim startup"
+msgstr "_Připojit po startu Gajimu"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Povolit"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Počítač: "
+msgid "Use cust_om port:"
+msgstr "Použít _vlastní port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Spravovat..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Pokud výchozí port použitý k přijímání zpráv nevyhovuje tvému nastavení, "
+"můžeš si zvolit jiný.\n"
+"Můžeš také zvážit změnu nastavení firewallu."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Křestní:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Příjmení:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Varovat před použitím nezabezpečeného spojení"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_použít proměnnou prostředí HTTP_PROXY"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Spojit účty"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "Úče_t: "
+msgid "Add New Contact"
+msgstr "Přidat nový kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Dovol kontaktu vidět můj stav"
+msgid "A_ccount:"
+msgstr "Úče_t: "
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Přidat nový kontakt"
+msgid "_Protocol:"
+msgstr "P_rotokol:"
 
-#: ../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 "Chtěl(a) bych si Vás přidat do mého Seznamu."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Uživatel:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Přezdívka:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Skupina:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Dovol kontaktu vidět můj stav"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Autorizace"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -491,7 +560,11 @@ msgstr ""
 "abys mohl(a) přidat kontakty z tohoto protokolu.\n"
 "Klikni na tlačítko registrovat pro pokračování."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registrovat"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -499,588 +572,375 @@ msgstr ""
 "Musíš být připojen(á) k trasportu před přidáním\n"
 " kontaktu z tohoto protokolu."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Skupina:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Přezdívka:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "P_rotokol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registrovat"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Autorizace"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Uživatel:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Chtěl(a) bych si Vás přidat do mého Seznamu."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Nastala chyba:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc příkazy - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Vyber příkaz k provedení:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Prosím vyčkejte než stáhnu seznam příkazů..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc příkazy - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Vyber příkaz k provedení:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Zkontroluj ještě jednou"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Popis chyby..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Prosím vyčkejte než bude příkaz odeslán..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Dokončit"
+msgid "Please wait..."
+msgstr "Prosím čekejte..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Prosím vyčkejte než stáhnu seznam příkazů..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Tento kontakt neobsahuje žádné příkazy."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Prosím vyčkejte než bude příkaz odeslán..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Nastala chyba:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Prosím čekejte..."
+msgid "Error description..."
+msgstr "Popis chyby..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Tento kontakt neobsahuje žádné příkazy."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Dokončit"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Popis</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Editor rozšířeného nastavení"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>POZNÁMKA:</b> Měl(a) by jste restartovat gajim, aby se projevila všechna nastavení"
+msgid "Filter:"
+msgstr "Filtr:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor rozšířeného nastavení"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Popis</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtr:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+"<b>POZNÁMKA:</b> Měl(a) by jste restartovat gajim, aby se projevila všechna "
+"nastavení"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Vrátit k výchozím barvám"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Smazat MOTD"
+msgid "Show _XML Console"
+msgstr "Zobrazit _XML konzoli"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Upravit kontrolu soukromí..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Správce"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "Ode_slat zprávu serveru"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Nastavit MOTD"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Nastaví Zprávu dne"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Zobrazit _XML konzoli"
+msgid "Set MOTD..."
+msgstr "Nastavit MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Upravit MOTD"
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Upravit MOTD"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Správce"
+msgid "Delete MOTD"
+msgstr "Smazat MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "Ode_slat zprávu serveru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "okno/žáložka otevřená s tímto kontaktem"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Akce</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Podmínky</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Zvuky</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Pokročilé akce"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Pokročilá správa upozorňování"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Pryč"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Nerušit"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt změnil stav"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt se odpojil"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Nemá"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "Přenos souboru dokončen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "Požadavek přenosu souboru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "Přenos souboru zahájen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Zvýraznění zprávy v diskuzi"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Přijetí zprávy v diskuzi"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Má"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Neviditelný"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Provést příkaz"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nedostupný"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Jeden nebo více zvláštních stavů..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Připojen / Ukecaný"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Přehrát zvuk"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nová soukromá zpráva"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Když"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Aktivuj UrgencyHint window manageru pro blikání okna rozhovoru v liště úloh"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Vypnout automatické otevírání okna rozhovoru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Vypnout vyskakování existujících oken"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Vypnout existující zvuky pro tuto událost"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Vypnout zobrazování události v rosteru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Upozorni mě vyskočením okna"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Otevři okno rozhovoru s uživatelem"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "_Zobrazit událost v rosteru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "a já"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "kontakt(y)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "každý"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "pro"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Skupiny"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "když jsem v "
+msgid "Deletes Message of the Day"
+msgstr "Smaže zprávu dne"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Žádný"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr ""
+msgid "Yes"
+msgstr "Ano"
 
 #: ../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"
+msgid "Prefer"
+msgstr "Nastavení"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
+#: ../data/gui/archiving_preferences_window.ui.h:4
 msgid "Concede"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 #, fuzzy
 msgid "Forbid"
 msgstr "Zakázat"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr ""
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Žádný"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Nastavení"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Ano"
+#, fuzzy
+msgid "Auto"
+msgstr "Automaticky vstoupit"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Položka:"
+msgid "New entry received"
+msgstr "Přijat nový záznam"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Dostal(a) jste novou položku: "
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Jméno kanálu:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Položka:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Naposledy upraveno:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Přijat nový záznam"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Dostal(a) jste novou položku: "
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Odblokovat"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Zpráva:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Nastavit Činnosti"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Nastavit činnost"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Zpráva:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Nálada:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Zpráva:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Změnit heslo"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Zadejte znovu pro ověření:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Zadejte heslo:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Zadejte znovu pro ověření:"
+
+# FIXME: not accurate
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Napište nový popis stavu</b>"
+msgid "Save as Preset..."
+msgstr "Uložit stav..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Činnost:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Nálada:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Činnost:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Uložené stavy:"
 
-# FIXME: not accurate
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Uložit stav..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Napište nový popis stavu</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Vstoupit do _Diskuze"
+msgid "_Copy Link Location"
+msgstr "_Kopírovat odkaz"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "Přid_at do Seznamu"
+msgid "_Open Link in Browser"
+msgstr "_Otevřít v prohlížeči"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopírovat odkaz"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Otevři Emailový editor"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otevřít v prohlížeči"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "č."
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Vstoupit do _Diskuze"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "Přid_at do Seznamu"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Zobraz seznam smajlíků (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Přidat kontakt do Seznamu (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozvat kontakty k rozhovoru (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Pozvat kontakty k rozhovoru (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Procházet historii diskuze (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Zobrazit nabídku rozšířených funkcí (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "č."
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Odeslat zprávu"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "Ode_slat"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr "9"
 
-#: ../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"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-#, fuzzy
-msgid "label"
-msgstr "označit"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "_Pozvat do"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozvat přátele !"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC server"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Prosím, vyberte MUC server."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1088,119 +948,136 @@ msgstr ""
 "Začátek Více-uživatelského rozhovoru.\n"
 "Vyberte kontakty, které chcete pozvat"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Požádat o zobrazení je(jí)ho _stavu"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Prosím, vyberte MUC server."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Přidat zvláštní _upozornění"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC server"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Přiřadit Open_PGP Klíč..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "_Pozvat do"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "P_rovést příkaz..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Začít _rozhovor"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Upravit _skupiny"
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Odeslat jednoduchou _zprávu..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Odeslat _Soubor"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Pozvat kontakt"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Odst_ranit"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Přepnout Open_PGP šifrování"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Přepnout šifrování mezi uživateli"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Poslat vlastní stav"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "P_rovést příkaz..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Odeslat jednoduchou _zprávu..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Spravovat kontakt"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Odeslat _Soubor"
+msgid "_Rename..."
+msgstr "_Přejmenovat"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Nastavit vlastní Avatar"
+msgid "Edit _Groups..."
+msgstr "Upravit _skupiny"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Začít _rozhovor"
+msgid "Assign Open_PGP Key..."
+msgstr "Přiřadit Open_PGP Klíč..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Přepnout šifrování mezi uživateli"
+msgid "Set Custom _Avatar..."
+msgstr "Nastavit vlastní Avatar"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Přepnout Open_PGP šifrování"
+msgid "Add Special _Notification..."
+msgstr "Přidat zvláštní _upozornění"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Autorizace"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Dovol kontaktu vidět můj stav"
+#, fuzzy
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr "_Blokovat"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Požádat o zobrazení je(jí)ho _stavu"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historie"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorovat"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blokovat"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Spravovat kontakt"
+msgid "_Unignore"
+msgstr "_Neignorovat"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Přejmenovat"
+msgid "_Ignore"
+msgstr "_Ignorovat"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Autorizace"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Odst_ranit"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Neignorovat"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historie"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Vyplňte formulář."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Nastavení místnosti"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Vyplňte formulář."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Upravit skupiny"
@@ -1213,135 +1090,157 @@ msgstr "(<b>ESession</b> informace)"
 msgid "_Verify"
 msgstr "_Kontroluj"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Vlastnosti serveru"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Seznam dostupných vlastností v Gajimu: </b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Vlastnosti serveru"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Seznam aktivních, dokončených a zastavených přenosů souborů"
+msgid "File Transfers"
+msgstr "Přenosy souborů"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Zrušit přenos souboru"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Zobrazí výpis přenosů souborů mezi Vámi a ostatními"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Zruší vybraný přenos souboru"
+msgid "file transfers list"
+msgstr "výpis přenosů souborů"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Zruší vybraný přenos souboru a smaže nedokončený soubor"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Seznam aktivních, dokončených a zastavených přenosů souborů"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Vymazat"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Upozornit mě po dokončení přenosu souboru"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Přenosy souborů"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Skryje okno"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Odstraní dokončené, zrušené nebo přenosy které selhaly, z výpisu"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Odstranit přenos souboru ze výpisu."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Odstraní dokončené, zrušené nebo přenosy které selhaly, z výpisu"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Tato akce smaže jeden přenos souboru z výpisu. Pokud je přenos aktivní, bude "
+"nejdříve zastaven a potom smazán"
 
 #: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Zobrazí výpis přenosů souborů mezi Vámi a ostatními"
+msgid "Clean _up"
+msgstr "_Vymazat"
 
 #: ../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 "Tato akce smaže jeden přenos souboru z výpisu. Pokud je přenos aktivní, bude nejdříve zastaven a potom smazán"
+msgid "_Pause"
+msgstr "_Pauza"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Zruší vybraný přenos souboru a smaže nedokončený soubor"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Pokračovat"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Zrušit přenos souboru"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Upozornit mě po dokončení přenosu souboru"
+msgid "Cancels the selected file transfer"
+msgstr "Zruší vybraný přenos souboru"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Otevřít obsahující složku"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Skryje okno"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pauza"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Pokračovat"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "výpis přenosů souborů"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Otevřít obsahující složku"
 
-# FIXME: better czech translation
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Barvy stavů u záložek rozhovoru</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Účet"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Tučné"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Skupina"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Píšu zprávu"
+msgid "Gajim Themes Customization"
+msgstr "Úprava témat Gajimu"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "_Barva textu:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Styly písma:"
+msgid "_Background:"
+msgstr "_Pozadí:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Úprava témat Gajimu"
+msgid "Text _font:"
+msgstr "Písmo textu:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Pryč"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Skupina"
+msgid "Font style:"
+msgstr "Styly písma:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktivní"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Tučné"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Latinka"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pozastaveno"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Píšu zprávu"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Neaktivní"
+
+# FIXME: better czech translation
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Barvy stavů u záložek rozhovoru</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Pryč"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1350,7 +1249,7 @@ msgstr ""
 "z MUC"
 
 # FIXME: I dont really know what this is and where it is
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1358,105 +1257,98 @@ msgstr ""
 "MUC Directed\n"
 "Messages"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pozastaveno"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Barva textu:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Písmo textu:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Pozadí:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Změ_nit přezdívku"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Spravuj Místnost"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Změnit _předmět"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Nastavit _místnost"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Záložky"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Zničit místnost"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Spravuj Místnost"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimalizovat při zavření"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Hlas"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Záložky"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derátor"
+msgid "_Send Private Message"
+msgstr "_Odeslat soukromou zprávu"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "_Akce účastníků"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Odeslat _Soubor"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "_Akce účastníků"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "Přid_at do Seznamu"
+msgid "_Voice"
+msgstr "_Hlas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derátor"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "Č_len"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Správce"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Zakázat"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Vlastník"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "Č_len"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Vlastník"
+msgid "_Ban"
+msgstr "_Zakázat"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Odeslat soukromou zprávu"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Hlas"
+msgid "_Add to Roster"
+msgstr "Přid_at do Seznamu"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Zobrazit seznam formátování"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Změ_nit přezdívku"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Přidat tuto místnost do záložek"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1468,214 +1360,226 @@ msgid "From:"
 msgstr "Odesílatel:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Předmět:"
 
 #: ../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."
-msgstr ""
-"<b>VAROVÁNÍ:</b>\n"
-"Pokud plánujete rozsáhlé promazání, ujistěte se, že Gajim neběží. Obecně se vyvarujte mazání historie kontaktu, se kterým si právě píšete."
+msgid "Gajim History Logs Manager"
+msgstr "Gajimův Správce Historie"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Smazat"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Export"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajimův Správce Historie"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 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 ""
-"Tento správce logů není určený pro jejich prohlížení. Místo toho použijte okno s historií.\n"
+"Tento správce logů není určený pro jejich prohlížení. Místo toho použijte "
+"okno s historií.\n"
 "\n"
-"Použijte tento program pro mazání nebo export zpráv. Můžete vybrat logy vlevo a/nebo je dole vyhledat v databázi."
+"Použijte tento program pro mazání nebo export zpráv. Můžete vybrat logy "
+"vlevo a/nebo je dole vyhledat v databázi."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>VAROVÁNÍ:</b>\n"
+"Pokud plánujete rozsáhlé promazání, ujistěte se, že Gajim neběží. Obecně se "
+"vyvarujte mazání historie kontaktu, se kterým si právě píšete."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Hledat v databázi"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Všechny stavy"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Historie konverzace"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Export"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Diskuze"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Všechny stavy"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Historie konverzace"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Najít:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:1
+#: ../data/gui/history_window.ui.h:9
 #, fuzzy
-msgid "approve"
-msgstr "schválit"
+msgid "_Show status changes"
+msgstr "Zaznamenávat změny _stavu kontaktů"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "expire"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-#, fuzzy
-msgid "body"
-msgstr "tělo"
+msgid "save"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Ostatní"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr ""
+#, fuzzy
+msgid "body"
+msgstr "tělo"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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"
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+msgid "stream"
 msgstr ""
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
 #, fuzzy
-msgid "otr"
-msgstr "Ostatní"
+msgid "approve"
+msgstr "schválit"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Připoj se do této místnosti automaticky po připojení"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Místnost:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Přezdívka:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Nedávno:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Nedávno:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Připoj se do této místnosti automaticky po připojení"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Místnost:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Přidat tuto místnost do záložek"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Přidat tuto místnost do záložek"
+msgid "Bro_wse Rooms"
+msgstr "_Prohlížet"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Vstoupit"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automaticky vstoupit"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Spravovat záložky"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimalizovat po připojení"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titul:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Vypiš stav:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automaticky vstoupit"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titul:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimalizovat po připojení"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1686,140 +1590,138 @@ msgid "_Configure"
 msgstr "_Nastavit"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Vlastnosti</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Nastavení</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Spravovat profily Proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Typ:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "He_slo:"
+msgid "_Name:"
+msgstr "_Jméno: "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "P_očítač Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Vlastnosti</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "_Port Proxy:"
+msgid "Use HTTP prox_y"
+msgstr "Použij HTTP prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Použij HTTP prox_y"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Použít při_hlášení k proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Uživatel:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "He_slo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Jméno: "
+msgid "Proxy _Host:"
+msgstr "P_očítač Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Typ:"
+msgid "Proxy _Port:"
+msgstr "_Port Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Uživatel:"
+msgid "<b>Settings</b>"
+msgstr "<b>Nastavení</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Spravovat účty"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Heslo"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torizuj"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "Přip_ojen"
+msgid "Version:"
+msgstr "GTK+ verze: "
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Nastavit"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Popis:"
+msgid "Authors:"
+msgstr "Au_torizuj"
 
 #: ../data/gui/plugins_window.ui.h:7
 msgid "Homepage:"
 msgstr "Dom. stránka:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr ""
+#, fuzzy
+msgid "homepage url"
+msgstr "Dom. stránka:"
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Stagnuje"
+msgid "Description:"
+msgstr "Popis:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Nastavit"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:13
 #, fuzzy
-msgid "Version:"
-msgstr "GTK+ verze: "
+msgid "Installed"
+msgstr "Stagnuje"
 
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 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"
@@ -1831,948 +1733,1049 @@ msgid "Event desc"
 msgstr "Událost"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor rozšířeného nastavení</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Vždy použít OS/X výchozí aplikace"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikace</b>"
+msgid "Custom"
+msgstr "Vlastní"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Akce</b>"
+msgid "All chat states"
+msgstr "Všechny stavy"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatický Stav</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Píšu zprávu"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Vzhled diskuze</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Vypnuto"
 
-# FIXME: better czech translation -co takhle?
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Barvy Řádků V Diskuzi</b>"
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Vizuální upozornění</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikdy\n"
+"Pouze při čekajících událostech\n"
+"Vždy"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Podmínky</b>"
+msgid "Always"
+msgstr "Pryč"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr ""
 
-#. 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>Vlastní</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Upozorni mě na kontakty které se odhlásí"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Písmo</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Zobrazit událost v rosteru"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Volby GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Přednastavené stavy</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Soukromí</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Vzhled Rosteru</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Poslední stav: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Přednastavené stavy</b>"
+msgid "Preferences"
+msgstr "Nastavení"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Témata</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Zobrazovat a_vatary kontaktů v seznamu"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Prostřední:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
+"diskuzích"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Vizuální upozornění</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
 #: ../data/gui/preferences_window.ui.h:22
-#, fuzzy
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(například: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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:23
-msgid "Advanced"
-msgstr "Rozšířené"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Zobrazovat _nálady kontaktů v seznamu"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Rozšířené..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Všechny stavy"
+msgid "Sort contacts by status"
+msgstr "Seřadit podle stavu"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Povolit odeslání informace o _OS"
+msgid "in _roster"
+msgstr "v _rosteru"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Povolit odeslání informace o _OS"
+msgid "in _group chats"
+msgstr "v _diskuzích"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Vzhled Rosteru</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Povolit zvuk, když jsem zaneprázněn"
+msgid "_Window behavior:"
+msgstr "Chování _okna"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Pryč"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
+"animované nebo statické grafické smajlíky"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Ptej se na stav při:"
+msgid "_Emoticons:"
+msgstr "_Smajlíky:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr "Audio / Video"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Udělej o_kna zpráv kompaktní"
 
 #: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Audio input device"
-msgstr "Audio vstupní zařízení"
+msgid "Hide all buttons in chat windows"
+msgstr "Skryje tlačítka v okně diskuze."
 
 #: ../data/gui/preferences_window.ui.h:34
-#, fuzzy
-msgid "Audio output device"
-msgstr "Audio výstupní zařízení"
+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:35
-msgid "Chat message:"
-msgstr "Zpráva diskuze:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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: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"
+msgid "_Highlight misspelled words"
+msgstr "Zvýrazňovat _slova s překlepy"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Píšu zprávu"
+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 ""
+"Pokud je zaškrtnuto, Gajim zvýrazní překlepy při psaní zprávy.Pokud není "
+"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:38
-msgid "Configure color and font of the interface"
-msgstr "Nastav barvu a písmo uživatelského rozhraní"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Zobrazit _Seznam"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "Zpráva kontaktu:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Přehraný zvuk při příchodu jakékoliv MUC zprávy."
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "Přezdívka kontaktu:"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Vlastní"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Vzhled diskuze</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Když je přijata nová zpráva"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Upozorni mě na kontakty které se přihlásí"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Upozorni mě na kontakty které se odhlásí"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Vypnuto"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Zobrazovat čin_nosti kontaktů v seznamu"
+msgid "Notify on new _GMail email"
+msgstr "Upozorni při novém _GMail emailu"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Zobraz _podrobnosti emailu"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
+"emailu"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Zobrazovat _nálady kontaktů v seznamu"
+msgid "Display _extra email details"
+msgstr "Zobraz _podrobnosti emailu"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Zobrazovat _hudbu kontaktů v seznamu"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
+"emailu"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Zobrazovat a_vatary kontaktů v seznamu"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Volby GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Zobrazovat _nálady kontaktů v seznamu"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizuální upozornění</b>"
 
 #: ../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 umí ohlašovat svoji schopnost posílat a přijímat meta-informace vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru chcete zobrazovat v oknech rozhovoru."
+msgid "Play _sounds"
+msgstr "Přehrávat _zvuky"
 
 #: ../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 umí ohlašovat svoji schopnost posílat a přijímat meta-informace vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru chcete posílat svému protějšku."
+msgid "Ma_nage..."
+msgstr "Sp_ravovat..."
 
 #: ../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 Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém dolním rohu obrazovky"
+msgid "Allow sound when I'm _busy"
+msgstr "Povolit zvuk, když jsem zaneprázněn"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Zvuky</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "Skryje tlačítka v okně diskuze."
+msgid "Notifications"
+msgstr "Upozornění"
 
 #: ../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í"
+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 umí ohlašovat svoji schopnost posílat a přijímat meta-informace "
+"vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
+"chcete zobrazovat v oknech rozhovoru."
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového emailu"
+msgid "_Display chat state notifications:"
+msgstr "Zobrazovat _události stavu rozhovoru:"
 
 #: ../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."
+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 umí ohlašovat svoji schopnost posílat a přijímat meta-informace "
+"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:62
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Pokud je zaškrtnuto, Gajim změní stav na 'Nedostupný' pokud se počítač nepoužívá delší dobu"
+msgid "_Send chat state notifications:"
+msgstr "Zobrazovat _události stavu rozhovoru:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v diskuzích"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Vizuální upozornění</b>"
 
+# FIXME: snad je to ok?
 #: ../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 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v okně Seznamu a v diskuzích"
+msgid "Personal Events"
+msgstr "Moje události"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Automaticky pryč po:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v diskuzích"
+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: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"
+msgid "_Not available after:"
+msgstr "Automaticky _nedostupný po:"
 
 #: ../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"
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+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: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 "Pokud je zaškrtnuto, Gajim zvýrazní překlepy při psaní zprávy.Pokud není nastavení jazyk přes pravé tlačítko na vstupním poli, tak se použije výchozí jazyk pro tento kontakt nebo diskuzi."
+msgid "minutes"
+msgstr "minutách"
 
 #: ../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 not in the roster"
-msgstr "Zaškrtněte pouze pokud Vás obtěžuje někdo, koho nemáte v rosteru. Použijte s 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: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 "Pokud je zaškrtnuto, Gajim ponechá záznamy šifrovaných zpráv. Avšak při použití E2E musí protějšek souhlasit se záznamem, jinak zprávy nebudou zaznamenávány."
-
-#: ../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 "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového emailu"
+msgid ""
+"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 ""
+"Popis stavu automatického stavu 'Pryč'. Pokud je prázdná, tak Gajim nezmění "
+"současný popis stavu\n"
+"$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: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, etc...)"
-msgstr "Pokud zaškrtnuto, Gajim použije ikony specifické pro protokol (např. kontakt z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, atd...)"
-
-#: ../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 "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:75
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní animované nebo statické grafické smajlíky"
+msgid ""
+"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 ""
+"Automatická popia stavu 'Nedostupný'. Pokud je prázdná, tak Gajim nezmění "
+"současný popis stavu\n"
+"$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:76
-msgid "Log _encrypted chat session"
-msgstr "Logovat šifrované rozhovory"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatický Stav</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Udělej o_kna zpráv kompaktní"
+msgid "Ask status message when I:"
+msgstr "Ptej se na stav při:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Sp_ravovat..."
+msgid "Sign _in"
+msgstr "_Přihlásí"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "Server"
+msgid "Sign _out"
+msgstr "_Odhlásí"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Upozornění"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Upozorni mě na kontakty které se přihlásí"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Přednastavené stavy</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Upozorni mě na kontakty které se odhlásí"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Přednastavené stavy</b>"
 
-#: ../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:83 ../src/config.py:398
+msgid "Status"
+msgstr "Stav"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Upozorni při novém _GMail emailu"
+msgid "Use system _default"
+msgstr "Použij nastavení _systému"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Nikdy\n"
-"Pouze při čekajících událostech\n"
-"Vždy"
+msgid "Chat message:"
+msgstr "Zpráva diskuze:"
 
-# FIXME: snad je to ok?
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Moje události"
+msgid "<b>Font</b>"
+msgstr "<b>Písmo</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Přehrávat _zvuky"
+msgid "Use _transports icons"
+msgstr "Používat ikony _transportů"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 msgstr ""
+"Pokud zaškrtnuto, Gajim použije ikony specifické pro protokol (např. kontakt "
+"z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
+"atd...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Nastavení"
+msgid "Status _iconset:"
+msgstr "Výchozí _ikony stavů:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Nastav barvu a písmo uživatelského rozhraní"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Téma:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Témata</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-#, fuzzy
-msgid "Show notification area icon:"
-msgstr "Notification-daemon"
+msgid "Contact's nickname:"
+msgstr "Přezdívka kontaktu:"
 
 #: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
-msgid "Show only in roster"
-msgstr "_Zobrazit událost v rosteru"
+msgid "Your nickname:"
+msgstr "Vaše přezdívka:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Přihlásí"
+msgid "_Status message:"
+msgstr "_Stav:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Odhlásí"
+msgid "_URL highlight:"
+msgstr "Zvýraznění _URL:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Vrátit k výchozím barvám"
 
 #: ../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 "Některé zprávy mohou obsahovat formátování (odsazení, barvy aj.). Pokud je zaškrtnuto, Gajim zobrazí pouze čistý text."
+msgid "Contact's message:"
+msgstr "Zpráva kontaktu:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Seřadit podle stavu"
+msgid "Your message:"
+msgstr "Vaše zpráva:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Stav"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Zvýraznění zprávy v diskuzi"
 
+# FIXME: better czech translation -co takhle?
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Výchozí _ikony stavů:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Barvy Řádků V Diskuzi</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Styl"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Téma:"
+#, fuzzy
+msgid "Audio input device"
+msgstr "Audio vstupní zařízení"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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 ""
-"Popis stavu automatického stavu 'Pryč'. Pokud je prázdná, tak Gajim nezmění současný popis stavu\n"
-"$S se nahradí za předchozí popis stavu\n"
-"$T se nahradí dobou nečinnosti před zapnutím stavu Pryč"
+#, fuzzy
+msgid "Audio output device"
+msgstr "Audio výstupní zařízení"
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akce</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+#, fuzzy
+msgid "Video input device"
+msgstr "Video vstupní zařízení"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+#, fuzzy
+msgid "Video output device"
+msgstr "Video výstupní zařízení"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
 msgstr ""
-"Automatická popia stavu 'Nedostupný'. Pokud je prázdná, tak Gajim nezmění současný popis stavu\n"
-"$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:109
+#, fuzzy
+msgid "Video size"
+msgstr "Velikost videa"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Používat ikony _transportů"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Vždy použít OS/X výchozí aplikace"
+msgid "<b>Video</b>"
+msgstr "<b>Prostřední:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Použij nastavení _systému"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
-msgid "Video input device"
-msgstr "Video vstupní zařízení"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(například: stunserver.org)</i>"
 
-#: ../data/gui/preferences_window.ui.h:115
-#, fuzzy
-msgid "Video output device"
-msgstr "Video výstupní zařízení"
+#: ../data/gui/preferences_window.ui.h:114
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
 #, fuzzy
-msgid "Video size"
-msgstr "Velikost videa"
+msgid "<b>Connection</b>"
+msgstr "<b>Podmínky</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Audio / Video"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "Vaše zpráva:"
+msgid "_File manager:"
+msgstr "_Správce souborů:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "Vaše přezdívka:"
+msgid "_Mail client:"
+msgstr "E-_mailový klient:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Automaticky pryč po:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Zobrazovat _události stavu rozhovoru:"
+msgid "<b>Custom</b>"
+msgstr "<b>Vlastní</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Smajlíky:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikace</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Správce souborů:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "Zvýrazňovat _slova s překlepy"
+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 ""
+"Zaškrtněte pouze pokud Vás obtěžuje někdo, koho nemáte v rosteru. Použijte s "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Povolit odeslání informace o _OS"
 
 #: ../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"
+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:128
-msgid "_Log status changes of contacts"
-msgstr "Zaznamenávat změny _stavu kontaktů"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Povolit odeslání informace o _OS"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "E-_mailový klient:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+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:130
-msgid "_Not available after:"
-msgstr "Automaticky _nedostupný po:"
+msgid "Log _encrypted chat session"
+msgstr "Logovat šifrované rozhovory"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Otevřít..."
+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 ""
+"Pokud je zaškrtnuto, Gajim ponechá záznamy šifrovaných zpráv. Avšak při "
+"použití E2E musí protějšek souhlasit se záznamem, jinak zprávy nebudou "
+"zaznamenávány."
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "_Vrátit k výchozím barvám"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Povolit odeslání informace o _OS"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "Zobrazovat _události stavu rozhovoru:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Stav:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "Zvýraznění _URL:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Soukromí</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "Chování _okna"
+msgid "_Log status changes of contacts"
+msgstr "Zaznamenávat změny _stavu kontaktů"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "v _diskuzích"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "v _rosteru"
+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:139
-msgid "minutes"
-msgstr "minutách"
+msgid "_Open..."
+msgstr "_Otevřít..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor rozšířeného nastavení</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Rozšířené"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Nastavení Soukromí:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Přidej / Uprav pravidlo</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Nastavení Soukromí"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Seznam pravidel</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Nastavení Soukromí</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktivní pro toto sezení"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktivní při každém startu"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Seznam pravidel</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Vše"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Přidej / Uprav pravidlo</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Všechno (včetně autorizací)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Povolit"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "všem ve skupině"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Pořadí:"
+msgid "all by subscription"
+msgstr "všechny podle autorizace"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Nastavení Soukromí"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Vše"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "všechny podle autorizace"
+msgid "to send me messages"
+msgstr "odeslat zprávu"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "všem ve skupině"
+msgid "to send me queries"
+msgstr "pro zaslání dotazu"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Oboustranná"
+msgid "to view my status"
+msgstr "Dovol mu/jí vidět můj stav"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Odesílatel"
+msgid "to send me status"
+msgstr "Požádat o zobrazení je(jí)ho stavu"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "jeden"
+msgid "All (including subscription)"
+msgstr "Všechno (včetně autorizací)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dva"
+msgid "Order:"
+msgstr "Pořadí:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "odeslat zprávu"
+#, fuzzy
+msgid "none"
+msgstr "jeden"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "pro zaslání dotazu"
+#, fuzzy
+msgid "both"
+msgstr "Oboustranná"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "Požádat o zobrazení je(jí)ho stavu"
+#, fuzzy
+msgid "from"
+msgstr "Odesílatel"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "Dovol mu/jí vidět můj stav"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresa</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "dva"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Narozeniny:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Město:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Příjmení:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Společnost:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Stát:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Prostřední:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Oddělení:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Před jménem</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Další adresa:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Křestní:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Příjmení:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Za jménem:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Celé jméno:</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Ulice:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Křestní:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Město:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Domovská stránka:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Stát:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Další adresa:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Prostřední:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>PSČ:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Jméno:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Stát:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Přezdívka:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresa</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefon:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Domovská stránka:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Pozice:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Jméno:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>PSČ:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Přezdívka:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefon:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Před jménem</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formát: RRRR-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Postavení:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Narozeniny:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Stát:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Ulice:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Klikni pro nastavení tvého avatara"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Za jménem:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Osobní údaje"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Společnost:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Komentář"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Pozice:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Klikni pro nastavení tvého avatara"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Oddělení:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formát: RRRR-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Postavení:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Osobní údaje"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Práce"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Komentář"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Odstranit účet _pouze z Gajimu"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstranit účet z Gajimu i ze _serveru"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "Odst_ranit"
 
 #: ../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 ""
+msgid "Roster Item Exchange"
+msgstr "Výměna položky rosteru"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Výměna položky rosteru"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Přid_at Kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "Vlastnosti serveru"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Akce"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Přenosy souborů"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Přid_at Kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Často kladené dotazy - FAQ (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Úpravy"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Nápověda online"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "Úč_ty"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 #, fuzzy
 msgid "P_lugins"
 msgstr "P_luginy"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Profil, A_vatar"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Zobraz"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Zobrazit _odpojené kontakty"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Zobrazuj trans_porty"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Zobrazit _odpojené kontakty"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "Úč_ty"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Přenosy souborů"
 
-#. 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 "_Akce"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Nápověda"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Úpravy"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Nápověda online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Nápověda"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Odeslat jednoduchou _zprávu..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Často kladené dotazy - FAQ (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Zobraz"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Prosím vyčkejte než stáhnu seznam příkazů..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Vlastnosti serveru"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Najít"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Prosím vyčkejte než stáhnu seznam příkazů..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Přidat _kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Najít"
 
@@ -2792,303 +2795,312 @@ msgstr "Zaregistrovat"
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Odpovědět na tuto zprávu"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Příjemce:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "O_deslat"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Odeslat zprávu"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Odeslat zprávu a zavřít okno"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Odpovědět"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Příjemce:"
+msgid "Reply to this message"
+msgstr "Odpovědět na tuto zprávu"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Odpovědět"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Ode_slat a zavřít"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Odeslat zprávu a zavřít okno"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torizuj"
+msgid "Subscription Request"
+msgstr "Žádost o autorizaci"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autorizovat kontakt, aby věděl kdy jsi připojený(á)"
+msgid "_Deny"
+msgstr "O_dmítnout"
 
 #: ../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 "Odmítne autorizaci od kontaktu, takže nezjistí kdy jste připojen(a)"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Žádost o autorizaci"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torizuj"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "O_dmítnout"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizovat kontakt, aby věděl kdy jsi připojený(á)"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Synchronizovat kontakty"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Vybrat účet pro synchronizaci"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "JID kontaktu, se kterým chcete komunikovat"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronizace: vybrat kontakty"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Vypnout zvuky"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Odeslat jednoduchou _zprávu"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Zobrazit všechny čekající _události"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Diskuze"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Žádá:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Odeslat jednoduchou _zprávu"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klient:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Zobrazit všechny čekající _události"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Čas kontaktu:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Vypnout zvuky"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informace o kontaktu"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Zdroj:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Stav:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Autorizace:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klient:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Systému:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Vlastní poznámky"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Čas kontaktu:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Nastavit avatara"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Autorizace:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informace o kontaktu"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Žádá:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Více"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Písmo</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Vlastní poznámky"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Provoz Jabberu</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Vstup XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Písmo</b>"
+
+#. 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:11
+msgid "_IQ"
+msgstr "_IQ"
+
+#: ../data/gui/xml_console_window.ui.h:12
 msgid "Info/Query"
 msgstr "Info/Query"
 
-#. 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"
+msgid "_Presence"
+msgstr "_Stav"
 
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Stav"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Vstup XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokální jid: "
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Osobní"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klient"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Osobní"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klient"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Zrušit ověření"
 
-#: ../src/adhoc_commands.py:324
-msgid "You are in process of executing command. Do you really want to cancel it?"
+#: ../src/adhoc_commands.py:326
+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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neplatná místnost"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Služba odeslala chybné data"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Služba změnila identifikátor sezení."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc příkazy - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktivní"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Neaktivní"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Číslo"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Barva"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Název volby"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Žádný)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Skryté"
 
@@ -3100,237 +3112,183 @@ msgstr[0] "Dostal(a) jste novou položku: "
 msgstr[1] "Dostal(a) jste novou položku: "
 msgstr[2] "Dostal(a) jste novou položku: "
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ;
-#. done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Angličtina"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Běloruština"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulharština"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretonština"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Čeština"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Němčina"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Řečtina"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Britština"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Španělština"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Baskičtina"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francouzština"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Chorvatština"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italština"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norština (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandština"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norština"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polština"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugalština"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazilská portugalština"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruština"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Srbština"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovenština"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Švédština"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Čínština"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Kontrola jazyka"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Chyba."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Podtrhnout"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Přeškrtnout"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Smazat formátování"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG Šifrování zapnuto"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Tento kontakt nepodporuje přenos souborů."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Není v Rosteru"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Přepnout audio"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Přepnout video"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Vlastnost není k dispozici pod Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Odeslat _Soubor"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Tento kontakt nepodporuje přenos souborů."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, 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:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/chat_control.py:1991
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Tento kontakt nemá přiřazen GPG klíč. Proto nemůžeš šifrovat pomocí GPG zprávy."
+#: ../src/chat_control.py:2230
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
+msgstr ""
+"Tento kontakt nemá přiřazen GPG klíč. Proto nemůžeš šifrovat pomocí GPG "
+"zprávy."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG Šifrování vypnuto"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sezení BUDE logováno"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sezení NEBUDE logováno"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NENÍ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NEBUDE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3339,289 +3297,666 @@ msgstr ""
 "Šifrování %(type)s %(status)s aktivní %(authenticated)s.\n"
 "Váš rozhovor %(logged)s zaznamenáván."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sezení NEBUDE logováno"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Toto sezení je šifrované"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "a BUDE zaznamenáváno"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "a NEBUDE zaznamenáváno"
 
-#: ../src/chat_control.py:2236
-msgid "Remote contact's identity not verified. Click the shield button for more details."
+#: ../src/chat_control.py:2470
+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:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Následující zpráva NEBYLA šifrovaná"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, 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: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:2799
+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: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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+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:3205 ../src/gui_interface.py:1161
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Nelze přečíst soubor databáze (%s). Opravte ho nebo smažte (tím ztratíte všechny zprávy v historii)."
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Nepodařilo se dešifrovat zprávu od %s\n"
+"Možná je falešná."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Přenosy souborů"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Velikost: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Přijmi"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Přenos soubor dokončen"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Skupinová pozvánka"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Protějšek zastavil přenos"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Chyba při čtení souboru"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Přenos souboru zastaven"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Přenos souboru zrušen"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Spojení s protistranou se nepodařilo navázat."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Použití: /%s, skryje tlačítka rozhovoru."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Použití: /%s, pošle zprávu kontaktu"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nebyl nalezen"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Pryč"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Přip_ojen"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Použití: /%s, smaže zprávy v okně."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Přepnout Open_PGP šifrování"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Použití: /%s, pošle ping kontaktu"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Příkaz není podporován pro zeroconf účet."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Kliknutím zobraz staré rozhovory s tímto kontaktem"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s není platný loglevel"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Spojení není dostupné"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Spojení není dostupné"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Změ_nit přezdívku"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Neplatné uživatelské jméno"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
+"nájemníkovi."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+msgid "Nickname not found"
+msgstr "Přezdívka nenalezena: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
+"nájemníkovi."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Ptát se před zavřením oken/záložek diskuzí."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Odeslat %s %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Jste pozván do diskuze"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Neplatný server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Příslušnost:"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Chybí parametry \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "vytvářím databázi historie"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Informace o změně stavu"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Změnit stav"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Nastav typ přítomnosti a popisek"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Ukecaný"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Připojen"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Dlouho pryč"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Nerušit"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Odpojený - odpojit"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Popis stavu: "
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Stav se změnil."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Opustit diskuzi"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s v %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Nepřipojil jsi se k diskuzi."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Diskuze"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Opustil(a) jste následující diskuze:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Přeposlat nepřečtené zprávy"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Všechny nepřečtené zprávy byly přeposlány."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Přeposlat nepřečtené zprávy"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Přehrávat zvuk, je-li uživatel zaneprázdněn"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Zobraz v rosteru pouze online kontakty nebo kontakty hledající pokec."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Pryč z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nedostupný z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, 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'."
+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'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Barva příchozí přezdívky."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Barva odchozí přezdívky."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Barva příchozího textu."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Barva odchozího textu."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Barva stavové zprávy."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Zobrazit událost v rosteru"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Zobrazit událost v rosteru"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Požadavek přenosu souboru"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Přenos souboru zrušen"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Skupinová pozvánka"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Písmo příchozí přezdívky."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Písmo odchozí přezdívky."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Písmo příchozího textu."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Písmo odchozího textu."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Písmo stavové zprávy."
 
-#: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
+#: ../src/common/config.py:116
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "výchozí"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Jazyk použitý kontrolou pravopisu"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3631,601 +3966,1137 @@ msgstr ""
 "'někdy' - vypiš čas každou print_ichat_every_foo_minutes minutu.\n"
 "'nikdy' - nevypisuj čas."
 
-#: ../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 "Vypiš čas v rozhovorech s použitím Fuzzy Clock. Hodnota náhodnosti je od 1 to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně přesný. Toto se použije jenom při print_time nastaveném na 'někdy'."
+#: ../src/common/config.py:125
+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 ""
+"Vypiš čas v rozhovorech s použitím Fuzzy Clock. Hodnota náhodnosti je od 1 "
+"to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně "
+"přesný. Toto se použije jenom při print_time nastaveném na 'někdy'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: ../src/common/config.py:118
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
-
-#: ../src/common/config.py: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 "Pokud je vybráno, použije ReStructured text markup k odeslání HTML, navíc s ascii formátování. Pro syntaxi navštivte http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Pokud si to chcete prohlédnout, nainstalujte docutils)"
+#: ../src/common/config.py:129
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
-#: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v diskuzi."
+#: ../src/common/config.py:132
+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 ""
+"Pokud je vybráno, použije ReStructured text markup k odeslání HTML, navíc s "
+"ascii formátování. Pro syntaxi navštivte http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html (Pokud si to chcete prohlédnout, "
+"nainstalujte docutils)"
 
-#: ../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 "Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo jiný v diskuzi."
+#: ../src/common/config.py:141
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v "
+"diskuzi."
 
-#: ../src/common/config.py: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 "Tato volba umožní vlastní formátování času, který je zobrazován v rozhovorech. Například \"[%H:%M]\" zobrazí \"[hodina:minuta]\". Pro víc informací shlédněte dokumentaci pythonu funkce strftime na: http://docs.python.org/lib/module-time.html"
+#: ../src/common/config.py:142
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo "
+"jiný v diskuzi."
 
 #: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
+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 ""
+"Tato volba umožní vlastní formátování času, který je zobrazován v "
+"rozhovorech. Například \"[%H:%M]\" zobrazí \"[hodina:minuta]\". Pro víc "
+"informací shlédněte dokumentaci pythonu funkce strftime na: http://docs."
+"python.org/lib/module-time.html"
+
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky, které budou vypisovány před přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky, které budou vypisovány za přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:164
-msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+#: ../src/common/config.py:177
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:167
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka rozhovoru znovu otevřena."
+#: ../src/common/config.py:180
+#, fuzzy
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened?"
+msgstr ""
+"Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
+"rozhovoru znovu otevřena."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kolik minut by měly řádky z předchozího rozhovoru zůstat."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "Kolik řádek požadovat od serveru při připojení k diskuzi."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
 
-#: ../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 "Kolik vteřin čekat před automatickým znovu vstoupením do diskuze, ze které jste odpojován(a). Nastavte na 0 pro vypnutí automatického znovu vstoupení."
+#: ../src/common/config.py:184
+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 ""
+"Kolik vteřin čekat před automatickým znovu vstoupením do diskuze, ze které "
+"jste odpojován(a). Nastavte na 0 pro vypnutí automatického znovu vstoupení."
+
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
 
-#: ../src/common/config.py:173
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí chování klienta Mirabilis ICQ)."
+#: ../src/common/config.py:186
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
+"chování klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', která znamená že se použije wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
+"která znamená že se použije wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Pokud zaškrtnuta, Gajim může být ovládán vzdáleně pomocí gajim-remote."
 
-#: ../src/common/config.py: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 "Je-li povoleno, čeká na D-Bus signál z NetworkManager a změní stav účtů (pokud nemají nastaveno listen_to_network_manager nastavený na False a synchronizují se s globálním stavem) v závislosti na stavu síťového připojení."
+#: ../src/common/config.py:195
+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 ""
+"Je-li povoleno, čeká na D-Bus signál z NetworkManager a změní stav účtů "
+"(pokud nemají nastaveno listen_to_network_manager nastavený na False a "
+"synchronizují se s globálním stavem) v závislosti na stavu síťového "
+"připojení."
 
-#: ../src/common/config.py:183
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, vypnutá."
+#: ../src/common/config.py:196
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
+"vypnutá."
 
-#: ../src/common/config.py:184
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Zobraz stavy rozhovoru v okně rozhovoru. Může být jedno z all, composing_only nebo disabled."
+#: ../src/common/config.py:197
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Zobraz stavy rozhovoru v okně rozhovoru. Může být jedno z all, "
+"composing_only nebo disabled."
 
-#: ../src/common/config.py:186
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji každých x minut."
+#: ../src/common/config.py:199
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji "
+"každých x minut."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: ../src/common/config.py:188
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu mezerami oddělením Jabber ID místností."
+#: ../src/common/config.py:201
+#, fuzzy
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat JIDs."
+msgstr ""
+"Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu "
+"mezerami oddělením Jabber ID místností."
 
-#: ../src/common/config.py:189
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto seznamu mezerami oddělenými Jabber ID místností."
+#: ../src/common/config.py:202
+#, fuzzy
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat JIDs."
+msgstr ""
+"Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto seznamu "
+"mezerami oddělenými Jabber ID místností."
 
-#: ../src/common/config.py: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 "Ptát se před zavřením okna s panely rozhovorů, jsou-li tam prvky, které mohou ztratit data (rozhovor, soukromý rozhovor, diskuze které nebudou minimalizovány)"
+#: ../src/common/config.py:203
+#, fuzzy
+msgid ""
+"Ask before closing tabbed chat window if there are controls that can lose "
+"data (chat, private chat, groupchat that will not be minimized)"
+msgstr ""
+"Ptát se před zavřením okna s panely rozhovorů, jsou-li tam prvky, které "
+"mohou ztratit data (rozhovor, soukromý rozhovor, diskuze které nebudou "
+"minimalizovány)"
 
-#: ../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 "Čárkami oddělený seznam počítačů kterým posíláme, navíc k lokálním síťovým rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním portů."
+#: ../src/common/config.py:206
+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 ""
+"Čárkami oddělený seznam počítačů kterým posíláme, navíc k lokálním síťovým "
+"rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním "
+"portů."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Upozorni na události v systémovém trayi."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj panelu v oknech rozhovorů?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../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 "Seznam modp skupin pro použití s Diffie-Hellman, první jsou nejvyšší, oddělené čárkami. Povolené skupiny jsou 1, 2, 5, 14, 15, 16, 17 a 18. Vyšší čísla jsou více bezpečná, ale vyžadují delší dobu výpočtu při startu sezení."
+#: ../src/common/config.py:220
+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 ""
+"Seznam modp skupin pro použití s Diffie-Hellman, první jsou nejvyšší, "
+"oddělené čárkami. Povolené skupiny jsou 1, 2, 5, 14, 15, 16, 17 a 18. Vyšší "
+"čísla jsou více bezpečná, ale vyžadují delší dobu výpočtu při startu sezení."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
-#: ../src/common/config.py:220
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
+#: ../src/common/config.py:246
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, 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 "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."
+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 ""
+"Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
+"Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
-#: ../src/common/config.py:222
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Pokud zapnuto, Gajim zkontroluje, zda je výchozí jabber klient, při každém startu."
+#: ../src/common/config.py:248
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Pokud zapnuto, Gajim zkontroluje, zda je výchozí jabber klient, při každém "
+"startu."
 
-#: ../src/common/config.py: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 "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené zprávy. V závislosti na tématu, tato ikona může být animovaná."
+#: ../src/common/config.py:249
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
+"zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:224
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý kontakt pod jménem v okně Seznamu."
+#: ../src/common/config.py:250
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
+"kontakt pod jménem v okně Seznamu."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Nastavení pozice avatara v rosteru. Může být vlevo nebo vpravo"
 
-#: ../src/common/config.py: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 "pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl naposledy avatara nebo kterého uložený je příliš starý."
+#: ../src/common/config.py:257
+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 ""
+"pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl "
+"naposledy avatara nebo kterého uložený je příliš starý."
+
+#: ../src/common/config.py:258
+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 ""
+"Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když "
+"kontakt změní jeho stav a/nebo jeho stavovou zprávu."
 
-#: ../src/common/config.py: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 "Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když kontakt změní jeho stav a/nebo jeho stavovou zprávu."
+#: ../src/common/config.py:259
+#, fuzzy
+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 ""
+"může být \"none\", \"all\", \"in_and_out\". Pokud je \"none\", Gajim nebude "
+"nadále vypisovat stavy v diskuzích když účastník změní svůj stav nebo "
+"stavovou zprávu. Pokud je \"all\", Gajim bude vypisovat všechny změny stavů. "
+"Při \"in_and_out\" Gajim vypíše stav jenom při vstupu a odchodu z místnosti."
 
-#: ../src/common/config.py: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 "může být \"none\", \"all\", \"in_and_out\". Pokud je \"none\", Gajim nebude nadále vypisovat stavy v diskuzích když účastník změní svůj stav nebo stavovou zprávu. Pokud je \"all\", Gajim bude vypisovat všechny změny stavů. Při \"in_and_out\" Gajim vypíše stav jenom při vstupu a odchodu z místnosti."
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Barva pozadí kontaktů, jež se přávě odhlásili."
 
-#: ../src/common/config.py:238
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Pokud je povoleno, minulé zprávy budou vypsány menším písmem, než je výchozí."
+#: ../src/common/config.py:265
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Pokud je povoleno, minulé zprávy budou vypsány menším písmem, než je výchozí."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazuj avatara pro transport samotný."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: ../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 "Pokud je True a instalované GTK+ a PyGTK verze jsou alespoň 2.8, blikej oknem (výchozí chování ve většině Window Managerů) pokud čekají nové události."
+#: ../src/common/config.py:268
+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 ""
+"Pokud je True a instalované GTK+ a PyGTK verze jsou alespoň 2.8, blikej "
+"oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
+"události."
 
-#: ../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 nemá rád sha informaci, pokud někdo vstupuje do místnosti chráněné heslem. Zaškrtněte tuto volbu na False, aby se sha informace neposílala v presenci u diskuzí."
+#: ../src/common/config.py:270
+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 nemá rád sha informaci, pokud někdo vstupuje do místnosti "
+"chráněné heslem. Zaškrtněte tuto volbu na False, aby se sha informace "
+"neposílala v presenci u diskuzí."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 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) is sent to a "
+"specific window."
 msgstr ""
 "Řídí okno, kam budou doručeny nové zprávy.\n"
 "'vždy' - Všechny zprávy jsou odeslány do jediného okna.\n"
 "'nikdy' - Všechny zprávy dostanou svoje vlastní okno.\n"
 "'peracct' - Zprávy pro každý účet jsou doručeny do zvláštních oken.\n"
-"'pertype' - Každý typ zprávy (např. rohovor vs diskuze) jsou odeslány do zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, aby se projevila"
+"'pertype' - Každý typ zprávy (např. rohovor vs diskuze) jsou odeslány do "
+"zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, "
+"aby se projevila"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Pokud je False, nebudete nadále vidět avatary v okně rozhovoru"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Pokud je True, stiskem escape zavřete panel nebo okno"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze."
 
-#: ../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 "V rozhovoru zobraz přezdívku na začátku řádku pouze v případě, když to není stejný člověk, jako v předchozí zprávě."
+#: ../src/common/config.py:281
+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 ""
+"V rozhovoru zobraz přezdívku na začátku řádku pouze v případě, když to není "
+"stejný člověk, jako v předchozí zprávě."
 
 # FIXME: netusim co to je... najit
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Odsazení při použítí spojení po sobě jdoucích přezdívek."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Jemné posouvání v okně diskuze"
 
-#: ../src/common/config.py:256
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Seznam barev, oddělený pomocí \":\", použitý k obarvení přezdívek v diskuzích."
+#: ../src/common/config.py:284
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Seznam barev, oddělený pomocí \":\", použitý k obarvení přezdívek v "
+"diskuzích."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab jde na další rozepsanou záložku, když žádný není nepřečtená."
 
-#: ../src/common/config.py:258
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená nikdy nezobrazovat dialog."
-
-#: ../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 "Mám zobrazit dialog potvrzení blokace, nebo ne? Prázdný řetezec znamená nikdy nezobrazovat dialog."
+#: ../src/common/config.py:286
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
+"nikdy nezobrazovat dialog."
 
-#: ../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 "Mám zobrazit dialog vlastního stavu nebo ne? Prázdný řetezec znamená nikdy nezobrazovat dialog."
+#: ../src/common/config.py:287
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Mám zobrazit dialog potvrzení blokace, nebo ne? Prázdný řetezec znamená "
+"nikdy nezobrazovat dialog."
 
-#: ../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 "Je-li povoleno, bude možné použít zápornou prioritu účtu v okně úprava účtu. BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru žádnou zprávu."
+#: ../src/common/config.py:288
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Mám zobrazit dialog vlastního stavu nebo ne? Prázdný řetezec znamená nikdy "
+"nezobrazovat dialog."
 
-#: ../src/common/config.py:262
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel k účtům."
+#: ../src/common/config.py:289
+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 ""
+"Je-li povoleno, bude možné použít zápornou prioritu účtu v okně úprava účtu. "
+"BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru "
+"žádnou zprávu."
 
-#: ../src/common/config.py:263
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "Je-li povoleno, Gajim použije KDE Wallet (je-li dostupný kwalletcli) k uložení hesel účtů."
+#: ../src/common/config.py:290
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
+"k účtům."
 
-#: ../src/common/config.py:264
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u řádků skupin."
+#: ../src/common/config.py:291
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Je-li povoleno, Gajim použije KDE Wallet (je-li dostupný kwalletcli) k "
+"uložení hesel účtů."
 
-#: ../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 "Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny příchozí zprávy jako uvedený typ"
+#: ../src/common/config.py:292
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u "
+"řádků skupin."
 
-#: ../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 "Je-li povoleno, Gajim bude posune a vybere kontakt, který vám poslal poslední zprávu, pokud již okno rozhovoru není otevřené."
+#: ../src/common/config.py:293
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny "
+"příchozí zprávy jako uvedený typ"
 
-#: ../src/common/config.py:267
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
-msgstr "Je-li povoleno, Gajim převede řetězec mezi $$ a $$ na obrázek pomocí dvips a převede před vložením do okna rozhovoru."
+#: ../src/common/config.py:294
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Je-li povoleno, Gajim bude posune a vybere kontakt, který vám poslal "
+"poslední zprávu, pokud již okno rozhovoru není otevřené."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Čas neaktivity před zavřením okna změny stavu."
 
-#: ../src/common/config.py:269
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "Maximální počet řádků, které se vypíší v konverzacích. Nejstarší řádky jsou smazány."
+#: ../src/common/config.py:296
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Maximální počet řádků, které se vypíší v konverzacích. Nejstarší řádky jsou "
+"smazány."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
-msgid "If True, notification windows from notification-daemon will be attached to notification icon."
-msgstr "Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
+msgstr ""
+"Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
 
-#: ../src/common/config.py:272
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
-msgstr "Změnou hodnoty změníte velikost zobrazovaných formulí latexu. Vyšší znamená větší."
-
-#: ../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 "Platná uri schémata. Pouze schémata v tomto seznamu budou akceptována jako \"skutečné\" URI. (mailto a xmpp jsou obsluhovány zvlášť)"
+#: ../src/common/config.py:299
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+msgstr ""
+"Platná uri schémata. Pouze schémata v tomto seznamu budou akceptována jako "
+"\"skutečné\" URI. (mailto a xmpp jsou obsluhovány zvlášť)"
 
-#: ../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!"
+#: ../src/common/config.py:300
+msgid ""
+"Ask offline status message to all offline contacts when connection to an "
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr "Je-li True, doplňování přezdívek v diskuzích bude porobné doplňování shellu"
+msgstr ""
+"Je-li True, doplňování přezdívek v diskuzích bude porobné doplňování shellu"
 
-#: ../src/common/config.py:276
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
-msgstr "Kdy bude zobrazena řádka vlastního kontaktu. Může být \"always\", \"when_other_resource\" nebo \"never\""
+#: ../src/common/config.py:302
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+"Kdy bude zobrazena řádka vlastního kontaktu. Může být \"always\", "
+"\"when_other_resource\" nebo \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../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."
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
 msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:312
+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 ""
+
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
+#: ../src/common/config.py:314
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v nastavení jako položky autopriority_*."
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
 
-#: ../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 "Stav použitý při auto-připojení. Může být 'připojen', 'ukecaný', 'pryč', 'nedostupný', 'nerušit', 'neviditelný'. POZNÁMKA: toto nastavení může být použito pouze pokud restore_last_status je vypnutý"
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+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."
+
+#: ../src/common/config.py:332
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v "
+"nastavení jako položky autopriority_*."
+
+#: ../src/common/config.py:340
+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 ""
+"Stav použitý při auto-připojení. Může být 'připojen', 'ukecaný', 'pryč', "
+"'nedostupný', 'nerušit', 'neviditelný'. POZNÁMKA: toto nastavení může být "
+"použito pouze pokud restore_last_status je vypnutý"
+
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Je-li povoleno, nastaví se vždy poslední použitý stav."
 
-#: ../src/common/config.py:311
-msgid "If True, Contacts requesting authorization will be automatically accepted."
+#: ../src/common/config.py:343
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Je-li True, kontakty požadující autorizaci budou automaticky přijaty."
 
-#: ../src/common/config.py:312
-msgid "If False, this account will be disabled and will not appear in roster window."
-msgstr "Pokud je False, účet bude deaktivován a nebude zobrazen v okně rosteru."
+#: ../src/common/config.py:344
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Pokud je False, účet bude deaktivován a nebude zobrazen v okně rosteru."
 
-#: ../src/common/config.py:315
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "Je-li zakázáno, spojení nebude podepsané GPG klíčem, pokud je GPG klíč nastavený."
+#: ../src/common/config.py:347
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"Je-li zakázáno, spojení nebude podepsané GPG klíčem, pokud je GPG klíč "
+"nastavený."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Povolit ESessions šifrování pro tento účet."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má se Gajim automaticky připojovat šifrovaným spojením je-li to možné?"
 
-#: ../src/common/config.py:319
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Řazený seznam (oddělený mezerami) spojení, která má Gajim zkusit. Možnosti jsou: tls, ssl nebo plain"
+#: ../src/common/config.py:351
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Řazený seznam (oddělený mezerami) spojení, která má Gajim zkusit. Možnosti "
+"jsou: tls, ssl nebo plain"
 
-#: ../src/common/config.py:320
-msgid "Show a warning dialog before sending password on an plaintext connection."
+#: ../src/common/config.py:352
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobrazit varování před použitím standartní SSL knihovny."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Při neaktivitě odeslán bílý znak"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping zaslán při neaktivitě"
 
-#: ../src/common/config.py:338
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "Kolik sekund se má čekat na odpověď pingu před tím, než se znovu pokusit o připojení."
+#: ../src/common/config.py:371
+#, fuzzy
+msgid ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect?"
+msgstr ""
+"Kolik sekund se má čekat na odpověď pingu před tím, než se znovu pokusit o "
+"připojení."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../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 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve volbě pro přenos souborů file_transfer_proxies."
+#: ../src/common/config.py:378
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
+"volbě pro přenos souborů file_transfer_proxies."
+
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Odpověď na doručení žádosti"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Poslat žádost"
 
-#: ../src/common/config.py:370
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Pokud sestavuji šifrované sezení, má Gajim přepokládat povolení zaznamenávání zpráv?"
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s Vám chce poslat soubor."
+
+#: ../src/common/config.py:405
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Pokud sestavuji šifrované sezení, má Gajim přepokládat povolení "
+"zaznamenávání zpráv?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonymní autentizace"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_ymní autentizace"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../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:478
+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:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "všechny nebo mezerou oddělené stavy"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', nebo 'both'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Kolik řádek požadovat od serveru při připojení k diskuzi."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
 
-#: ../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."
+#: ../src/common/config.py:487
+msgid ""
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../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 "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:526
+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 ""
+"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:499
+#: ../src/common/config.py:527
 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:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Příjemce"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Žádost o zrušení autorizace od %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Chyba zápisu na disk (možná je plný?)"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"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)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Místnost byla zničena"
+
+#: ../src/common/connection_handlers_events.py:943
+#, 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_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Neplatné Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+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."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "chyba při odesílání %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Neznámá SSL chyba: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nová jednoduché zpráva"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nová jednoduché zpráva od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nová soukromá zpráva"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nová soukromá zpráva z místnosti %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nová zpráva od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nová zpráva"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nová zpráva od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Změnil(a) stav"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je nyní %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt změnil stav"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s se přihlásil"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt se přihlásil"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s se odhlásil"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt se odhlásil"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nelze nahrát idle modul"
@@ -4235,207 +5106,189 @@ msgstr "Nelze nahrát idle modul"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrace k agentu %s uspěla"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registrace selhala"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, 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: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ý?)"
+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:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: ../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: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: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 "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:1956
+msgid "I would like to add you to my roster."
+msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Nepodařilo se získat certifikát vydavatele"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Nepodařilo se získat certifikát CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodařilo se dešifrovat podpis certifikátu"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodařilo se dešifrovat podpis CRL certifikátu"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Nepodařilo se dešifrovat veřejný klíč vydavatele"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Chyba podpisu certifikátu"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Chyba podpisu CRL certifikátu"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Certifikát není správný"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL certifikát není správný"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "Platnost CRL certifikátu vypršela"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Chyba certifikátu v poli: platnost před"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Chyba certifikátu v poli: platnost po"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Chyba CRL certifikátu v poli: poslední aktualizace"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Chyba CRL certifikátu v poli: příští aktualizace"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Sám sebou podepsaný certifikát v certifikačním řetězci "
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodařilo se získat certifikát lokálního vydavatele"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Nepodařilo se ověřit první certifikát"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Certifikační řetězec je přiliš dlouhý"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certifikát je zrušený"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Překročena delká cesty"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Nepodporované osvědčení certifikátu"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certifikát je nedůvěryhodný"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Neshoduje se název vydavatele"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Název klíče se neshoduje s Autoritou"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Vydavatelovo sériové číslo se neshoduje s Autoritou"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Použítý klíč neobsahuje podpis certifikátu"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:\"27\")]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4444,76 +5297,77 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Neznámá SSL chyba: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Nemůžu se připojit k \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpověděl: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Selhalo připojení k účti %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4522,7 +5376,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4531,88 +5385,101 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Autentizace certifikátu %s je neplatná."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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 "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."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Odeslán kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Odeslány kontakty:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Odregistrace selhala"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Není v rosteru"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings chybí na tomto počítači"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Možnosti D-Bus nemohou být použity"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "na tomto stroji neběží D-Bus korektně"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "na tomto stroji neběží D-Bus korektně"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "na tomto stroji neběží D-Bus korektně"
@@ -4625,7 +5492,7 @@ msgstr "Nemohu číst z databáze."
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr "Služba není dostupná. Gajim neběží, nebo remote_control je vypnutý"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus není přítomna na tohto stroji nebo modul pythonu chybí"
 
@@ -4695,8 +5562,7 @@ msgstr "deset"
 msgid "eleven"
 msgstr "jedenáct"
 
-#. 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
@@ -4811,224 +5677,232 @@ msgstr "Konec týdne"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Nedostupný"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Neviditelný"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Odesílatel"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Oboustranná"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Správce"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5036,22 +5910,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr "z místností %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr "od uživatele %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5059,22 +5933,41 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 #, fuzzy
 msgid "Hello, I am $name."
 msgstr "Ahoj, já jsem $name"
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Nezdařilo se načtení obrázku"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Obrázek je příliš veliký"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL certifikát není správný"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Nezdařilo se načtení obrázku"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Nastavení místnosti"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5086,54 +5979,49 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 #, fuzzy
 msgid "audio input"
 msgstr "audio vstup"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 #, fuzzy
 msgid "audio output"
 msgstr "audio výstup"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 #, fuzzy
 msgid "video input"
 msgstr "video vstup"
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 #, fuzzy
 msgid "video output"
 msgstr "video výstup"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "chyba při spouštění \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s není platný loglevel"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Výchozí Zpráva"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 #, fuzzy
 msgid "Audio test"
 msgstr "Audio / Video"
@@ -5141,61 +6029,81 @@ msgstr "Audio / Video"
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Velikost: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Soubor: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zelený"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "video výstup"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "chyba: nemůžu otevřít %s pro čtení"
+msgid "Error: cannot open %s for reading"
+msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
@@ -5846,19 +6754,115 @@ msgstr "Učím se"
 msgid "Writing"
 msgstr "Píši"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "výchozí"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "mariňák"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Skrývám se"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Země:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Účet"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Popis"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Chyba"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "jeden"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "místnost"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Neznámý Umělec"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Neznámý Název"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Neznámý Zdroj"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5867,26 +6871,20 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nemohu naslouchat na portu %s."
-
-#: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-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:423
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Tato zpráva je součástí šifrovaného sezení. Pokud vidíte tuto zprávu, tak je něco špatně.]"
+#: ../src/common/stanza_session.py:425
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+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:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -5895,45 +6893,45 @@ msgstr ""
 "%s\n"
 "Zasílání lokálních zpráv nemusí fungovat správně."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Nepodařilo se spustit lokální službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemůžu naslouchat na portu %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Zkontrolujte, zda avahi-daemon běží."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nemůžu změnit stav účtu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
-msgid "Connection to host could not be established: Timeout while sending data."
+#: ../src/common/zeroconf/connection_zeroconf.py:394
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
 msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání dat."
 
 #: ../src/common/zeroconf/zeroconf_avahi.py:192
@@ -5942,229 +6940,237 @@ msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání
 msgid "Error while adding service. %s"
 msgstr "Chyba při přidávání služby. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Výchozí Zpráva"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Povolit"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný jazyk nastavením volby speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
+"jazyk nastavením volby speller_language."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "text stavu"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP na tomto počítači není použitelné"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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?"
+msgstr ""
+"Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "Před změnou jména účtu si musíte přečíst všechny čekající zprávy."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1988
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:2047
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Přejmenovat účet"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadej nové jméno pro účet %s."
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Není dostupný tajný klíč OpenPGP."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Chcete-li deaktivovat účet, musíte se nejdříve odpojit."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6172,37 +7178,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 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:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 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:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 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:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6218,138 +7224,143 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Odstranit účet _pouze z Gajimu"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:3201
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto záložku."
-
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Neplatné uživatelské jméno"
+#: ../src/config.py:3280
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
+"záložku."
 
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Znak nebyl povolen"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Neplatná místnost"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
-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 "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."
+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 ""
+"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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 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:3600
+#: ../src/config.py:3703
 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:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6364,7 +7375,7 @@ msgstr ""
 "SSL Chyba: %(error)s\n"
 "Přesto se chcete k serveru připojit?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6375,72 +7386,89 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP uzel nebyl smazán"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Nastavit"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "První zpráva přijata"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Další zpráva přijata zvýrazněná"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Další zpráva přijata nezvýrazněná"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6450,7 +7478,7 @@ msgstr ""
 "stranou. Pokud zůstává dlouho, zpráva je pravděpodobně\n"
 "ztracena."
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6458,688 +7486,723 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno \n"
 "po posledním čtení této diskuze"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Konec"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, python-format
+#: ../src/conversation_textview.py:1386
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Včera"
 msgstr[1] "před %i dny"
 msgstr[2] "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "Toto pole je povinné"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je již na seznamu"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Nastavit Náladu"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
-#: ../src/dialogs.py:795
-msgid "This name is already used. Do you want to overwrite this status message?"
+#: ../src/dialogs.py:805
+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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG číslo: "
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ číslo: "
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ Jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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ů."
+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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, 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 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný jazyk nastavením volby speller_language."
+msgstr ""
+"Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
+"jazyk nastavením volby speller_language."
+
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Nezabezpečené Spojení"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
+"PyOpenSSL. Jste si jisti, že to chcete udělat?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ano, chci se připojit nezabezpečeně"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Příště _nezobrazovat"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Nesprávné uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Tohle není diskuze"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Neplatný účtu"
 
-#: ../src/dialogs.py:2326
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2599
+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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 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:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
-msgstr "Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
+msgstr ""
+"Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, 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:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt se přihlásil"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nová zpráva"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nová soukromá zpráva"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Skupinová pozvánka"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt změnil stav"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Konzole"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "přidat"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "upravit"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "odebrat"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, 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> by chtěl(a), aby jste </b>%(action)s</b> některé kontakty z vašeho rosteru."
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Přidat"
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> by chtěl(a), aby jste </b>%(action)s</b> některé kontakty z "
+"vašeho rosteru."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Upravit"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Skupiny"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
-#, python-format
-msgid "Added  %s contacts"
-msgstr "Přidáno %s kontaktů"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Přidáno %s kontaktů"
+msgstr[1] "Přidáno %s kontaktů"
+msgstr[2] "Přidáno %s kontaktů"
 
-#: ../src/dialogs.py:3393
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "Odstraněno %s kontaktů"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Odstraněno %s kontaktů"
+msgstr[1] "Odstraněno %s kontaktů"
+msgstr[2] "Odstraněno %s kontaktů"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Neplatné jméno serveru"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Služba vrátila chybu."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Podmínka"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "když jsem "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7150,559 +8213,664 @@ msgstr ""
 "\n"
 "Krátký Autentizační řetězec pro toto sezení je: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Už jste prověřoval identitu tohoto kontaktu."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu ověřena"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Ověřit znovu"
 
-#: ../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 "Chcete-li mít jistotu, že <b>pouze</b> důvěryhodné osoby mohou číst vaše zprávy nebo vám poslat zprávu, je potřeba ověřit jejich identitu kliknutí na tlačítko dole."
+#: ../src/dialogs.py:5133
+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 ""
+"Chcete-li mít jistotu, že <b>pouze</b> důvěryhodné osoby mohou číst vaše "
+"zprávy nebo vám poslat zprávu, je potřeba ověřit jejich identitu kliknutí na "
+"tlačítko dole."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NENÍ ověřena"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Ověřit..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Ověřil(a) jste identitu kontaktu?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, 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 ""
-"Pro zabránění man-in-the-middle útoku, si promluvte přímo s <b>%(jid)s</b> (například osobně nebo po telefonu) a ověřte zda vidí stejný Krátký Autentizační řetězec (SAS) jako vy.\n"
+"Pro zabránění man-in-the-middle útoku, si promluvte přímo s <b>%(jid)s</b> "
+"(například osobně nebo po telefonu) a ověřte zda vidí stejný Krátký "
+"Autentizační řetězec (SAS) jako vy.\n"
 "Krátký Autentizační řetězec: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 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:5273
+#: ../src/dialogs.py:5189
 #, 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: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:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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: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 "Tomuto kontaktu je přiřazen GPG klíč, ale <b>Vy nedůvěřujete jeho klíči</b>, proto zpráva <b>nemůže</b> být zašifrovaná. Použijte Váš GPG klient pro nastavení důvěry."
+#: ../src/dialogs.py:5202
+#, fuzzy
+msgid ""
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
+msgstr ""
+"Tomuto kontaktu je přiřazen GPG klíč, ale <b>Vy nedůvěřujete jeho klíči</b>, "
+"proto zpráva <b>nemůže</b> být zašifrovaná. Použijte Váš GPG klient pro "
+"nastavení důvěry."
 
-#: ../src/dialogs.py:5292
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "Tento kontakt má přiřazen GPG klíč a tomuto klíči důvěřujete, zprávy tedy budou šifrované."
+#: ../src/dialogs.py:5208
+#, fuzzy
+msgid ""
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
+msgstr ""
+"Tento kontakt má přiřazen GPG klíč a tomuto klíči důvěřujete, zprávy tedy "
+"budou šifrované."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "audio a video"
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "audio"
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "video"
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, 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 chce zahájit %(type) sezení. Chcete na volání odpovědět?"
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "pro účet %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Sám sebou podepsaný certifikát"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Ostatní"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../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 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a opakujte znovu."
+#: ../src/disco.py:762
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
+"opakujte znovu."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Neplatné jméno serveru"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 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:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "Spustit _příkaz..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skenuji %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, 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:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Uzel"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Validace SSL certifikátu"
 
-#: ../src/features_window.py:50
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Knihovna se používá k ověření certifikátu serveru pro zabezpečené spojení."
+#: ../src/features_window.py:51
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Knihovna se používá k ověření certifikátu serveru pro zabezpečené spojení."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Je potřeba python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Serverless automaticky komunikuje s klienty detekovanými v místní síti."
+msgstr ""
+"Serverless automaticky komunikuje s klienty detekovanými v místní síti."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Je potřeba python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Je potřeba pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Příkazový řádek"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Skript, který ovládá Gajim z příkazové řádky."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Je potřeba 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Vlastnost není k dispozici pod Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Šifrování zpráv OpenGPG "
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Šifruji zprávy gpg klíči."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Je potřeba gpg a python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Správce sítě (network-manager)"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Autodetekce stavu sítě."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Je potřeba gnome-network-manager a python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Správa Sezení"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Sezení Gajimu je uloženo při odhlášení a znovu načteno při přihlášení."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Je potřeba python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Šifrování hesla"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Heslo může být bezpečně uloženo."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Je potřeba gnome-keyring a python-gnome2-desktop, nebo kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Schopnost připojit se na servery používající SRV záznamy."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Je potřeba dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Je potřeba nslookup pro použití SRV záznamů."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Kontrola Pravopisu"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Kontrola Pravopisu psaných zpráv."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Vyžaduje libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Vyžaduje libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Upozornění"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Pasivní okna oznamující nové události."
 
-#: ../src/features_window.py:87
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
-msgstr " Je potřeba python-notify nebo python-dbus ve spojení s notification-daemon."
+#: ../src/features_window.py:88
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+" Je potřeba python-notify nebo python-dbus ve spojení s notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatický stav"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Funkce pro měření času nečinnosti pro nastavení automatického stavu."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Vyžaduje knihovnu libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Je potřeba python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-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 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 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í."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "End to End šifrování zpráv"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Šifruji zprávy."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Je potřeba python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST Generátor"
 
-#: ../src/features_window.py:102
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Generuje XHTML výstup pro RST kód (viz.: http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+#: ../src/features_window.py:99
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Generuje XHTML výstup pro RST kód (viz.: http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Je potřeba python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Schopnost zahájit audio a video rozhovor."
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "Je potřeba python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "Je potřeba python-gnome2."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Je potřeba python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Připojen"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Vlastnost"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Soubor"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Průběh"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Přenos soubor dokončen"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Přenos souboru zrušen"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Spojení s protistranou se nepodařilo navázat."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Příjemce: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Přenos souboru zastaven"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Soubor: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Typ: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Popis: %s"
-
-# #: ../src/filetransfers_window.py:309
-# #, python-format
-# msgid "Description: %s"
-# msgstr "Popis: %s"
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s Vám chce poslat soubor:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
+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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáš oprávnění k vytváření souborů v tomto adresáři."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Soubor: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Typ: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Popis: %s"
+
+# #: ../src/filetransfers_window.py:309
+# #, python-format
+# msgid "Description: %s"
+# msgstr "Popis: %s"
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s Vám chce poslat soubor:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Odesílám profil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Chyba přenosu souboru"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7710,79 +8878,119 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Soubor: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "zpráva"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Smajlíky:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "_Zobrazit událost v rosteru"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor rozšířeného nastavení"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Nastavení místnosti"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vyžaduje k běhu X server. Končím..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "import PyGTK selhal: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim vyžaduje PyGTK 2.12 nebo novější"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim vyžaduje PyGTK 2.12 nebo novější. Končím..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim potřebuje GTK 2.12 nebo novější"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim vyžaduje GTK 2.12 nebo novější. Končím..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim potřebuje k běhu pywin32"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Prosím ujistěte se, že Pywin32 je nainstalován na vašem počítači. Můžete jej získat na %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Prosím ujistěte se, že Pywin32 je nainstalován na vašem počítači. Můžete jej "
+"získat na %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim již běží"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7790,295 +8998,391 @@ msgstr ""
 "Jiná instance Gajimu pravděpodobně již běží\n"
 "Přesto spustit?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Zobrazí nápovědu pro konkrétní příkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "příkaz"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: ../src/gajim-remote-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 "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
-#: ../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"
+#: ../src/gajim-remote.py:94
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
+"samostatném řádku"
+
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "účet"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Změní stav účtu nebo účtů"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "stav"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
+msgid ""
+"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:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "zpráva"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "text stavu"
 
-#: ../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 "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:112
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"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:118
+msgid "Changes the priority of account or accounts"
+msgstr "Změní prioritu jednoho nebo více účtů"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priorita"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "priorita vámi přidělená účtu"
+
+#: ../src/gajim-remote.py:122
+#, 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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-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 "Poslat nový rozhovor kontaktu v Seznamu. Obojí OpenPGP klíč a účet jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte prostě 'OpenPGP key' na ''."
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "obsah zprávy. Účet musí být uveden, nebo prázdné \"\""
 
-#: ../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.py:140
+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 ""
+"Poslat nový rozhovor kontaktu v Seznamu. Obojí OpenPGP klíč a účet jsou "
+"volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
+"prostě 'OpenPGP key' na ''."
+
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-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 "Poslat novou prostou zprávu kontaktu v Seznamu. Obojí OpenPGP klíč a účet jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte prostě 'OpenPGP key' na ''."
+#: ../src/gajim-remote.py:153
+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 ""
+"Poslat novou prostou zprávu kontaktu v Seznamu. Obojí OpenPGP klíč a účet "
+"jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', "
+"nastavte prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "předmět"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "předmět zprávy"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 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-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "klíč"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Přidat kontakt do Seznamu"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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)"
+#: ../src/gajim-remote.py:243
+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
+#: ../src/gajim-remote.py:250
 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
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otevře dialog 'Začít rozhovor'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Začít rozhovor z tohoto účtu"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Poslat vlastní XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 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.py:263
+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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Změnit stav"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Přezdívka kterou chete použít"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for 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.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI k obsluze"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Účet s kterým chcete manipulovat"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Obsah zprávy"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "_Vstoupit do místnosti MUC"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "místnost"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "JID Místnosti"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "přezdívka"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Přezdívka kterou chete použít"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "heslo"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Heslo pro vstup do místnosti"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Účet z kterého chcete vstoupit do místnosti"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Zobrazí nebo skryje okno ipythonu"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8087,146 +9391,44 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Použití: %s %s %s \n"
-"\t %s"
+"Použití: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Nesprávné 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 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
-
-#: ../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: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:242
-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.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Změnit stav"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Přezdívka kterou chete použít"
-
-#: ../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 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání ze všech účtů"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI k obsluze"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Účet s kterým chcete manipulovat"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Obsah zprávy"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "JID Místnosti"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Přezdívka kterou chete použít"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Heslo pro vstup do místnosti"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Účet z kterého chcete vstoupit do místnosti"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Použití: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8235,7 +9437,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8244,10 +9446,14 @@ msgstr ""
 "Parametr \"%(arg)s\" nebyl uveden. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Nesprávné uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Téma"
@@ -8270,178 +9476,215 @@ msgid "You cannot delete your current theme"
 msgstr "Nemůžete smazat právě používané téma"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s nastavil předmět na %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Místnost nyní zobrazuje nedostupné členy"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "místnost nyní nezobrazuje nedostupné členy"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Zaznamenávání historie je zapnuto"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Zaznamenávání historie je vypnuto"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Místnost není anonymní"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Místnost je částečně anonymní"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Místnost je plně anonymní"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
-#. do not print 'banned by None'
 # FIXME: preklad pro ban? zabanovani je hnusne
-#: ../src/groupchat_control.py:1309
+#. do not print 'banned by None'
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:2126
+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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8449,22 +9692,22 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -8475,7 +9718,9 @@ msgid "A programming error has been detected"
 msgstr "Byla objevena chyba v programu"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
 msgstr "Pravděpodobně není fatální, ale přesto by měla být ohlášena vývojářům."
 
 #: ../src/gtkexcepthook.py:54
@@ -8486,157 +9731,148 @@ msgstr "_Ohlásit chybu"
 msgid "Details"
 msgstr "Detaily"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim není výchozí Jabber klient"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete nastavit Gajim jako výchozí Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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?"
+msgstr ""
+"Obrázek nelze uložit ve formátu %(type)s. Uložit jako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, 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 ""
-"Tebou požadované přezdívka se již používá v diskuzi %s nebo je zaregistrována někým jiným.\n"
+"Tebou požadované přezdívka se již používá v diskuzi %s nebo je "
+"zaregistrována někým jiným.\n"
 "Níže vyber jinou přezdívku:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 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:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> 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."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Máš zakázán přístup do diskuze %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8644,88 +9880,96 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Autorizace zrušena"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Místnost nyní zobrazuje nedostupné členy"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "místnost nyní nezobrazuje nedostupné členy"
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr "Zaznamenávání historie je zapnuto"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Zaznamenávání historie je vypnuto"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Místnost není anonymní"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Místnost je částečně anonymní"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Místnost je plně anonymní"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../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 "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:658
+#, fuzzy
+msgid ""
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
+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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 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:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Heslo OpenGPG není platné"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Platnost certifikátu vypršela"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG klíč není důvěryhodný"
 
-#: ../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 klíč použitý k šifrování rozhovoru není důvěryhodný. Opravdu chcete šifrovat tuto zprávu?"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid ""
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
+msgstr ""
+"GPG klíč použitý k šifrování rozhovoru není důvěryhodný. Opravdu chcete "
+"šifrovat tuto zprávu?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí není asi správně nastavena)"
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+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:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail pro %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8733,7 +9977,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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -8748,346 +9992,367 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../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:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Chyba při čtení souboru"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Přenos souboru dokončen"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Nepodařilo se dešifrovat zprávu od %s\n"
-"Možná je falešná."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Nepodařilo se dešifrovat zprávu"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Chyba."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: ../src/gui_interface.py:1557
-msgid "You are already connected to this account with the same resource. Please type a new one"
+#: ../src/gui_interface.py:1192
+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:1604
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce zahájit hlasový rozhovor. "
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Žádost o hlasový rozhovor"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, 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 ""
 "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:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Chyba SSL certifikátu"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, 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 ""
-"Vypadá to, že se SSL certifikát účtu %(account)s změnil nebo někdo hackuje vaše spojení.\n"
+"Vypadá to, že se SSL certifikát účtu %(account)s změnil nebo někdo hackuje "
+"vaše spojení.\n"
 "Starý otisk: %(old)s\n"
 "Nový otisk: %(new)s\n"
 "\n"
 "Chcete se stále připojit a aktualizovat otisk certifikátu?"
 
-#: ../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:1777
-#, fuzzy
-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 "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: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: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 "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:1447
+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 ""
+"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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
-msgid "You are about to send your password unencrypted on an insecure connection. Are you sure you want to do that?"
-msgstr "Chystáte se poslat vaše heslo nezabezpečeným spojením. Jste si jistý(á), že to skutečně chcete udělat?"
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Chystáte se poslat vaše heslo nezabezpečeným spojením. Jste si jistý(á), že "
+"to skutečně chcete udělat?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/gui_interface.py:2423
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci vypnuty "
+#: ../src/gui_interface.py:1996
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
+"vypnuty "
 
-#: ../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 "Vámi nastavené téma smajlíků se nepodařilo načíst. Možná je potřeba aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/Emoticons "
+#: ../src/gui_interface.py:2019
+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 ""
+"Vámi nastavené téma smajlíků se nepodařilo načíst. Možná je potřeba "
+"aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/"
+"Emoticons "
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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
-# FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
-#: ../src/gui_interface.py:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG klíč vypršel"
 
-#: ../src/gui_interface.py:3427
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Nová diskuze"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "vytvářím adresář %s "
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakty"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Zpráva"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 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 RUNNING)"
+#: ../src/history_manager.py:262
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr "Chcete pročistit databázi? (VELICE NEDOPORUČUJEME POKUD GAJIM BĚŽÍ)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 ""
-"Běžně se velikost alokovaná databází neuvolňuje, pouze se označí k novému použití. Pokud opravdu chcete snížit velikost databáze, klikněte ANO, jinak NE.\n"
+"Běžně se velikost alokovaná databází neuvolňuje, pouze se označí k novému "
+"použití. Pokud opravdu chcete snížit velikost databáze, klikněte ANO, jinak "
+"NE.\n"
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Chyba Databáze"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exportuji záznamy historie..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s v %(time)s řekl(a): %(message)s\n"
 
-#: ../src/history_manager.py: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] "Vážně chcete smazat všechny záznamy historie vybraného kontaktu?"
-msgstr[1] "Vážně chcete smazat všechny záznamy historie vybraných kontaktů?"
-msgstr[2] "Vážně chcete smazat všechny záznamy historie vybraných kontaktů?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Vážně chcete smazat vybranou zprávu?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Vážně chcete smazat všechny záznamy historie vybraného kontaktu?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Zrušit ověření"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybrané zprávy?"
 msgstr[2] "Vážně chcete smazat vybrané zprávy?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Nezdařilo se načtení obrázku"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programuji"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Obrázek je příliš veliký"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Chystáte se zavřít několik panelů"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Opravdu je chcete všechny zavřít?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Zprávy"
 
@@ -9099,289 +10364,338 @@ msgstr "- zprávy budou zaznamenány"
 msgid "- messages will not be logged"
 msgstr "- zprvý nebudou zaznamenány"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Změnil(a) stav"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignorovat"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s se přihlásil"
+#: ../src/plugins/gui.py:82
+#, fuzzy
+msgid "Plugin"
+msgstr "P_luginy"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s se odhlásil"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Zakazuji %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nová jednoduché zpráva od %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registrace selhala"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nová soukromá zpráva z místnosti %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Služba odeslala chybné data"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nová zpráva od %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Tento soubor už existuje"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nová zpráva od %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorovat"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Nastavení místnosti"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Soubor je prázdný"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informace o kontaktu"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formát: RRRR-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informace přijata"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Odesílám profil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informace NEBYLY zveřejněny"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../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/profile_window.py:412
+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:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, 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:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../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 "Změna vašeho stavu na neviditelný způsobí odpojení od těchto diskuzí. Jste si jistý(á), že se chcete stát neviditelným(ou)?"
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Změna vašeho stavu na neviditelný způsobí odpojení od těchto diskuzí. Jste "
+"si jistý(á), že se chcete stát neviditelným(ou)?"
 
 # FIXME: mozna nejak lepe? :/
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Opravdu ukončit Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Opravdu chcete ukončit Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Vždy zavřít Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Zrušit přenos souboru"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 #, fuzzy
-msgid "If you quit now, the file(s) being transferred will be stopped. Do you still want to quit?"
-msgstr "Pokud chcete teď odejít, veškeré právě probíhající přenosy budou zastaveny. Opravdu chcete odejít?"
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+"Pokud chcete teď odejít, veškeré právě probíhající přenosy budou zastaveny. "
+"Opravdu chcete odejít?"
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../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 "Zprávy bude možné číst později, pokud máte povolený záznam historie a kontakt je v rosteru."
+#: ../src/roster_window.py:2552
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+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:2720
+#: ../src/roster_window.py:2989
 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:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:2724
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto transportu."
+#: ../src/roster_window.py:2993
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
+"transportu."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "Už více nebudete moci posílat ani přijímat zprávy od kontaktů z těchto transportů:%s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+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:2800
+#: ../src/roster_window.py:3043
 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:2802
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Tento kontakt vás uvidí jako odpojeného a nebudete dostávat zprávy, které vám pošle."
+#: ../src/roster_window.py:3045
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"Tento kontakt vás uvidí jako odpojeného a nebudete dostávat zprávy, které "
+"vám pošle."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, 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:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako odpojeného."
+#: ../src/roster_window.py:3642
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
+"odpojeného."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: ../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 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako odpojeného."
+#: ../src/roster_window.py:3652
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
+"odpojeného."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9390,45 +10704,63 @@ 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:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
-msgid "You are about to send a custom status. Are you sure you want  to continue?"
+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:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, 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 "Tento kontakt váš dočasně uvidí jako %(status)s, ale pouze do první změny vašeho stavu. Poté uvidí váš globální stav."
+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 ""
+"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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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."
+msgstr ""
+"Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../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 "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při přístím připojení uloženy."
+#: ../src/roster_window.py:4458
+#, fuzzy
+msgid ""
+"Your server does not support storing metacontacts information. So this "
+"information will not be saved on next reconnection."
+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:4189
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4550
+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: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 "Metakontakty jsou způsob k organizaci několika kontaktů do jednoho. Obecně jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v transportech."
+#: ../src/roster_window.py:4552
+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 ""
+"Metakontakty jsou způsob k organizaci několika kontaktů do jednoho. Obecně "
+"jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
+"transportech."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9436,12 +10768,17 @@ 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Odeslat %s %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Udělej %s a %s metakontaktem"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Udělej %s a %s metakontaktem"
@@ -9451,131 +10788,131 @@ msgstr "Udělej %s a %s metakontaktem"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat _záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "_Nastavit služby..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Provést příkaz..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "Transporty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Znovu připojit"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 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:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
@@ -9593,24 +10930,14 @@ msgstr "Chyba v příchozím datagramu"
 msgid "No result"
 msgstr "Žádný výsledek"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Chyba zápisu na disk"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Předmět: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Potvrdit volby pro toto sezení"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9622,7 +10949,7 @@ msgstr ""
 "\n"
 "\tJsou tyto volby přijatelné?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9637,147 +10964,152 @@ msgstr ""
 "\n"
 "Pokračovat v komunikaci?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Je OpenPGP povoleno pro tento kontakt?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _rosteru"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s této diskuze"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr "[blokováno]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr "[minimalizováno]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslední stav: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Spojeno"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Odpojenol"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Nálada:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Činnost:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Hudba:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Upozornění"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Nahrát"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pozastaveno"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9785,60 +11117,453 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Time:Neznámý"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah</b>"
 
-#: ../src/vcard.py:357
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+#: ../src/vcard.py:408
+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:359
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:410
+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:361
+#: ../src/vcard.py:412
 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:363
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+#: ../src/vcard.py:414
+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:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Vyber soubor k odeslání..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "okno/žáložka otevřená s tímto kontaktem"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Akce</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Podmínky</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Pokročilé akce"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Pokročilá správa upozorňování"
+
+#~ msgid "All statuses"
+#~ msgstr "Všechny stavy"
+
+#~ msgid "Busy "
+#~ msgstr "Nerušit"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt změnil stav"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt se odpojil"
+
+#~ msgid "Don't have "
+#~ msgstr "Nemá"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Přenos souboru zahájen"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Zvýraznění zprávy v diskuzi"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Přijetí zprávy v diskuzi"
+
+#~ msgid "Have "
+#~ msgstr "Má"
+
+#~ msgid "Launch a command"
+#~ msgstr "Provést příkaz"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Jeden nebo více zvláštních stavů..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Připojen / Ukecaný"
+
+#~ msgid "Play a sound"
+#~ msgstr "Přehrát zvuk"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nová soukromá zpráva"
+
+#~ msgid "When "
+#~ msgstr "Když"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktivuj UrgencyHint window manageru pro blikání okna rozhovoru v liště "
+#~ "úloh"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Vypnout automatické otevírání okna rozhovoru"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Vypnout vyskakování existujících oken"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Vypnout existující zvuky pro tuto událost"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Vypnout zobrazování události v rosteru"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Vypnout zobrazování události v rosteru"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Upozorni mě vyskočením okna"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Otevři okno rozhovoru s uživatelem"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Zobrazit událost v rosteru"
+
+#~ msgid "and I "
+#~ msgstr "a já"
+
+#~ msgid "contact(s)"
+#~ msgstr "kontakt(y)"
+
+#~ msgid "everybody"
+#~ msgstr "každý"
+
+#~ msgid "for "
+#~ msgstr "pro"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Skupiny"
+
+#~ msgid "when I'm in"
+#~ msgstr "když jsem v "
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Zobrazit profil kontaktu (Ctrl+I)"
+
+#, fuzzy
+#~ msgid "label"
+#~ msgstr "označit"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Dovol kontaktu vidět můj stav"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Popis:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Rozšířené..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Zobrazovat čin_nosti kontaktů v seznamu"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Zobrazovat _hudbu kontaktů v seznamu"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Zobrazovat _nálady kontaktů v seznamu"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a "
+#~ "v diskuzích"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Odeslat jednoduchou _zprávu..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "Angličtina"
+
+#~ msgid "Belarusian"
+#~ msgstr "Běloruština"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulharština"
+
+#~ msgid "Breton"
+#~ msgstr "Bretonština"
+
+#~ msgid "Czech"
+#~ msgstr "Čeština"
+
+#~ msgid "German"
+#~ msgstr "Němčina"
+
+#~ msgid "Greek"
+#~ msgstr "Řečtina"
+
+#~ msgid "British"
+#~ msgstr "Britština"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Španělština"
+
+#~ msgid "Basque"
+#~ msgstr "Baskičtina"
+
+#~ msgid "French"
+#~ msgstr "Francouzština"
+
+#~ msgid "Croatian"
+#~ msgstr "Chorvatština"
+
+#~ msgid "Italian"
+#~ msgstr "Italština"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norština (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandština"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norština"
+
+#~ msgid "Polish"
+#~ msgstr "Polština"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugalština"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazilská portugalština"
+
+#~ msgid "Russian"
+#~ msgstr "Ruština"
+
+#~ msgid "Serbian"
+#~ msgstr "Srbština"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovenština"
+
+#~ msgid "Swedish"
+#~ msgstr "Švédština"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Čínština"
+
+#~ msgid "Spelling language"
+#~ msgstr "Kontrola jazyka"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Je-li povoleno, Gajim převede řetězec mezi $$ a $$ na obrázek pomocí "
+#~ "dvips a převede před vložením do okna rozhovoru."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Změnou hodnoty změníte velikost zobrazovaných formulí latexu. Vyšší "
+#~ "znamená větší."
+
+#~ msgid "all or space separated status"
+#~ msgstr "všechny nebo mezerou oddělené stavy"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', nebo 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' nebo ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Ověřte připojení nebo zkuste později"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "chyba při spouštění \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "chyba: nemůžu otevřít %s pro čtení"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Nemohu naslouchat na portu %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Možná máš puštěnou jinou instanci Gajimu. Přenos souborů bude zrušen."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ Jabber client"
+
+#~ msgid "Condition"
+#~ msgstr "Podmínka"
+
+#~ msgid "when I am "
+#~ msgstr "když jsem "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Je potřeba pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Je potřeba gpg a python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Převede LaTeX výraz mezi $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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í."
+
+#, 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 ""
+#~ "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í."
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Je potřeba python-farsight."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, "
+#~ "neviditelný "
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Použití: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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í"
+
+#, fuzzy
+#~ 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í"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakty"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Chyba zápisu na disk"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Předmět: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Nálada:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Činnost:"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Vypnout zobrazování události vy systrayi"
 
@@ -9860,32 +11585,24 @@ msgstr "zdroj s prioritou "
 #~ 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 "we are now subscribed to %s"
 #~ msgstr "jsme nyní zapsáni k %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"
 
-#~ 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 "Zaškrtněte pokud se má Gajim připojit na port 5223, kde obvykle nabízejí starší servery SSL. Pozor- Gajim použije TLS šifrování standardně, pokud server ohlásí jeho podporu. Touto volbou bude TLS vypnuto"
+#~ 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 ""
+#~ "Zaškrtněte pokud se má Gajim připojit na port 5223, kde obvykle nabízejí "
+#~ "starší servery SSL. Pozor- Gajim použije TLS šifrování standardně, pokud "
+#~ "server ohlásí jeho podporu. Touto volbou bude TLS vypnuto"
 
 #~ msgid "Edit Personal Information..."
 #~ msgstr "Upravit osobní informace..."
@@ -9893,8 +11610,12 @@ msgstr "zdroj s prioritou "
 #~ msgid "Hostname: "
 #~ msgstr "Počítač: "
 
-#~ msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-#~ msgstr "Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení pouze pro Vás"
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení "
+#~ "pouze pro Vás"
 
 #~ msgid "Port: "
 #~ msgstr "Port: "
@@ -9971,9 +11692,6 @@ msgstr "zdroj s prioritou "
 #~ "Historie diskuzí\n"
 #~ "Historie všech rozhovorů"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Spravovat účty"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10051,13 +11769,16 @@ msgstr "zdroj s prioritou "
 #~ msgstr "Neplatná místní adresa? :-O"
 
 #~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-#~ msgstr "Závislost na pysqlite2 (neboli python-pysqlite2) není splněna. Končím..."
+#~ msgstr ""
+#~ "Závislost na pysqlite2 (neboli python-pysqlite2) není splněna. Končím..."
 
 #~ msgid "Banners and clickable links"
 #~ msgstr "Bannery a klikatelné odkazy"
 
 #~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
-#~ msgstr "Funkce umožňující mít klikatelné URL odkazy v rozhovoru a předmětu diskuze."
+#~ msgstr ""
+#~ "Funkce umožňující mít klikatelné URL odkazy v rozhovoru a předmětu "
+#~ "diskuze."
 
 #~ msgid "Requires python-sexy."
 #~ msgstr "Je potřeba python-sexy."
@@ -10065,11 +11786,17 @@ msgstr "zdroj s prioritou "
 #~ msgid "GTK+ runtime is missing libglade support"
 #~ msgstr "GTK+ runtime vyžaduje podporu libglade"
 
-#~ msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-#~ msgstr "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní verzi z %s"
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední "
+#~ "stabilní verzi z %s"
 
-#~ msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-#~ msgstr "Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
 
 #~ msgid "Gajim needs PySQLite2 to run"
 #~ msgstr "Gajim vyžaduje PySQLite2"
@@ -10083,17 +11810,27 @@ msgstr "zdroj s prioritou "
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-close"
 
-#~ msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
-#~ msgstr "Host %s nastevený jako ft_add_hosts_to_send má rozšířenou volbu chybnou, bude ignorována."
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Host %s nastevený jako ft_add_hosts_to_send má rozšířenou volbu chybnou, "
+#~ "bude ignorována."
 
 #~ msgid "OpenPGP passphrase was not given"
 #~ msgstr "OpenPGP heslo nebylo zadáno"
 
-#~ msgid "To continue sending and receiving messages, you will need to reconnect."
-#~ msgstr "Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
 
-#~ msgid "You are not connected or not visible to others. Your message could not be sent."
-#~ msgstr "Nejsi připojen nebo viditelný pro ostatní. Tvoje zpráva nemůže být odeslána."
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Nejsi připojen nebo viditelný pro ostatní. Tvoje zpráva nemůže být "
+#~ "odeslána."
 
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Tato zpráva je zašifrovaná]"
@@ -10107,8 +11844,12 @@ msgstr "zdroj s prioritou "
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ikona v systémové liště zobrazující aktuální stav."
 
-#~ msgid "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-#~ msgstr "Je potřeba python-gnome2-extras nebo zkompilovaný trayicon modul ze zdrojáků Gajima."
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Je potřeba python-gnome2-extras nebo zkompilovaný trayicon modul ze "
+#~ "zdrojáků Gajima."
 
 #~ msgid "Requires PyGTK >= 2.10."
 #~ msgstr "Je potřeba PyGTK verze 2.10. nebo vyšší."
@@ -10119,26 +11860,15 @@ msgstr "zdroj s prioritou "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Přiřadit Open_PGP klíč"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Příkaz není podporován pro zeroconf účet."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Příkazy: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Použití: /%s, smaže zprávy v okně."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Použití: /%s, skryje tlačítka rozhovoru."
-
-#~ msgid "Usage: /%(command)s <action>, sends action to the current group chat. Use third person. (e.g. /%(command)s explodes.)"
-#~ msgstr "Použití: /%(command)s <akce>, pošle akci do aktuální místnosti. Použijte třetí osobu (například /%(command)s explodoval.)"
-
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Použití: /%s, pošle ping kontaktu"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Použití: /%s, pošle zprávu kontaktu"
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Použití: /%(command)s <akce>, pošle akci do aktuální místnosti. Použijte "
+#~ "třetí osobu (například /%(command)s explodoval.)"
 
 #~ msgid "No help info for /%s"
 #~ msgstr "Žádná další nápověda pro /%s"
@@ -10155,51 +11885,70 @@ msgstr "zdroj s prioritou "
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
-#~ msgid "Nickname not found"
-#~ msgstr "Přezdívka nenalezena: %s"
-
-#~ 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 "Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
-
-#~ msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-#~ msgstr "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému nájemníkovi."
+#~ 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 ""
+#~ "Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. "
+#~ "Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je "
+#~ "JID právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
 
-#~ msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-#~ msgstr "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud byl uveden."
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, "
+#~ "pokud byl uveden."
 
-#~ msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-#~ msgstr "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným důvodem."
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s "
+#~ "uvedeným důvodem."
 
-#~ msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-#~ msgstr "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti místnost@server, případně s uvedenou přezdívkou."
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
+#~ "místnost@server, případně s uvedenou přezdívkou."
 
-#~ msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason."
-#~ msgstr "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou "
+#~ "z místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
 
-#~ msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-#~ msgstr "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle zprávu nájemníkovi určeném přezdívkou."
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a "
+#~ "odešle zprávu nájemníkovi určeném přezdívkou."
 
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
-
-#~ msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-#~ msgstr "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#~ msgid "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
 #~ msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
 
-#~ msgid "Usage: /%s <nickname>, allow <nickname> to send you messages and private messages."
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
 #~ msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH Port:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Zobrazit _Seznam"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Vybrat účet pro synchronizaci"
 
@@ -10232,7 +11981,8 @@ msgstr "zdroj s prioritou "
 #~ msgstr "Činnost"
 
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-#~ msgstr "Klikněte pro seznam vlastností (jako MSN, ICQ transporty) jabber serverů"
+#~ msgstr ""
+#~ "Klikněte pro seznam vlastností (jako MSN, ICQ transporty) jabber serverů"
 
 #~ msgid "Servers Features"
 #~ msgstr "Vlastnosti serveru"
@@ -10248,20 +11998,16 @@ msgstr "zdroj s prioritou "
 
 #~ msgid ""
 #~ "Choose the chatlog you want to view. \n"
-#~ "Enter the jid of a groupchat or a contact here. For online accounts you can even enter a a contact's nickname."
+#~ "Enter the jid of a groupchat or a contact here. For online accounts you "
+#~ "can even enter a a contact's nickname."
 #~ msgstr ""
 #~ "Vyber záznam rozhovoru pro zobrazení.\n"
-#~ "Zadej jid diskuze nebo kontaktu. Pro připojené účty můžeš zadat také přezdívku kontaktu."
+#~ "Zadej jid diskuze nebo kontaktu. Pro připojené účty můžeš zadat také "
+#~ "přezdívku kontaktu."
 
 #~ msgid "in"
 #~ msgstr "v"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Kliknutím zobraz staré rozhovory s tímto kontaktem"
-
-#~ msgid "Accept"
-#~ msgstr "Přijmi"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Přišlo pozvání"
 
@@ -10274,8 +12020,12 @@ msgstr "zdroj s prioritou "
 #~ msgid "Allow others to see your:"
 #~ msgstr "Povol ostatním vidět tvůj:"
 
-#~ msgid "If checked, Gajim will sort contacts in roster window and groupcahts by their status and not by the shown name"
-#~ msgstr "Pokud zaškrtnuto, Gajim bude řadit kontakty v okně rosteru podle stavu, nikoliv zobrazeného jména"
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupcahts by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "Pokud zaškrtnuto, Gajim bude řadit kontakty v okně rosteru podle stavu, "
+#~ "nikoliv zobrazeného jména"
 
 #~ msgid "Receive your contact's:"
 #~ msgstr "Přijmi tvé kontakty:"
@@ -10295,9 +12045,6 @@ msgstr "zdroj s prioritou "
 #~ msgid "Company:"
 #~ msgstr "Společnost:"
 
-#~ msgid "Country:"
-#~ msgstr "Země:"
-
 #~ msgid "Family:"
 #~ msgstr "Příjmení:"
 
@@ -10427,8 +12174,12 @@ msgstr "zdroj s prioritou "
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
-#~ msgid "Requires python-gnome2-extras or compilation of gtkspell module from Gajim sources."
-#~ msgstr "Je potřeba python-gnome2-extras nebo zkompilovaný gtkspell modul ze zdrojáků Gajima."
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Je potřeba python-gnome2-extras nebo zkompilovaný gtkspell modul ze "
+#~ "zdrojáků Gajima."
 
 #~ msgid "Idle"
 #~ msgstr "Nečinný"
@@ -10436,8 +12187,12 @@ msgstr "zdroj s prioritou "
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Je potřeba zkompilovat idle modul ze zdrojáků Gajima."
 
-#~ msgid "Requires texlive-latex-base, dvips and imagemagick. You have to set 'use_latex' to True in the Advanced Configuration Editor."
-#~ msgstr "Vyžaduje texlive-latex-base, dvips a imagemagick. Dále musíte nastavit 'use_latex' na True v Editoru rozšířeného nastavení."
+#~ msgid ""
+#~ "Requires texlive-latex-base, dvips and imagemagick. You have to set "
+#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ msgstr ""
+#~ "Vyžaduje texlive-latex-base, dvips a imagemagick. Dále musíte nastavit "
+#~ "'use_latex' na True v Editoru rozšířeného nastavení."
 
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
@@ -10465,10 +12220,15 @@ msgstr "zdroj s prioritou "
 #~ msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
 
 #~ 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)"
+#~ msgstr ""
+#~ "Neexistující příkaz: /%s (chceš-li poslat tohle, napiš před to /say)"
 
-#~ msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-#~ msgstr "Použití: /%s <akce>, pošle akci do aktuální místnosti. Použijte třetí osobu (například /%s explodoval.)"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Použití: /%s <akce>, pošle akci do aktuální místnosti. Použijte třetí "
+#~ "osobu (například /%s explodoval.)"
 
 #~ msgid "E2E encryption enabled"
 #~ msgstr "E2E šifrování zapnuto"
@@ -10477,14 +12237,20 @@ msgstr "zdroj s prioritou "
 #~ msgstr "Pokračovat s dohadováním?"
 
 #~ msgid ""
-#~ "You've begun an encrypted session with %s, but it can't be guaranteed that you're talking directly to the person you think you are.\n"
+#~ "You've begun an encrypted session with %s, but it can't be guaranteed "
+#~ "that you're talking directly to the person you think you are.\n"
 #~ "\n"
-#~ "You should speak with them directly (in person or on the phone) and confirm that their Short Authentication String is identical to this one: %s\n"
+#~ "You should speak with them directly (in person or on the phone) and "
+#~ "confirm that their Short Authentication String is identical to this one: "
+#~ "%s\n"
 #~ "\n"
 #~ "Would you like to continue with the encrypted session?"
 #~ msgstr ""
-#~ "Započal(a) jsi šifrované sezení s %s, ale nemůžu zaručit, že mluvíš přímo se zamýšleným člověkem.\n"
-#~ "Měl(a) by sis s ním promluvit přímo (tváří v tvář nebo telefonicky) a ujistit se, zda je jeho Short Authentication String identická s tímto: %s\n"
+#~ "Započal(a) jsi šifrované sezení s %s, ale nemůžu zaručit, že mluvíš přímo "
+#~ "se zamýšleným člověkem.\n"
+#~ "Měl(a) by sis s ním promluvit přímo (tváří v tvář nebo telefonicky) a "
+#~ "ujistit se, zda je jeho Short Authentication String identická s tímto: "
+#~ "%s\n"
 #~ "\n"
 #~ "Přejete si pokračovat s šifrovaném sezení?"
 
@@ -10494,7 +12260,9 @@ msgstr "zdroj s prioritou "
 #~ msgid "\"%(title)s\" by %(artist)s"
 #~ msgstr "\"%(title)s\" od %(artist)s"
 
-#~ msgid "To continue, Gajim needs to access your stored secrets. Enter your passphrase"
+#~ msgid ""
+#~ "To continue, Gajim needs to access your stored secrets. Enter your "
+#~ "passphrase"
 #~ msgstr "Pro pokračování potřebuje Gajim uložená tajemství.Zadej heslo"
 
 #~ msgid "Confirm Passphrase"
@@ -10515,14 +12283,24 @@ msgstr "zdroj s prioritou "
 #~ msgid "Affiliation:"
 #~ msgstr "Vztah:"
 
-#~ msgid "If checked, Gajim can regularly poll a Last.fm account and adjust the status message to reflect recently played songs. set_status_msg_from_current_music_track option must be False."
-#~ msgstr "Při zaškrtnutí bude Gajim pravidelně kontrolovat Last.fm účet a nastavovat stavovou zprávu podle posledních přehrávaných skladeb.Volba set_status_msg_from_current_track musí být False"
+#~ msgid ""
+#~ "If checked, Gajim can regularly poll a Last.fm account and adjust the "
+#~ "status message to reflect recently played songs. "
+#~ "set_status_msg_from_current_music_track option must be False."
+#~ msgstr ""
+#~ "Při zaškrtnutí bude Gajim pravidelně kontrolovat Last.fm účet a "
+#~ "nastavovat stavovou zprávu podle posledních přehrávaných skladeb.Volba "
+#~ "set_status_msg_from_current_track musí být False"
 
 #~ msgid "The username used to identify the Last.fm account."
 #~ msgstr "Uživatelské jméno pro Last.gm účet."
 
-#~ msgid "When negotiating an encrypted session, should Gajim prefer to use public keys for identification?"
-#~ msgstr "Pokud sestavuji šifrované sezení, má Gajim upřednostnit použití veřejných klíčů k identifikaci?"
+#~ msgid ""
+#~ "When negotiating an encrypted session, should Gajim prefer to use public "
+#~ "keys for identification?"
+#~ msgstr ""
+#~ "Pokud sestavuji šifrované sezení, má Gajim upřednostnit použití veřejných "
+#~ "klíčů k identifikaci?"
 
 #~ msgid ""
 #~ "Subject: %s\n"
@@ -10537,7 +12315,8 @@ msgstr "zdroj s prioritou "
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Spojení s počítačem se nepodařilo navázat."
 
-#~ msgid "Connection to host could not be established: Incorrect answer from server."
+#~ msgid ""
+#~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Spojení k počítači nebylo navázáno: Neplatná odpověd od serveru"
 
 #~ msgid "Encryption disabled"
diff --git a/po/da.po b/po/da.po
index 4937d9136..a37655621 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,15 +3,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-11-18 19:33+0100\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team:  <>\n"
@@ -22,307 +18,299 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Emacs 22.1.50.1, po-mode 2.02+0.4\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Personlige hændelser"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Start Samtale..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Deltag i en _Gruppe Samtale..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Tilføj Kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "Op_dag Tjenester"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Udfør Kommando..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Ændre Konto"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Åbn Gmail Indboks"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Personlige hændelser"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Start Samtale..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "_Ændre Konto"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Konto Oprettelses Guide"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Tilslutter til server</b>\n"
-"\n"
-"Vent venligst..."
+"Du behøver en konto for at tilslutte dig\n"
+"til Jabber netværket"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Jeg vil _registrere en ny konto"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vælg en af mulighederne under:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Fyld ind data for din eksisterende konto</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Vælg venligst en server<b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Adgangskode"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Gem adgangs_kode"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anonym godkendelse"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Tilslut når jeg trykke Færdig"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Konto Oprettelses Guide"
+msgid "Anon_ymous authentication"
+msgstr "Anonym godkendelse"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Vælg venligst en server<b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Pro_xy:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Håndter..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Brug tilpasset værtsnavn/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Pro_xy:"
+msgid "_Hostname:"
+msgstr "_Værtsnavn:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Gem adgangs_kode"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avanceret"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Du behøver en konto for at tilslutte dig\n"
-"til Jabber netværket"
+"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:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Avanceret"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Færdig"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Værtsnavn:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Tilslutter til server</b>\n"
+"\n"
+"Vent venligst..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Tilslut når jeg trykke Færdig"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Adgangskode"
+msgid "Set my profile when I connect"
+msgstr "Sæt min profil når jeg tilslutter"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Færdig"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Diverse</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ingen"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Kontoer"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Personlig Information</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Tilføj"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Slet"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "_Tilpas til status"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Om_døb"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Konto"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Aktiv_er"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Kontoer"
+msgid "Anonymous authentication"
+msgstr "Anonym godkendelse"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administrative handlinger"
+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 ""
+"Ressource bliver sendt til Jabber serveren for at separere den samme JID i "
+"to eller flere dele afhængig af antallet klienter som tilsluttet til den "
+"samme server med den samme konto. Det vil sige du kan være tilsluttet med "
+"denne samme konto med ressourcerne 'Hjemme' og 'Arbejde' på den samme tid. "
+"Ressourcen med den højeste prioritet vil få hændelserne. (se under)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonym godkendelse"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Tilslut automatisk hvis tilslutningen tabes"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Synkroniser kontakter"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Gennemse"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Tryk for at forespørge om autorisering for alle kontakter af en anden konto"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "T_ilslut når Gajim startes"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Ænd_re Adgangskode"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Tryk for at ændre kontoens adgangskode"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Hvis valgt vil Gajim spørge dig før din adgangskode bliver sendt over en "
-"usikker forbindelse."
+msgid "Administration operations"
+msgstr "Administrative handlinger"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Vælg en Fil at Sende..."
+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 ""
+"Prioritet er brugt i Jabber for at bestemme hvem som får hændelser fra "
+"jabber serveren når to eller flere klienter er tilsluttet med den samme "
+"konto: Klienten med den højeste prioritet får hændelserne"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Vælg _Nøgle..."
+msgid "A_djust to status"
+msgstr "_Tilpas til status"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Tryk for at ændre kontoens adgangskode"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet vil automatisk ændres ifølge din status."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Tryk for at forespørge om autorisering for alle kontakter af en anden konto"
+msgid "Priori_ty:"
+msgstr "Priori_tet:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Selvsigneret certifikat"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Tilslut _når Gajim startes"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Tilslutning"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Epost:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Fornavn:"
+msgid "Resour_ce:"
+msgstr "Ressour_ce:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Gennemse"
 
 #: ../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 ""
-"Hvis valgt vil Gajim rundsende flere IP adresser udover din egen IP adresse, "
-"filoverførsler har en større chance for at lykkes."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certifikatet afvist"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Hvis valgt vil Gajim hente adgangskoden fra en GPG agent som seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Selvsigneret certifikat"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Konto"
 
 #: ../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 ""
-"Hvis valgt vil Gajim sende hold-i-live pakker for at forhindre at "
-"tilslutningen afbrydes pga et tidsudløb"
+msgid "C_onnect on Gajim startup"
+msgstr "T_ilslut når Gajim startes"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -333,6 +321,18 @@ msgstr ""
 "til jabber med denne konto"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Tilslut automatisk hvis tilslutningen tabes"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Gem konversations _logger for alle kontakter"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synk_roniser konto status med global status"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -342,177 +342,205 @@ msgstr ""
 "(håndteret med kombinationsfeltet i bunden af kontaktvinduet) ændre status "
 "på denne konto"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Hvis den standard port der bruges til indkomne beskeder ikke passer dig "
-"eller\n"
-"din opsætning kan du vælge en anden her.\n"
-"Du bør også ændre opsætning tilsvarende på en evt. brandmur."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Brug fil transport proxy"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Efternavn:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Hvis valgt vil Gajim rundsende flere IP adresser udover din egen IP adresse, "
+"filoverførsler har en større chance for at lykkes."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Fle_t kontoer"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "General"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Ingen nøgle er valgt"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "br_ug HTTP__PROXY miljøvariablen"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Personlig Information"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "Hå_ndter..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tet:"
+msgid "_Warn before using an insecure connection"
+msgstr "Ad_var mig før jeg bruger en usikker forbindelse"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritet er brugt i Jabber for at bestemme hvem som får hændelser fra "
-"jabber serveren når to eller flere klienter er tilsluttet med den samme "
-"konto: Klienten med den højeste prioritet får hændelserne"
+"Hvis valgt vil Gajim spørge dig før din adgangskode bliver sendt over en "
+"usikker forbindelse."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritet vil automatisk ændres ifølge din status."
+msgid "Send _keep-alive packets"
+msgstr "Send hold-i-live pa_kker"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Om_døb"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Hvis valgt vil Gajim sende hold-i-live pakker for at forhindre at "
+"tilslutningen afbrydes pga et tidsudløb"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Ressour_ce:"
+msgid "Use cust_om hostname/port"
+msgstr "Brug tilpasset værtsnavn/p_ort"
 
 #: ../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 ""
-"Ressource bliver sendt til Jabber serveren for at separere den samme JID i "
-"to eller flere dele afhængig af antallet klienter som tilsluttet til den "
-"samme server med den samme konto. Det vil sige du kan være tilsluttet med "
-"denne samme konto med ressourcerne 'Hjemme' og 'Arbejde' på den samme tid. "
-"Ressourcen med den højeste prioritet vil få hændelserne. (se under)"
+msgid "_Hostname: "
+msgstr "_Værtsnavn:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Gem konversations _logger for alle kontakter"
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diverse</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Send hold-i-live pa_kker"
+msgid "Connection"
+msgstr "Tilslutning"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synk_roniser konto status med global status"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Ingen nøgle er valgt"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synk_roniser konto status med global status"
+msgid "Choose _Key..."
+msgstr "Vælg _Nøgle..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Synkroniser kontakter"
+msgid "Use G_PG Agent"
+msgstr "Brug G_PG Agenten"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Hvis valgt vil Gajim hente adgangskoden fra en GPG agent som seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Brug G_PG Agenten"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Brug tilpasset værtsnavn/p_ort"
+msgid "_Edit Personal Information..."
+msgstr "R_ediger Personlig Information..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Brug pers_onlig port:"
+msgid "Information about you, as stored in the server"
+msgstr "Information om dig, som er gemt på serveren"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Brug fil transport proxy"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Personlig Information</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Personlig Information"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "R_ediger Personlig Information..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Tilslut _når Gajim startes"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Aktiv_er"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Synk_roniser konto status med global status"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Værtsnavn:"
+msgid "Use cust_om port:"
+msgstr "Brug pers_onlig port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "Hå_ndter..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Hvis den standard port der bruges til indkomne beskeder ikke passer dig "
+"eller\n"
+"din opsætning kan du vælge en anden her.\n"
+"Du bør også ændre opsætning tilsvarende på en evt. brandmur."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Fornavn:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Efternavn:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "Ad_var mig før jeg bruger en usikker forbindelse"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Epost:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "br_ug HTTP__PROXY miljøvariablen"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Fle_t kontoer"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "K_onto:"
+msgid "Add New Contact"
+msgstr "Tilføj Ny Kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Ti_llad denne kontakt at se min status"
+msgid "A_ccount:"
+msgstr "K_onto:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Tilføj Ny Kontakt"
+msgid "_Protocol:"
+msgstr "_Protokol:"
 
-#: ../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 "Jeg vil gerne tilføje dig til min kontakt liste."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Bruger ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Kælenavn:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Gruppe:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Ti_llad denne kontakt at se min status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Abonnement"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -524,7 +552,11 @@ msgstr ""
 "protokol. Klik på registrer knappen for at\n"
 "fortsætte."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "Kan _registreres"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -532,594 +564,373 @@ msgstr ""
 "Du må være tilsluttet til transporten for at kunne\n"
 "tilføje en kontakt for denne protokol."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Gruppe:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Kælenavn:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "Kan _registreres"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Abonnement"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Bruger ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Jeg vil gerne tilføje dig til min kontakt liste."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>En fejl er opstået:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Kommandoer - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Vælg kommando som skal udføres:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Vent mens kommandolisten bliver modtaget..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Kommandoer - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Vælg kommando som skal udføres:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Kontroller en gang til"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Fejl beskrivelse..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Vent mens kommandoen bliver sendt..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Færdig"
+msgid "Please wait..."
+msgstr "Vent venligst..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Vent mens kommandolisten bliver modtaget..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Denne jabber enhed eksponerer ikke nogen kommandoer."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Vent mens kommandoen bliver sendt..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>En fejl er opstået:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Vent venligst..."
+msgid "Error description..."
+msgstr "Fejl beskrivelse..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Denne jabber enhed eksponerer ikke nogen kommandoer."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Færdig"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Avanceret Konfigurations Behandler"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTE:</b> Du skal genstarte Gajim for at nogle af ændringerne kan træde i "
 "kraft"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Avanceret Konfigurations Behandler"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Nulstil til Standard Farver"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Slet MOTD"
+msgid "Show _XML Console"
+msgstr "Vis _XML Konsol"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Privatlivs Liste..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Send Server Besked..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Sæt MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Sæt Dagens Besked"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Vis _XML Konsol"
+msgid "Set MOTD..."
+msgstr "Sæt MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Opdater MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Opdater MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Slet MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Send Server Besked..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "et vindue/faneblad åbnede med denne kontakt "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Handlinger</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Betingelser</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Lyde</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Avancerede Handlinger"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Avanceret Påmindelses Kontrol"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Borte"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Travlt "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt Ændrede Status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt er ikke Tilsluttet"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Har ikke"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Filoverførsler"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Filoverførsel Forespørgsel"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Filoverførsel Stoppede"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Gruppe Samtale Besked Fremhævning"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Gruppe Samtale Besked Modtaget"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Har"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Usynlig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Kør en kommando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Ikke Tilgængelig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "En eller flere specielle statuser..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "På net / Klar For Samtale"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Spil en lyd"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Ny Privat Besked"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Når "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktiver vindueshåndteringens ViktigFif for at få samtale vinduet til at "
-"blinke i opgavelinjen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Deaktivér automatisk åbning af samtale vindue"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Deaktivér eksisterende pop op vinduer"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-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
-#, 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 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"
-msgstr "_Informer mig med et pop op vindue"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Åbn samtale vindue med bruger"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "_Vis hændelse i kontaktvindue"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "og jeg "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontakter"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "for "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupper"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "når jeg er i"
+msgid "Deletes Message of the Day"
+msgstr "Slet Dagens Besked"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Indstillinger"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Bliv automatisk med"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ingen"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Indstillinger"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Bliv automatisk med"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Indgang:"
+msgid "New entry received"
+msgstr "Ny hændelse modtaget"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Du har modtaget en ny hændelse:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed navn:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Indgang:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Sidst ændret:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Ny hændelse modtaget"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Du har modtaget en ny hændelse:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Fjern blokering"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Besked:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Sæt Aktivitet"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Sæt en aktivitet"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Besked:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humør:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Besked:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Ændre Adgangskode"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Skriv adgangskoden igen for at bekræfte:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Skriv en ny adgangskode:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Skriv adgangskoden igen for at bekræfte:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Skriv din nye status besked</b>"
+msgid "Save as Preset..."
+msgstr "Gem som Forvalgt..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivitet:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Humør:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivitet:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Forvalgte beskeder:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Gem som Forvalgt..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Skriv din nye status besked</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Bliv med i en _Gruppe Samtale"
+msgid "_Copy Link Location"
+msgstr "_Kopier Henvisning"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Tilføj til Kontaktliste..."
+msgid "_Open Link in Browser"
+msgstr "_Åbn Henvisning i Netlæser"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopier Henvisning"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Åbn E-post Program"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Åbn Henvisning i Netlæser"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Bliv med i en _Gruppe Samtale"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Tilføj til Kontaktliste..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Hvis en liste over følelsesikoner (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Tilføj denne kontakt til kontaktvinduet (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Gennemse samtale historik (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Vis en menu med avancerede funktioner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Send besked"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Send"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "In_viter"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Inviter Venner!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC server"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Vælg en MUC server."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1127,119 +938,136 @@ msgstr ""
 "Du er ved at begynde en Multibruger samtale.\n"
 "Vælg de kontakter du vil invitere"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Spørg om at kunne se hans/hendes status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Vælg en MUC server."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Tilføj Speciel Påmi_ndelse..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC server"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Tilskriv Open_PGP Nøgle..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "In_viter"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "Kør K_ommando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Start _samtale"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Ændre _Grupper..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Send en Enkel _Besked"
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Send _Fil..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Inviter _Kontakter"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "_Fjern"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Slå til/fra Open_PGP Kryptering"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Slå til/fra ende til ende Kryptering"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Send _Tilpasset Status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "Kør K_ommando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Send en Enkel _Besked"
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Håndter Kontakt"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Send _Fil..."
+msgid "_Rename..."
+msgstr "_Omdøb..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Angiv Personlig _Avatar..."
+msgid "Edit _Groups..."
+msgstr "Ændre _Grupper..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Start _samtale"
+msgid "Assign Open_PGP Key..."
+msgstr "Tilskriv Open_PGP Nøgle..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Slå til/fra ende til ende Kryptering"
+msgid "Set Custom _Avatar..."
+msgstr "Angiv Personlig _Avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Slå til/fra Open_PGP Kryptering"
+msgid "Add Special _Notification..."
+msgstr "Tilføj Speciel Påmi_ndelse..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Abonnement"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Till_ad ham/hende at se min status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Ti_llad denne kontakt at se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "_Spørg om at kunne se hans/hendes status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historie"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorer"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Bloker"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Håndter Kontakt"
+msgid "_Unignore"
+msgstr "Ikke ign_orer"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Omdøb..."
+msgid "_Ignore"
+msgstr "_Ignorer"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Abonnement"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "_Fjern"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "Ikke ign_orer"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historie"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Udfyld formen."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Rum Konfigurering"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Udfyld formen."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
@@ -1252,55 +1080,47 @@ msgstr "<b>(ESession</b> info)"
 msgid "_Verify"
 msgstr "Efterprø_v"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Egenskaber"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Liste over mulige egenskaber i Gajim:</b> "
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Egenskaber"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "En liste over aktive, færdige og stoppede filoverførsler"
+msgid "File Transfers"
+msgstr "Filoverførsler"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Annuller filoverførsel"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Viser en liste over filoverførsler mellem dig og andre"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Annullerer den valgte filoverførsel"
+msgid "file transfers list"
+msgstr "filoverførsel liste"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Annullerer den valgte filoverførsel og fjerner den ikke fuldførte fil"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "En liste over aktive, færdige og stoppede filoverførsler"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Ryd _op"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Påmind mig når en filoverførsel er færdig"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Filoverførsler"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Skjuler vinduet"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Fjerner færdige, annullerede og mislykkede filoverførsler fra listen"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverførsler fra listen."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Fjerner færdige, annullerede og mislykkede filoverførsler fra listen"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Viser en liste over filoverførsler mellem dig og andre"
-
-#: ../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"
@@ -1308,82 +1128,108 @@ msgstr ""
 "Denne handling fjerner en enkelt filoverførsel fra listen. Hvis overførslen "
 "er i gang, bliver den først stoppet og derefter fjernet"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Ryd _op"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pause"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Annullerer den valgte filoverførsel og fjerner den ikke fuldførte fil"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Fortsæt"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Annuller filoverførsel"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Påmind mig når en filoverførsel er færdig"
+msgid "Cancels the selected file transfer"
+msgstr "Annullerer den valgte filoverførsel"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Åbn folderen med filen"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Skjuler vinduet"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pause"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Fortsæt"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "filoverførsel liste"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Åbn folderen med filen"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Samtalestatus Fane Farver</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Fed"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppe"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Komponere"
+msgid "Gajim Themes Customization"
+msgstr "Gajim Tema Tilpasning"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "Tekst _farve:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Font stil:"
+msgid "_Background:"
+msgstr "_Baggrund:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim Tema Tilpasning"
+msgid "Text _font:"
+msgstr "Tekst _font:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Borte"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Gruppe"
+msgid "Font style:"
+msgstr "Font stil:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Ikke aktiv"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Fed"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kursiv"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Sat på pause"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Komponere"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Ikke aktiv"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Samtalestatus Fane Farver</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Borte"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1391,7 +1237,7 @@ msgstr ""
 "MUC\n"
 "Beskeder"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1399,105 +1245,98 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Sat på pause"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Tekst _farve:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Tekst _font:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Baggrund:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Ændre _Kælenavn..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Håndter Ru_m"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Ændre _Emne..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Tilpas _Rum..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Bogmærke"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Slet rum"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Håndter Ru_m"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimer ved lukning"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Stemme"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Bogmærke"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Or_dstyrer"
+msgid "_Send Private Message"
+msgstr "_Send en Privat Besked"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Beboer Handlinger"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Send _Fil"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Beboer Handlinger"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Tilføj til Kontaktliste"
+msgid "_Voice"
+msgstr "_Stemme"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Or_dstyrer"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Medlem"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Udvis"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Ejer"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Kast ud"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Medlem"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Ejer"
+msgid "_Ban"
+msgstr "_Udvis"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Send en Privat Besked"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Stemme"
+msgid "_Add to Roster"
+msgstr "_Tilføj til Kontaktliste"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Hvis en liste over følelsesikoner"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Ændre dit kælenavn (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bogmærk dette rom (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1509,40 +1348,19 @@ msgid "From:"
 msgstr "Fra:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Emne:"
 
 #: ../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."
-msgstr ""
-"<b>ADVARSEL:</b>\n"
-"Hvis du planlægger at gøre massive sletninger, vær sikker på at Gajim ikke "
-"kører. \n"
-"Generelt undgå at slette logger fra kontakter du samtidig snakker med."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim Loghistorie Håndterer"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Slet"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Eksporter"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim Loghistorie Håndterer"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1556,172 +1374,199 @@ msgstr ""
 "Brug dette program til at slette eller eksportere logger. Du kan selektere "
 "logger fra venstre og/eller søge databasen under. "
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>ADVARSEL:</b>\n"
+"Hvis du planlægger at gøre massive sletninger, vær sikker på at Gajim ikke "
+"kører. \n"
+"Generelt undgå at slette logger fra kontakter du samtidig snakker med."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Søg Database"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Status For Alle"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Samtale Historie"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Eksporter"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Kontakt navn"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Gruppesamtaler"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Status For Alle"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Samtale Historie"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Søg:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Log status ændringer hos kontakter"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Varm"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Varm"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Bliv med i dette rum automatisk når jeg tilsutter"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Rum:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Kælenavn:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "For nylig:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "For nylig:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Bliv med i dette rum automatisk når jeg tilsutter"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Rum:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bogmærk dette rom"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Bogmærk dette rom"
+msgid "Bro_wse Rooms"
+msgstr "_Gennemse"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Bliv med:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Bliv automatisk med"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Hvis valgt vil Gajim deltage i denne gruppe samtale ved start"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Håndter Bogmærker"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimer ved Automatisk Deltagelse"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titel:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Skriv status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Bliv automatisk med"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Hvis valgt vil Gajim deltage i denne gruppe samtale ved start"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titel:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimer ved Automatisk Deltagelse"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1732,100 +1577,103 @@ msgid "_Configure"
 msgstr "_Konfigurere"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Egenskaber</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Tilslutning\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Opsætning</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Tilslutning\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Håndter Proxy Profiler"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Type:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Adgangs_kode"
+msgid "_Name:"
+msgstr "_Navn:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxy _vært:"
+msgid "<b>Properties</b>"
+msgstr "<b>Egenskaber</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgid "Use HTTP prox_y"
+msgstr "Brug HTTP prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Brug HTTP prox_y"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Brug proxy godkendelse"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Brugernavn:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "Adgangs_kode"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Navn:"
+msgid "Proxy _Host:"
+msgstr "Proxy _vært:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Type:"
+msgid "Proxy _Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Brugernavn:"
+msgid "<b>Settings</b>"
+msgstr "<b>Opsætning</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Håndter Kontoer"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "PGP-løsen"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torisere"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "Ti_lgængelig"
+msgid "Version:"
+msgstr "GTK+ Version:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurere"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Beskrivelse: "
+msgid "Authors:"
+msgstr "Au_torisere"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1833,39 +1681,32 @@ msgid "Homepage:"
 msgstr "<b>Hjemmeside:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Hænger"
+msgid "Description:"
+msgstr "Beskrivelse: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigurere"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Hænger"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1879,220 +1720,286 @@ msgid "Event desc"
 msgstr "Hændelse"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Avanceret Konfigurations Behandler</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Programmer</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Tilpasset Opsætning</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Handlinger</b>"
+msgid "All chat states"
+msgstr "Status For Alle"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatisk Status</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Komponere"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Samtale udseende</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Ikke aktiveret"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Samtalelinie Farver</b>"
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Samtalestatus påmindelser</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Aldrig\n"
+"Kun ved ventende hændelser\n"
+"Altid"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Betingelser</b>"
+msgid "Always"
+msgstr "Borte"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr ""
 
-#. 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>Tilpasset Opsætning</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Påmind mig om kontakter som logger u_d"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Skrifttype</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Vis hændelse i kontaktvindue"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Indstillinger</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Nuværende Status Beskeder</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privatliv</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Kontaktvinduets Udseende</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Sidste status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Status Beskeder</b>"
+msgid "Preferences"
+msgstr "Indstillinger"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Temaer</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Mellemnavn:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
+"samtaler"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Synlige Påmindelser</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
+"kontaktvinduet og i gruppe samtaler"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Avanceret"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Vis kontakternes humør i kontaktvinduet"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Avanceret..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Status For Alle"
+msgid "Sort contacts by status"
+msgstr "Sorter kontakter efter status"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Tillad _OS information at blive sendt"
+msgid "in _roster"
+msgstr "i _kontaktvinduet"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Tillad _OS information at blive sendt"
+msgid "in _group chats"
+msgstr "i _gruppe samtaler"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Tillad pop op påmindelser når jeg er _borte/ikke tilgængelig/travel/usynlig"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Kontaktvinduets Udseende</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Tillad lyde når jeg er o_ptaget"
+msgid "_Window behavior:"
+msgstr "_Vinduets adfærd:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Borte"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Spørg om status besked når jeg:"
+msgid "_Emoticons:"
+msgstr "Føl_elsesikoner:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Gør samtalevinduer _kompakte"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Skjul alle knapperne i samtale vinduer."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorer rigt indhold i indkommende beskeder"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Samtale besked:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Nogle beskeder kan indeholde rigt indhold (formatering, farver osv.). Hvis "
+"valgt\n"
+"vil Gajim kun vise den rå tekst."
 
 #: ../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"
+msgid "_Highlight misspelled words"
+msgstr "Frem_hæv stavefejl"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Komponere"
+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 ""
+"Hvis valgt vil Gajim fremhæve stavefejl i tekstbokse i samtale vinduet. Hvis "
+"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:38
-msgid "Configure color and font of the interface"
-msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
+msgid "_Show roster on startup:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Samtale besked:"
+msgid "Show icon when your messages are received"
+msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Kontakt navn"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Tilpasset Opsætning</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Samtale udseende</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Når en ny hændelse er modtaget:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Påmind mig om kontakter logger _ind"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Påmind mig om kontakter som logger u_d"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Ikke aktiveret"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Tillad pop op påmindelser når jeg er _borte/ikke tilgængelig/travel/usynlig"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Vis kontakternes _aktivitet i kontaktvinduet"
+msgid "Notify on new _GMail email"
+msgstr "Påmind mig ved ny _GMail e-post"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Vis _ekstra e-post detaljer"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Vis kontakternes humør i kontaktvinduet"
+msgid "Display _extra email details"
+msgstr "Vis _ekstra e-post detaljer"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Vis kontak_ternes melodier i kontaktvinduet"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Hvis valgt vil Gajim også inkludere information om senderen af den nye e-post"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Indstillinger</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Vis kontakternes humør i kontaktvinduet"
+msgid "Show notification area icon:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Synlige Påmindelser</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Afspil _lyde"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Hå_ndtere..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Tillad lyde når jeg er o_ptaget"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Lyde</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Påmindelser"
+
+#: ../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 "
@@ -2102,7 +2009,11 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "vise i samtalevinduerne."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "Vis samtalestatus påmin_delser:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2112,682 +2023,628 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "sende til modparten."
 
-#: ../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 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:58
-msgid "Hide all buttons in chat windows"
-msgstr "Skjul alle knapperne i samtale vinduer."
-
-#: ../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: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: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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Hvis valgt vil Gajim ændre status til Ikke Tilgængelig når computeren ikke "
-"har været brugt i endnu længere tid"
+msgid "_Send chat state notifications:"
+msgstr "_Send samtalestatus påmindelser:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
-"samtaler"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Samtalestatus påmindelser</b>"
 
 #: ../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 ""
-"Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
-"kontaktvinduet og i gruppe samtaler"
+msgid "Personal Events"
+msgstr "Personlig Hændelser"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Væk efter:"
 
 #: ../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"
+"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: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"
+msgid "_Not available after:"
+msgstr "Ikke tilgæ_ngelig efter:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Hvis valgt vil Gajim vise i kontaktvinduet, hvilken melodi kontakten spiller"
+"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: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 ""
-"Hvis valgt vil Gajim fremhæve stavefejl i tekstbokse i samtale vinduet. Hvis "
-"intet sprog er valgt ved at højreklikke i indtastningsfeltet, vil standard "
-"sproget blive brugt for denne kontakt eller gruppe samtale."
+msgid "minutes"
+msgstr "minutter"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Hvis valgt vil Gajim ignorere indkommende hændelser fra uautoriserede "
-"kontakter. Brug med forsigtighed fordi det vil blokere alle beskeder fra "
-"alle kontakter som ikke er i kontaktvinduet."
-
-#: ../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 ""
-"Hvis valgt vil Gajim gemme en log for krypterede beskeder. Vær venligst "
-"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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Hvis valgt vil Gajim vise en påmindelse når en ny e-post er modtaget via "
-"Gmail"
+"Den automatiske jeg er væk status besked. Hvis tom vil Gajim ikke ændre den "
+"nuværende status besked\n"
+"$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: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, "
-"etc...)"
-msgstr ""
-"Hvis valgt vil Gajim bruge protokol specifikke status ikoner. (F.eks. En "
-"kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
-"borte, Travlt, etc...)"
-
-#: ../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 ""
-"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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Hvis valgt vil Gajim erstatte tekst smileys som denne ':)' med den "
-"tilsvarende animerede eller statiske grafiske følelsesikon"
+"Den automatiske jeg er ikke tilgængelig status besked. Hvis tom vil Gajim "
+"ikke ændre den nuværende status besked\n"
+"$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:76
-msgid "Log _encrypted chat session"
-msgstr "Log krypt_eret samtale session"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatisk Status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Gør samtalevinduer _kompakte"
+msgid "Ask status message when I:"
+msgstr "Spørg om status besked når jeg:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Hå_ndtere..."
+msgid "Sign _in"
+msgstr "Logge _ind"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "Server"
+msgid "Sign _out"
+msgstr "Log _af"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Påmindelser"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Påmind mig om kontakter logger _ind"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Status Beskeder</b>"
 
 #: ../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"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Nuværende Status Beskeder</b>"
 
-#: ../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:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Påmind mig ved ny _GMail e-post"
+msgid "Use system _default"
+msgstr "Brug system stan_dard"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Aldrig\n"
-"Kun ved ventende hændelser\n"
-"Altid"
+msgid "Chat message:"
+msgstr "Samtale besked:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Personlig Hændelser"
+msgid "<b>Font</b>"
+msgstr "<b>Skrifttype</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Afspil _lyde"
+msgid "Use _transports icons"
+msgstr "Brug _transportens ikonsæt"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 msgstr ""
+"Hvis valgt vil Gajim bruge protokol specifikke status ikoner. (F.eks. En "
+"kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
+"borte, Travlt, etc...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Indstillinger"
+msgid "Status _iconset:"
+msgstr "Status _ikonsæt:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Temaer</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr ""
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Kontakt navn"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "_Vis hændelse i kontaktvindue"
+msgid "Your nickname:"
+msgstr "Kælenavn:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Logge _ind"
+msgid "_Status message:"
+msgstr "_Status besked:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Log _af"
+msgid "_URL highlight:"
+msgstr "_URL fremhævning:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Nulstil til Standard Farver"
 
 #: ../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 ""
-"Nogle beskeder kan indeholde rigt indhold (formatering, farver osv.). Hvis "
-"valgt\n"
-"vil Gajim kun vise den rå tekst."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Samtale besked:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sorter kontakter efter status"
+#, fuzzy
+msgid "Your message:"
+msgstr "Fejl besked: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Gruppe Samtale Besked Fremhævning"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Status _ikonsæt:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Samtalelinie Farver</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Handlinger</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"Den automatiske jeg er væk status besked. Hvis tom vil Gajim ikke ændre den "
-"nuværende status besked\n"
-"$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:107
-msgid ""
-"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"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"Den automatiske jeg er ikke tilgængelig status besked. Hvis tom vil Gajim "
-"ikke ændre den nuværende status besked\n"
-"$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:110
-msgid "Use _transports icons"
-msgstr "Brug _transportens ikonsæt"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Mellemnavn:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Brug system stan_dard"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Betingelser</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Fejl besked: %s"
+msgid "_File manager:"
+msgstr "_Filhåndterer:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Kælenavn:"
+msgid "_Mail client:"
+msgstr "_E-post klient:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Væk efter:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Netlæser:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Vis samtalestatus påmin_delser:"
+msgid "<b>Custom</b>"
+msgstr "<b>Tilpasset Opsætning</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "Føl_elsesikoner:"
+msgid "<b>Applications</b>"
+msgstr "<b>Programmer</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Filhåndterer:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "Frem_hæv stavefejl"
+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 ""
+"Hvis valgt vil Gajim ignorere indkommende hændelser fra uautoriserede "
+"kontakter. Brug med forsigtighed fordi det vil blokere alle beskeder fra "
+"alle kontakter som ikke er i kontaktvinduet."
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Tillad _OS information at blive sendt"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorer rigt indhold i indkommende beskeder"
+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:128
-msgid "_Log status changes of contacts"
-msgstr "_Log status ændringer hos kontakter"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Tillad _OS information at blive sendt"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_E-post klient:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "Ikke tilgæ_ngelig efter:"
+msgid "Log _encrypted chat session"
+msgstr "Log krypt_eret samtale session"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Åbn..."
+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 ""
+"Hvis valgt vil Gajim gemme en log for krypterede beskeder. Vær venligst "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "_Nulstil til Standard Farver"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Tillad _OS information at blive sendt"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "_Send samtalestatus påmindelser:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Status besked:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "_URL fremhævning:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatliv</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Vinduets adfærd:"
+msgid "_Log status changes of contacts"
+msgstr "_Log status ændringer hos kontakter"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "i _gruppe samtaler"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "i _kontaktvinduet"
+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:139
-msgid "minutes"
-msgstr "minutter"
+msgid "_Open..."
+msgstr "_Åbn..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Avanceret Konfigurations Behandler</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avanceret"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privatlivs Lister:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Tilføj / Ændre en regel</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Privatlivs Liste"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Liste af regler</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privatlivs Liste</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktiv i denne session"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktiv efter hver start"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Liste af regler</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Alle"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Tilføj / Ændre en regel</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Alle (inkluderende abonnering)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Tillad"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Nægt"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "Alle i gruppen"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Bestil:"
+msgid "all by subscription"
+msgstr "Alle efter abonnering"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Privatlivs Liste"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Alle"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "Alle efter abonnering"
+msgid "to send me messages"
+msgstr "at sende mig beskeder"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "Alle i gruppen"
+msgid "to send me queries"
+msgstr "at sende mig forespørgsler"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Begge"
+msgid "to view my status"
+msgstr "at se min status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Fra"
+msgid "to send me status"
+msgstr "at sende mig status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "en"
+msgid "All (including subscription)"
+msgstr "Alle (inkluderende abonnering)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "to"
+msgid "Order:"
+msgstr "Bestil:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "at sende mig beskeder"
+#, fuzzy
+msgid "none"
+msgstr "en"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "at sende mig forespørgsler"
+#, fuzzy
+msgid "both"
+msgstr "Begge"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "at sende mig status"
+#, fuzzy
+msgid "from"
+msgstr "Fra"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "at se min status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresse</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "to"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Fødselsdag:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>By:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Efternavn:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Firma:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Land:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Mellemnavn:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Afdeling:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-post:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Titel:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Ekstra Adresse:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Fornavn:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Efternavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Endetillæg:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Fuldt Navn</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Gade:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Fornavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>By:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Hjemmeside:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Stat:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Ekstra Adresse:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Mellemnavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Postnummer:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Navn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Land:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Kælenavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresse</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefonnr.:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Hjemmeside:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Stilling:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Navn:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Postnummer:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Kælenavn:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefonnr.:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Titel:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Rolle:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Fødselsdag:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Stat:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-post:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Gade:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Tryk for at se din avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Endetillæg:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Personlig Information"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Firma:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Om"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Stilling:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Tryk for at se din avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Afdeling:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Rolle:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Personlig Information"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Arbejde"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Hvad vil du gøre?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Om"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kun k_ontoen fra Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Hvad vil du gøre?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Bytte af punkt i kontaktvinduet"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2795,115 +2652,112 @@ msgstr ""
 "<b>nogen@etsted.com</b> vil gerne at du <b>tilføjer</b> nogen kontakter i "
 "dit kontaktvindue."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Beskedtekst <for tiden ubrugt, så den er skjult som standard>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Bytte af punkt i kontaktvinduet"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Tilføj Kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Beskedtekst <for tiden ubrugt, så den er skjult som standard>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "_Egenskaber"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Handlinger"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Filover_førsler"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Tilføj Kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Ofte Stillede Spørgsmål (på net)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "R_ediger"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Hjælp på net"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "K_ontoer"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Vis"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Vis _Afkoblede Kontakter"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Vis Kun _Aktive Kontakter"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Vis Trans_porter"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Vis _Afkoblede Kontakter"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Vis _Kontaktvindue"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "K_ontoer"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Filover_førsler"
 
-#. 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 "_Handlinger"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Hjælp"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Indhold"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "R_ediger"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Hjælp på net"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_OSS"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Hjælp"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Send en Enkel _Besked..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Ofte Stillede Spørgsmål (på net)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Vis"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Vent mens en søge form hentes..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Egenskaber"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Søg"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Vent mens en søge form hentes..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Tilføj Kont_akt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Søg"
 
@@ -2923,43 +2777,37 @@ msgstr "Registrer til"
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Send et svar til denne besked"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Til:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Send besked"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Send besked og luk vinduet"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "Sva_r"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Til:"
+msgid "Reply to this message"
+msgstr "Send et svar til denne besked"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "Sva_r"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Luk"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Send besked og luk vinduet"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torisere"
+msgid "Subscription Request"
+msgstr "Abonnement Forespørgsel"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
-"Autoriser kontakt så han eller hun kan opnå information om at du er "
-"tilsluttet"
+msgid "_Deny"
+msgstr "_Nægt"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2969,263 +2817,277 @@ msgstr ""
 "Nægt autorisation fra kontakter så han eller hun ikke kan opnå information "
 "om at du er tilsluttet"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Abonnement Forespørgsel"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torisere"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Nægt"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+"Autoriser kontakt så han eller hun kan opnå information om at du er "
+"tilsluttet"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Synkroniser kontakter"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Vælg den konto som du vil synkronisere med"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Vælg de kontakter som du vil synkronisere"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synkronisering : vælg kontakter"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Slå lyden af"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Send en Enkel _Besked"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Vis Alle Ventende Hænd_elser"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Vælg de kontakter som du vil synkronisere"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Gruppe Chat"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Spørg:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Send en Enkel _Besked"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klient:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Vis Alle Ventende Hænd_elser"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Kontakt tid:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Slå lyden af"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontakt Information"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Abonnering:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klient:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Kommentarer"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Kontakt tid:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Konfigureret avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Abonnering:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kontakt Information"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Spørg:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Mere"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Bruger avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Skrifttype</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Kommentarer"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafik</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Inddata</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Information/Forespørgsel (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Skrifttype</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Information/Forespørgsel (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Tilstedeværelse"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Besked"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Tilstedeværelse"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Inddata</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Ændre Konto"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokal jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Resource:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+ Jabber klient"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Personlig"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klient"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+ Jabber klient"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Annuller bekræftelse"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Ugyldig rum"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Tjeneste sendte malformeret data"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Tjeneste ændrede sessionsnøglen."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Kommandoer - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Tjeneste returnerede en fejl."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktiveret"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Ikke aktiveret"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Farve"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Værdi"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Skjult"
 
@@ -3236,244 +3098,187 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Du har modtaget en nye hændelser (og %(count)d er ikke vist):"
 msgstr[1] "Du har modtaget en nye hændelser (og %(count)d er ikke vist):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Engelsk"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Belarusian"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgarsk"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretonsk"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Tjekkisk"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Tysk"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Græsk"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Britisk"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Spansk"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Baskisk"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Fransk"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Kroatisk"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiensk"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norsk (bokmål)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Hollandsk"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polsk"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brasiliansk Portugisisk"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Russisk"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Serbisk"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovakisk"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Svensk"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Kinesisk"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s .s)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Sprog for stavekontrollen"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Fejl."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "En tilslutning er ikke tilgængelig"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Understregning"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Streg"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Fjern formatering"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Virkelig send denne fil?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG kryptering aktiveret"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Denne kontakt understøtter ikke fil overførsler."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Ikke i Kontaktvinduet"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Egenskab ikke tilgængelig under Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Send _Fil"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakt understøtter ikke fil overførsler."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Ingen GPG nøgle valgt"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Ingen GPG nøgle er valgt for denne kontakt. Derfor kan du ikke kryptere "
 "beskeder med GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Session VIL blive logget"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Session VIL IKKE blive logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "og godkendt"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3482,32 +3287,32 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Session VIL IKKE blive logget"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Denne session er krypteret"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " og VIL blive logget"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " og VIL IKKE blive logget"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3515,25 +3320,25 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende besked var IKKE krypteret"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3541,13 +3346,14 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3556,221 +3362,576 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
 "(hele historikken vil tabes)."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ikke i stand til at dekryptere beskeden fra %s\n"
+"Det er mulig den er blevet forfalsket."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Filoverførsler"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Størrelse: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "K_ontoer"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Filoverførsel er fuldført"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Gruppesamtale Invitation"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Den fjerne kontakt stoppede filoverførslen"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Fejl ved åbning af fil"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Filoverførsel stoppede"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Filoverførsel er afbrudt"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Tilslutning til ligeværdige kan ikke oprettes."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Send en fil til en kontakt"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s ikke fundet"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Borte"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Ti_lgængelig"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Skjuler vinduet"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Slå til/fra Open_PGP Kryptering"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Send en fil til en kontakt"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s er ikke et gyldigt logniveau"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "En tilslutning er ikke tilgængelig"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Tilslutning er ikke tilgængelig"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Ændre dit kælenavn (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Ugyldigt kælenavn"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr "_Åbn samtale vindue med bruger"
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Kælenavn som skal bruges"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Send %s til %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Du er inviteret til en gruppesamtale."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Ugyldigt server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "tilknytning ændret"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s er ikke navnet på en gruppe samtale."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Manglende argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "opretter log database"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "opretter log database"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim vil nu slutte"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "opretter %s katalog"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Ændre status information"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Ændre status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Sæt tilstedeværelses type og beskrivelse"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Åben for samtaler"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Udvidet borte"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Forstyr ikke"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Ofline - ikke tilsluttet"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Din status er blevet ændret."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Forlad Gruppesamtaler"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s i %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Du detlager ikke i en gruppesamtale."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Vælg de gruppesamtaler du vil forlade"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Du forlod de følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Videresend ulæste beskeder"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Alle ulæste beskeder er blevet videresendt."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Videresend ulæste beskeder"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Spil en lyd når brugeren er optaget"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Brug D-Bus og Påmindelses-dæmonen (Notification-Daemon) til at vise "
 "påmindelser"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Vis kun brugere på net og brugere klar for en samtale i kontaktvinduet."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før din status ændres til borte."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Væk som et resultat af at være inaktiv i mere end $T minutter)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S vil blive ombyttet med den nuværende status besked, $T ved automatisk væk "
 "tid."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før din status ændres til ikke tilgængelig."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr ""
 "$S (Ikke tilgængelig som et resultat af at være inaktiv i mere end $T "
 "minutter)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S vil blive erstattet med den nuværende status besked, $T ved ikke "
 "tilgængelig tid."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, 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'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Indgående farve på kælenavn."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Farve på udgående kælenavn."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Indgående farve på tekst."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Udgående farve på tekst."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Status besked farve på tekst."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Vis hændelse i kontaktvindue"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Vis hændelse i kontaktvindue"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Filoverførsel Forespørgsel"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Filoverførsel er afbrudt"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Gruppesamtale Invitation"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Udgående farve på kælenavn."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Udgående font på kælenavn."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Indgående font på tekst."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Udgående font på tekst."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Status besked font på tekst"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3778,17 +3939,17 @@ msgstr ""
 "kollapset."
 
 #. sorted alphanum
-#: ../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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Sprog brugt af stavelseskontrollen"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3798,7 +3959,7 @@ msgstr ""
 "'nogen ganger' - skriv tid for hver print_ichat_every_foo_minutes minutter.\n"
 "'aldrig' - skriv aldrig tiden."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3809,18 +3970,18 @@ msgstr ""
 "upræcise klokke. 1 er den mest præcise klokke, 4 den mindst præcise. Dette "
 "bruges kun hvis print_time er 'nogen ganger'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings tegn."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Hvis sandt, ikke fjern */_. Således at *abc* bliver skrevet med fed skrift "
 "men * * bliver ikke fjernet."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3830,7 +3991,7 @@ msgstr ""
 "formatering hvis valgt. For syntaks, se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html (Hvis du vil bruge dette, installer docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3838,7 +3999,7 @@ msgstr ""
 "Tegn som tilføjes efter kælenavn når der bruges kælenavnsfuldførelse (tab) i "
 "en gruppesamtale."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3846,7 +4007,13 @@ msgstr ""
 "Tegnforslag til at tilføje efter det ønskede kælenavn, når det ønskede "
 "kælenavn er i brug af en anden i gruppesamtalen."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3857,48 +4024,55 @@ msgstr ""
 "[timer:minutter]. Se python dokumentationen for strftime: http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som bliver skrevet før kælenavnet i samtaler"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som bliver skrevet efter kælenavnet i samtaler"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Tilføj * og [n] i tittelen på kontaktvinduet?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindue/"
 "faneblad genåbnes."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Hvor mange minutter skal sidste linjer fra forrige samtale vare."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Hvor mange linjer skal hentes fra serveren når man deltager i en "
 "gruppesamtale."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
 "gruppesamtale."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3907,7 +4081,12 @@ msgstr ""
 "forbindelse til en konference som du er blevet afbrudt fra. Sæt værdien til "
 "0 for at forhindre at der prøves at oprette ny forbindelse."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3915,11 +4094,11 @@ msgstr ""
 "Send besked med Ctrl+Enter og lave en ny linie med Enter (standard Mirabilis "
 "ICQ klient adfærd)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal gemmes for Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3928,12 +4107,12 @@ msgstr ""
 "Enten en tilpasset url som indeholder %s hvor %s er ordet/frasen, eller "
 "'WIKTIONARY' som betyder brug wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Hvis valgt kan Gajim blive kontrolleret eksternt ved hjælp af gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3945,14 +4124,14 @@ msgstr ""
 "de synkroniserer med global status) baseret på status af "
 "netværksforbindelsen."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3960,7 +4139,7 @@ msgstr ""
 "Vis samtale status påmindelser i samtale vinduer. Kan være en af disse: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3968,35 +4147,38 @@ msgstr ""
 "Når der ikke skrives tid for hver besked (print_time==sometimes), skriv "
 "tiden for hver x minutter."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Altid spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Aldrig spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Spørg før et faneblad i samtale vinduet lukkes hvis der kan mistes dat "
 "(samtale, privat samtale, gruppe samtale som ikke vil minimere)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4005,28 +4187,34 @@ msgstr ""
 "grænseflader, for filoverførsler i tilfælde af adresse omskrivning/port "
 "videresending."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Vis påmindelse af hændelser i statusfelt ikonet."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis faneblade i samtalevinduer?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Vis lukke knap i faneblad?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4038,17 +4226,17 @@ msgstr ""
 "16, 17 og 18. Højere tal er mere sikre, men tager længere tid at udregne når "
 "du starter en session."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "En semikolon-separeret liste af ord som vil blive fremhævet i gruppesamtaler."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4057,14 +4245,14 @@ msgstr ""
 "Hvis Sandt, lukker Gajim når X knappen fra vindueshåndteringen klikkes. "
 "Denne indstilling tages der kun hensyn til hvis et statusfelt ikon bruges."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Hvis Sandt, vil Gajim kontrollere om den er standard jabber klient ved hver "
 "opstart."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4072,7 +4260,7 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise et ikon på hvert faneblad som indeholder ulæste "
 "beskeder. Afhængig af temaet, kan dette ikon være animeret."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4080,12 +4268,12 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise status beskeder, hvis ikke tomme, for hver "
 "kontakt under kontaktnavnet i kontaktvinduet."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definer positionen af avataren i kontaktvinduet. Kan være venstre eller højre"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4093,7 +4281,7 @@ msgstr ""
 "Hvis Sandt, vil Gajim spørge for en avatar for hver kontakt som ikke havde "
 "en avatar sidste gang eller har en gemt som er for gammel."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4102,9 +4290,10 @@ msgstr ""
 "kontakt ændrer hans eller hendes status og/eller hans eller hendes status "
 "besked."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4116,30 +4305,34 @@ msgstr ""
 "vil Gajim skrive alle status beskeder. Hvis \"in_and_out\" vil Gajim kun "
 "skrive FOO kommer/forlader gruppesamtalen."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Baggrundsfarve på kontakter når de netop har tilsluttet sig."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Baggrundsfarve på kontakter når de netop har afbrudt tilslutningen."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Hvis Sandt vil gamle beskeder fra forrige samtale bruge en mindre skrifttype "
 "end den som er standard."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis en avatar for selve transporten."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke hvis kontaktvindue i vindueslisten."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4149,7 +4342,7 @@ msgstr ""
 "vinduet (standard adfærd i de fleste vindueshåndterere) når det indeholder "
 "ventende begivenheder."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4160,7 +4353,8 @@ msgstr ""
 "sha information i gruppesamtaler."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4168,7 +4362,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrollerer vinduet hvor nye beskeder er placeret.\n"
@@ -4181,31 +4375,39 @@ msgstr ""
 "'pertype' - Hver besked type (for eks. samtaler versus gruppesamtaler) "
 "bliver sendt til et specifikt vindue."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Hvis Falsk vil du ikke længere se en avatar i samtale vinduet."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Hvis Sandt vil tryk på escape tasten lukke et vindue/faneblad."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Skjuler knapperne i samtale vinduer."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Skjuler banneret i et to personers samtalevindue"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skjuler gruppesamtale deltagerlisten i gruppesamtale vinduer."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4213,15 +4415,15 @@ msgstr ""
 "I en samtale, vis kælenavn i begyndelsen af en linie kun når det ikke er den "
 "samme person som snakker som i forrige besked."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indrykning når man fletter ens kælenavne."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Udglattet rulning af beskeder i samtale vinduet"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4229,11 +4431,11 @@ msgstr ""
 "Liste af farver, separeret med \":\", som vil blive brugt til at farve "
 "kælenavne i gruppesamtaler."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab gå til næste faneblad når ingen er ulæste."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4241,7 +4443,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
 "streng betyder at vi aldrig viser vinduet."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4249,7 +4451,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for blokering af kontakter? Tom streng "
 "betyder at vi aldrig viser vinduet."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4257,7 +4459,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for ændring af personlig status? Tom "
 "streng betyder at vi aldrig viser vinduet."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4267,7 +4469,7 @@ msgstr ""
 "konto i kontoændrings vinduet. VÆR FORSIGTIG, når du er logget med en "
 "negativ prioritet vil du IKKE modtage nogen beskeder fra din server."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4275,7 +4477,7 @@ msgstr ""
 "Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
 "konto adgangskoder."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4283,7 +4485,7 @@ msgstr ""
 "Hvis sandt vil Gajim bruge KDE Wallet (hvis kwelletcli er tilgængelig) til "
 "at gemme konto adgangskoder."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4291,7 +4493,7 @@ msgstr ""
 "Hvis Sandt vil Gajim vise antallet af online og totale kontakter i konto og "
 "gruppe rækker."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4299,7 +4501,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Hvis ikke tom, behandl alle indkommende "
 "beskeder som om de var af denne type"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4307,20 +4509,12 @@ msgstr ""
 "Hvis Sandt vil Gajim rulle ned/op og vælge den kontakt som sendte dig den "
 "sidste besked, hvis ikke allerede kontaktvinduet er åbent."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Hvis Sandt vil Gajim omdanne strengen mellem $$ og $$ til et billede med "
-"dvips og omdanne det inden det bliver sat ind i et samtale vindue."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tid med inaktivitet der skal gå før vinduet til at ændre status lukkes."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4328,7 +4522,7 @@ msgstr ""
 "Maksimum antal linjer som bliver skrevet i samtaler. De ældste linjer bliver "
 "slettet."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4337,19 +4531,11 @@ msgstr ""
 "Hvis sandt vil påmindelses vinduer fra påmindelses dæmonen blive fæstet til "
 "ikonet i systembakken."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vælg interval mellem 2 kontroller for ingen aktivitet."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Du kan ændre værdien for at ændre størrelsen af latex formler som bliver "
-"vist. Jo højere jo større."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4357,22 +4543,23 @@ msgstr ""
 "Gyldige uri skemaer. Kun skemaer i denne liste vil blive accepteret som "
 "\"rigtige\" uri. (mailto og xmpp bliver behandlet separat)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Spørg om offline status beskeder til alle offline kontakter når en "
 "forbindelse til en konto bliver etableret. ADVARSEL: Dette forårsager en "
 "masse forespørgsler!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Hvis sandt, vil færdiggørelse i gruppe samtaler fungere på samme måde som "
 "færdiggørelse i kommandolinjen"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4380,31 +4567,60 @@ msgstr ""
 "Når bliver selv kontakt rækken vist. Kan være \"always\", "
 "\"when_other_resource\" eller \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
+"besked vil blive brugt i stedet."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4412,7 +4628,7 @@ msgstr ""
 "Prioriteten vil ændres automatisk ifølge din status. Prioriteter er "
 "defineret i autopriority_* indstillingerne."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4421,40 +4637,40 @@ msgstr ""
 "væk, ikke tilgængelig, vil ikke forstyrres, usynlig. NOTE: denne "
 "valgmulighed bliver kun brugt hvis restore_last_status er deaktiveret"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Hvis valgt, gendan den sidste status som var brugt."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Hvis sandt, kontakter som beder om autorisering vil automatisk blive "
 "accepteret."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Hvis Falsk vil denne konto blive deaktiveret og vil ikke vises i "
 "kontaktvinduet."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Hvis deaktiveret, ikke signer tilstedeværelser med GPG nøgle, selvom GPG er "
 "konfigureret."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne konto."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en krypteret session når det er muligt?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4462,51 +4678,66 @@ msgstr ""
 "En ordnet liste (adskilt af mellemrum) af forbindelses typer som skal "
 "prøves. Kan indeholde tls, ssl eller plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Hvis en advarsels dialog før brugen af standard SSL biblioteket."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Mellemrum sendt efter inaktivitet"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt efter inaktivitet"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Hvor mange sekunder skal der ventes på svaret af en holdilive pakke, før vi "
 "prøver at forbinde igen."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 tilpasning"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4514,15 +4745,33 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Svar til modtagelses forespørgsel"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Sendte modtagelses forespørgsler"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s vil gerne sende dig en fil."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4530,20 +4779,52 @@ msgstr ""
 "Ved forhandling af en krypteret session, skal Gajim da antage at du vil have "
 "dine beskeder logget?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonym godkendelse"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anonym godkendelse"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP aktiveret for denne kontakt?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4551,108 +4832,112 @@ msgstr ""
 "Skal Gajim automatisk starte en krypteret session med denne kontakt når det "
 "er muligt?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 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:447
-msgid "all or space separated status"
-msgstr "alt eller mellemrums separeret status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'ja', 'nej', eller 'begge'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Hvor mange linjer skal hentes fra serveren når man deltager i en "
+"gruppesamtale."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
+"gruppesamtale."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så læg en besked."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbejder"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Ude"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4661,27 +4946,185 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 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:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "grøn"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "købmandsvarer"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "menneske"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marint"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Til"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "forespørsel om ophør på abonnement fra %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Disk skrivefejl"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"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)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Rummet er blevet ødelagt"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Du kan deltage i dette rum i stedet: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Ugyldigt Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+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."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fejl opstod under sending %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Ukendt SSL fejl: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Ny Enkel Besked"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ny Besked fra %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Ny Privat Besked"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Ny Privat Besked fra gruppe samtale %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Besked fra %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Ny Besked"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Ny Besked fra %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Ændrede Status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nu %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt Ændrede Status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Loggede Ind"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt Loggede Ind"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Loggede Ud"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt Loggede Ud"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
@@ -4691,20 +5134,20 @@ msgstr "Ikke i stand til at indlæse tomgangs modulet"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Tilslutning lykkedes"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Tilslutning med agenten %s lykkedes"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4712,193 +5155,169 @@ msgstr ""
 "Tilslutning med agenten %(agent)s mislykkedes med fejlen %(error)s: "
 "%(error_msg)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 "Disk skrivefejl"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: ../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: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: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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til at skaffe certifikat CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til at dekryptere certifikatets signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til at dekryptere CRL's signatur"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Ikke i stand til at dekode udstederens offentlige nøgle"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Certifikat signaturen fejlede"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "CRL signatur fejl"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfejl i certifikatets notBefore felt"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfejl i certifikatets notAfter felt"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfejl i CRL's lastUpdate felt"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfejl i CRL's nextUpdate felt"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Selvsigneret certifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsigneret certifikat i certifikats kæden"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Ikke i stand til at skaffe lokalt udstedelses certifikat"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Ikke i stand til at verificere det første certifikat"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Certifikat kæde er for lang"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA certifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Sti længde begrænsning overskredet"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Ikke understøttet formål for certifikatet"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certifikatet er ikke til at stole på"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certifikatet afvist"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Emne udsteder uoverensstemmelse"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne nøgle identifikations uoverensstemmelse"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og udstedelses serie nummer uoverensstemmelse"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Nøglebrug indeholder ikke certifikat signering"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4907,79 +5326,80 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Ukendt SSL fejl: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Forkert svar"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Kunne ikke tilslutte til \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server svarede: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke tilslutte til kontoen %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, 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:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4988,7 +5408,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4997,24 +5417,33 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Ægtheden af %s certifikatet kan være ugyldig."
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunne ikke tilslutte til \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5023,66 +5452,66 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Sendte kontakter:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Ikke i kontaktvindue"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne computer"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus evner kan ikke bruges"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus kører ikke korrekt på denne maskine"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus kører ikke korrekt på denne maskine"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus kører ikke korrekt på denne maskine"
@@ -5096,7 +5525,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Tjeneste ikke tilgængelig: Gajim kører ikke, eller remote_control er Falsk"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-Bus er ikke tilgængelig på denne maskine eller et python modul mangler"
@@ -5282,267 +5711,294 @@ msgstr "Slutten af ugen"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brugernavn."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i værtsnavn."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Server adresse påkrævet."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Travlt"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Ikke Tilgængelig"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Væk"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Usynlig"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Deltagere"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Deltager"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Ejer"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d besked venter"
 msgstr[1] "%d beskeder venter"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr "fra rum %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr "fra bruger %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " fra %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hændelse venter"
 msgstr[1] "%d hændelser venter"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Tidsudløb nået for at laste billede"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Billede er for stort"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL er endnu ikke gyldigt"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Tidsudløb nået for at laste billede"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rum Konfigurering"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5554,111 +6010,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Fejl besked: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Fejl under kørsel af \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldigt logniveau"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Standard Besked"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Størrelse: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Fil: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "grøn"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "fejl: kan ikke åbne %s for læsning"
+msgid "Error: cannot open %s for reading"
+msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
@@ -6295,19 +6765,115 @@ msgstr "Studerer"
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "standard"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marint"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Skjult"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Konto"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Konto"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Beskrivelse"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Fejl"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "en"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "rum"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Ukendt Artist"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Ukendt Titel"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Ukendt Kilde"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6316,22 +6882,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
 "fra <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Ikke i stand til at tildele port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Måske har du en anden instans af Gajim kørende. Filoverførsler vil blive "
-"annulleret."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6339,11 +6891,11 @@ msgstr ""
 "[Dette er en del af en krypteret session. Hvis du ser denne besked gik noget "
 "galt.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi fejl"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6352,44 +6904,43 @@ msgstr ""
 "%s\n"
 "Link-local beskeder vil sandsynligvis ikke virke ordentligt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ikke i stand til at tildele port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontroller venligst om avahi-dæmonen kører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke ændre status på kontoen \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Din besked kunne ikke sendes."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6402,24 +6953,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fejl ved tilføjelse af tjeneste. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Standard Besked"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6428,69 +6979,69 @@ msgstr ""
 "For at bruge stavekontrollen må du installer en %s ordbog, eller vælge et "
 "andet sprog ved indstillingen for sprog til stavekontrollen."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "status besked tekst"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Log ind igen nu?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Hvis du vil at alle ændringerne skal træde i kraft nu, må du logge ind igen."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Ulæste hændelser"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Læs alle ventende hændelser før denne konto fjernes."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har en åben samtale med kontonavnet %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Du er for øjeblikket tilsluttet til serveren"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "For at ændre kontonavnet må du læse alle ventende hændelser."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Kontonavnet er allerede i brug"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6498,143 +7049,144 @@ msgstr ""
 "Dette navn er allerede brugt til en af dine andre kontoer. Vælg venligst et "
 "andet navn."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Ugyldigt kontonavn"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Kontonavnet kan ikke være tomt."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Kontonavnet kan ikke indeholde mellemrom."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Omdøb Konto"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Indtast et nyt navn for kontoen %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Der er ikke nogen hemmelig OpenPGP nøgle tilgængelig."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Ingen konto ved det navn er tilgængelig"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Din server understøtter ikke Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke gemme din personlige information."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "For at deaktivere din konto må du afbryde din tilslutning."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Liste over bandlyste"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Ejer Liste"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Kælenavne"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Bandlysning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6642,11 +7194,11 @@ msgstr ""
 "<b>Hvem vil du bandlyse?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Tilføj Medlem..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6654,11 +7206,11 @@ msgstr ""
 "<b>Hvem vil du gøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Tilføj Ejer..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6666,11 +7218,11 @@ msgstr ""
 "<b>Hvem vil du gøre til ejer?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Tilføj Administrator..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6678,7 +7230,7 @@ msgstr ""
 "<b>Hvem vil du gøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6694,110 +7246,107 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Hvis du fjerne den vil tilslutningen tabes."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Hvad vil du gøre?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Fjern kun k_ontoen fra Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Gå kun ind og ud"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Dette bogmærke er ugyldigt"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 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:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Ugyldigt kælenavn"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Tegn ikke tilladt: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Ugyldigt server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Ugyldig rum"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6807,33 +7356,33 @@ msgstr ""
 "eller senere ved at vælge kontoens menupunkt under Rediger menuen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto er blevet oprettet med succes"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Ugyldigt brugernavn"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Du må give et brugernavn for at konfigurere denne konto."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 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:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6848,7 +7397,7 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6859,72 +7408,89 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Kontonavnet er i brug"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP knude blev ikke fjernet"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Konfigurere"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Hændelse"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Første Besked er Modtaget"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Første Besked er Modtaget"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Næste Besked Modtages i Fokus"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Næste Besked Modtages uden Fokus"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt er Tilsluttet"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt er ikke Tilsluttet"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Besked er Sendt"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail E-post Modtaget"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6935,7 +7501,7 @@ msgstr ""
 "ikon forbliver på skærmen længe er det sandsynlig\n"
 "at beskeden gik tabt."
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6943,234 +7509,235 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Åbn som et _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID er allerede i listen"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Nøgle ID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Sæt Humørstemning"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Besked"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Status Besked"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Besked?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Gem som Forvalgt Status Besked"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Skriv et navn for denne status besked"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresse:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "En GTK+ jabber klient"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Nuværende Programudviklere:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Tidligere Programudviklerer:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "TAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7183,101 +7750,156 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Ikke sikker forbindelse"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Du er ved at sende din adgangskode på en usikker forbindelse. Du bør "
+"installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
+"dette?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Ikke spørg mig ige_n"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i en gruppe samtale %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Deltag i Gruppe Samtale med kontoen %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Forkert uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Dette er ikke en gruppe samtale"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, 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:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 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:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start en samtale med konto %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7286,168 +7908,138 @@ msgstr ""
 "en besked til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, 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:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke fortolke \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt Loggede Ind"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Ny Besked"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Ny Privat Besked"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Gruppesamtale Invitation"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt Ændrede Status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Enkel Besked"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Konsol"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Trist"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Ændre"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7456,190 +8048,186 @@ 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:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Tilføj"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Ændre"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Tilføj Kont_akt"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Tilføj Kont_akt"
+msgstr[1] "Tilføj Kont_akt"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Fjerner kontakt fra kontaktvinduet"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Fjerner kontakt fra kontaktvinduet"
+msgstr[1] "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Ikke gyldigt server navn"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Tjeneste returnerede en fejl."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s bliver:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Betingelse"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "når jeg er"
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7650,19 +8238,19 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng er: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verificeret denne kontakts identitet."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet er verificeret"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Verificer igen..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7672,19 +8260,19 @@ msgstr ""
 "beskeder eller sende dig beskeder, må du verificere deres identitet ved at "
 "trykke på knappen under."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet er IKKE verificeret"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Verificer..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Har du bekræftet den kontaktens identitet?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7699,85 +8287,126 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 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:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG nøgle er tildelt til denne kontakt, men <b>du stoler ikke på denne "
 "nøgle</b>, så beskeder <b>kan ikke</b> krypteres. Brug din GPG klient til at "
 "ændre dette."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG Nøgle er tildet til denne kontakt, og du stoler på denne nøgle, så "
 "beskeder vil blive krypteret."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "for konto %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Selvsigneret certifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konference"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7785,298 +8414,287 @@ 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:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Ikke gyldigt server navn"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Kør Kommando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Brugere"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bogmærke er allerede sat"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bogmærket er blevet tilføjet succesfuldt"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Knude"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "SSL certifikat validering"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek brugt til at validere server certifikater for at sikre en "
 "sikker forbindelse."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Kræver python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk opdagede klienter i et lokalt netværk."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Kræver python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Kræver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Kommandolinje"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Et script til at kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Kræver 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Egenskab ikke tilgængelig under Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP besked kryptering"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Krypterer samtale beskeder med gpg nøgler."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Kræver gpg og python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Automatisk opdagelse af netværksstatus."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Kræver gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Sessions Håndtering"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sessionen bliver gemt ved logud og genoprettet ved logind."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Kræver python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Adgangskodekryptering"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Adgangskoder kan blive gemt sikkert og ikke bare i ren tekst."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Kræver gnome-keyring og python-gnome2-desktop, eller kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evnen til at tilslutte til servere som bruger SRV poster."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Kræver dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Kræver nslookup for at bruge SRV poster."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Stavekontrol"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontrol af forfattede beskeder."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Kræver libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Kræver libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Påmindelse"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Passive pop op vinduer som påminder om nye hændelser."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 "Kræver python-notify eller python-dbus i forbindelse med påmindelses-dæmonen."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatisk status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til at måle tomgangs tid, for at kunne sætte automatisk status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Biblioteket libxss kræves"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Kræver python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Omdan LaTeX udtryk mellem $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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 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."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Ende til Ende besked kryptering"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Krypterer samtale beskeder."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Kræver python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8084,140 +8702,137 @@ msgstr ""
 "Generer XHTML uddata fra RST kode (se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Kræver python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Kræver python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Kræver python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Kræver python-dbus."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Tilgængelig"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Egenskab"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Fremgang"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Afsender: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Modtager: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gemt i: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Filoverførsel er fuldført"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Filoverførsel er afbrudt"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Tilslutning til ligeværdige kan ikke oprettes."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Modtager: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Fejl besked: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Filoverførsel stoppede"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Vælg en Fil at Sende..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan ikke tilgå denne fil"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Denne fil bliver brugt af en anden proces."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Fil: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Beskrivelse: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-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:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8225,33 +8840,64 @@ 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Gem Fil som..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Fil: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Beskrivelse: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s vil gerne sende dig en fil:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Sender profil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Filoverførsel Fejl"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8259,69 +8905,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Afsender: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "besked"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Føl_elsesikoner:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "_Vis hændelse i kontaktvindue"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Avanceret Konfigurations Behandler"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Rum Konfigurering"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim behøver en X server for at kunne køre. Slutter..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importering af PyGTK fejlede: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim behøver PyGTK 2.12 eller højere"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim behøver PyGTK 2.12 eller højere for at køre. Slutter..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim behøver GTK 2.12 eller højere"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim behøver GTK 2.12 eller højere for at køre. Slutter..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behøver pywin32 for at køre"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8330,12 +9013,11 @@ msgstr ""
 "Hver venligst sikker på at Pywin32 er installeret på dit system. Du kan få "
 "det fra %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim kører allerede"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8343,28 +9025,28 @@ msgstr ""
 "En anden instans af Gajim ser ud til at køre\n"
 "Kør alligevel?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Viser hjælp for en specifik kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "Kommando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "Vis hjælp for kommando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Viser eller gemmer kontaktvinduet"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8372,51 +9054,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "Konto"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "viser kun kontakter for den givne konto"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Udskriver en liste af registrerede kontoer"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ændrer status for kontoen eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "besked"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status besked"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8425,21 +9111,45 @@ msgstr ""
 "status for alle kontoer der har sat \"synkroniser med generel status\" "
 "indstillingen"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Ændrer prioriteringen for kontoen eller kontoer"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "prioriteten du vil give til kontoen"
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "besked indhold. Kontoen må specificeres eller \"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8449,34 +9159,29 @@ msgstr ""
 "konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
 "bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8486,138 +9191,135 @@ 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-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "emne"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "emne på besked"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Send en ny besked til en gruppesamtale du deltager i."
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Få detaljeret information om kontoen"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Filsti"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nøgle"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Tilføjer kontakt til kontaktvinduet"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Tilføjer ny kontakt til denne konto"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 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-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:243
 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-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åbner 'Start Samtale' vinduet"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starter en samtale med denne konto"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8625,44 +9327,93 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle kontoer"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Ændre status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Kælenavn som skal bruges"
+
+#: ../src/gajim-remote.py:272
+#, 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:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndter en xmpp:/ uri"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI som skal håndteres"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Den konto som du vil håndtere det med"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Besked indhold"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Deltag i et MUC rum"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "rum"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Rum JID"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "kælenavn"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Kælenavn som skal bruges"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "adgangskode"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Adgangskode for at slutte sig til rummet"
+
+#: ../src/gajim-remote.py:292
+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:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8671,156 +9422,44 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"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-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 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
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8829,7 +9468,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8838,10 +9477,14 @@ msgstr ""
 "Argument \"%(arg)s\" er ikke specificeret. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Forkert uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8864,183 +9507,219 @@ msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette det nuværende tema"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Vælg venligst en anden for dit nuværende tema."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s har sat emnet til %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Rum logging er nu aktiveret"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Rum logging er nu deaktiveret"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Rummet er nu ikke-anonymt"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Rummet er nu semi-anonymt"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Rummet er nu helt anonymt"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Anfør dit nye kælenavn:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9048,22 +9727,22 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
@@ -9087,64 +9766,58 @@ msgstr "_Rapporter Fejl"
 msgid "Details"
 msgstr "Detaljer"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Fejl ved læsning af fil:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber client"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 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:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Udvidelse er ikke understøttet"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Gem Billede som..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9155,93 +9828,87 @@ msgstr ""
 "anden indehaver.\n"
 "Specificer venligst et andet kælenavn under:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 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:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> 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."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Du er bandlyst fra gruppesamtalen %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Abonnement forespørgsel"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9249,107 +9916,103 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Frameldt abonnement"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke blive etableret"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
-
-#: ../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: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:934
-msgid "Room logging is now enabled"
-msgstr "Rum logging er nu aktiveret"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Rum logging er nu deaktiveret"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Rummet er nu ikke-anonymt"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Rummet er nu semi-anonymt"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Rummet er nu helt anonymt"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Dit pgp-løsen er ikke korrekt"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenPGP-løsen er ikke korrekt"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Certifikatet er udløbet"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG nøglen kan ikke stoles på"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 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:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9364,80 +10027,65 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../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:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Fejl ved åbning af fil"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Filoverførsler"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ikke i stand til at dekryptere beskeden fra %s\n"
-"Det er mulig den er blevet forfalsket."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Ikke i stand til at dekryptere beskeden"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s .s)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Fejl."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9446,21 +10094,21 @@ msgstr ""
 "venligst en ny"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9471,15 +10119,20 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL certifikat fejl"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL certifikat fejl"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9496,28 +10149,7 @@ msgstr ""
 "\n"
 "Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"Du er ved at sende din adgangskode på en usikker forbindelse. Du bør "
-"installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
-"dette?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9526,7 +10158,7 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9536,11 +10168,11 @@ msgstr ""
 "sikker på du vil gøre dette?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9548,7 +10180,7 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9558,90 +10190,93 @@ msgstr ""
 "opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG nøgle er udløbet"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "opretter %s katalog"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finde historik log databasen"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakter"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Kælenavn"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Besked"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Emne"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Vil du rydde op i databasen? (DETTE ER IKKE ANBEFALET HVIS GAJIM KØRER)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9655,93 +10290,108 @@ msgstr ""
 "\n"
 "I tilfælde du trykker JA, venligst vent..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Database Fejl"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Eksporter Historik Log..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s klokken %(time)s sagde: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Vil du virkelig slette loggen for den valgte kontakt?"
-msgstr[1] "Vil du virkelig slette loggene fra de valgte kontakter?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Vil du virkelig slette den valgte besked?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Vil du virkelig slette loggen for den valgte kontakt?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Dette er en irreversibel handling."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Annuller bekræftelse"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vil du virkelig slette den valgte besked?"
 msgstr[1] "Vil du virkelig slette de valgte beskeder?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversations Historik med %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Disk Skrivefejl"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Fejl: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Fejl"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Tidsudløb nået for at laste billede"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Koder"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Billede er for stort"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Du er ved at lukke flere faneblade"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Vil du virkelig lukke dem alle?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Beskeder"
 
@@ -9753,100 +10403,112 @@ msgstr "- beskeder vil blive logget"
 msgid "- messages will not be logged"
 msgstr "- beskeder vil ikke blive logget"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Ændrede Status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignorer"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Loggede Ind"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Loggede Ud"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Udeluk %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Ny Besked fra %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Tilslutning fejlede"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Ny Privat Besked fra gruppe samtale %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Tjeneste sendte malformeret data"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Besked fra %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Denne fil eksisterer allerede"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Ny Besked fra %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorer"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Rum Konfigurering"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Filen er tom"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontakt Information"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Information modtaget"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Information er IKKE publiceret"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard publicering fejlede"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9854,53 +10516,54 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu vil %s vide din status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9908,38 +10571,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Skal Gajim afsluttes?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på du vil afslutte Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Altid afslut Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Annuller filoverførsel"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9947,16 +10610,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:2720
+#: ../src/roster_window.py:2989
 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:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9964,11 +10627,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:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9977,11 +10640,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:2800
+#: ../src/roster_window.py:3043
 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:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9990,56 +10653,56 @@ msgstr ""
 "dig."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10048,11 +10711,11 @@ msgstr ""
 "vil altid se dig som offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10060,16 +10723,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10079,14 +10742,14 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10095,34 +10758,35 @@ 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Din server understøtter ikke muligheden for at gemme metakontakt "
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10131,23 +10795,28 @@ 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:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Lav %s og %s til metakontakter"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Lav %s og %s til metakontakter"
@@ -10157,130 +10826,130 @@ msgstr "Lav %s og %s til metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "til %s konto"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "bruger %s konto"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Håndter Bog_mærker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "fra konto %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Tilpas Tjenester..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Ændre _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Kør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Omdøb"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Tilslut igen"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Ændre Status Besked..."
 
@@ -10297,24 +10966,14 @@ msgstr "Fejl i modtaget dataform"
 msgid "No result"
 msgstr "Intet resultat"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Disk SkriveFejl"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Emne: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Bekræft disse sessions indstillinger"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10326,7 +10985,7 @@ msgstr ""
 "\n"
 "\tKan disse indstillinger godkendes?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10341,147 +11000,152 @@ msgstr ""
 "\n"
 "Fortsæt med sessionen?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Er OpenPGP aktiveret for denne kontakt?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Ændre Status Besked..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktvinduet"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s af denne gruppe samtale"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blokeret]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimeret]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Sidste status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Tilslutning afbrudt"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Abonnering: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Humør:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivitet:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Melodi:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Påmindelse"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Hent"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Send"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Fuldført"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Midlertidig stoppet"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Hænger"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjeneste har endnu ikke svaret med detaljeret information"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10489,32 +11153,32 @@ msgstr ""
 "Denne tjeneste kunne ikke svare med detaljeret information.\n"
 "Den er højst sandsynlig ikke fungerende"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Client:Ukendt"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Ukendt"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Tid:Ukendt"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10522,7 +11186,7 @@ msgstr ""
 "Denne kontakt er interesseret i din tilstedeværelses information, men du er "
 "ikke interesseret i hans/hendes tilstedeværelse"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10530,14 +11194,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10545,18 +11209,388 @@ msgstr ""
 "Du er ikke interesseret i kontaktens tilstedeværelse, og han/hun er ikke "
 "interesseret i din"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Vælg en Fil at Sende..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "et vindue/faneblad åbnede med denne kontakt "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Handlinger</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Betingelser</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Avancerede Handlinger"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Avanceret Påmindelses Kontrol"
+
+#~ msgid "All statuses"
+#~ msgstr "Status For Alle"
+
+#~ msgid "Busy "
+#~ msgstr "Travlt "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt Ændrede Status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt er ikke Tilsluttet"
+
+#~ msgid "Don't have "
+#~ msgstr "Har ikke"
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Filoverførsel Stoppede"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Gruppe Samtale Besked Fremhævning"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Gruppe Samtale Besked Modtaget"
+
+#~ msgid "Have "
+#~ msgstr "Har"
+
+#~ msgid "Launch a command"
+#~ msgstr "Kør en kommando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "En eller flere specielle statuser..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "På net / Klar For Samtale"
+
+#~ msgid "Play a sound"
+#~ msgstr "Spil en lyd"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Ny Privat Besked"
+
+#~ msgid "When "
+#~ msgstr "Når "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktiver vindueshåndteringens ViktigFif for at få samtale vinduet til at "
+#~ "blinke i opgavelinjen"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Deaktivér automatisk åbning af samtale vindue"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Deaktivér eksisterende pop op vinduer"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Deaktivér nuværende lyd for denne hændelse"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Deaktivér visning af hændelse i kontaktvinduet"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Deaktivér visning af hændelse i kontaktvinduet"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informer mig med et pop op vindue"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Vis hændelse i kontaktvindue"
+
+#~ msgid "and I "
+#~ msgstr "og jeg "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontakter"
+
+#~ msgid "for "
+#~ msgstr "for "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupper"
+
+#~ msgid "when I'm in"
+#~ msgstr "når jeg er i"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Till_ad ham/hende at se min status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Beskrivelse: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Avanceret..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Vis kontakternes _aktivitet i kontaktvinduet"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Vis kontak_ternes melodier i kontaktvinduet"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Vis kontakternes humør i kontaktvinduet"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr "Hvis valgt vil Gajim vise kontakternes aktivitet i kontaktvinduet"
+
+#, 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"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Send en Enkel _Besked..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Bruger avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "Engelsk"
+
+#~ msgid "Belarusian"
+#~ msgstr "Belarusian"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarsk"
+
+#~ msgid "Breton"
+#~ msgstr "Bretonsk"
+
+#~ msgid "Czech"
+#~ msgstr "Tjekkisk"
+
+#~ msgid "German"
+#~ msgstr "Tysk"
+
+#~ msgid "Greek"
+#~ msgstr "Græsk"
+
+#~ msgid "British"
+#~ msgstr "Britisk"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spansk"
+
+#~ msgid "Basque"
+#~ msgstr "Baskisk"
+
+#~ msgid "French"
+#~ msgstr "Fransk"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroatisk"
+
+#~ msgid "Italian"
+#~ msgstr "Italiensk"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norsk (bokmål)"
+
+#~ msgid "Dutch"
+#~ msgstr "Hollandsk"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norsk"
+
+#~ msgid "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugisisk"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brasiliansk Portugisisk"
+
+#~ msgid "Russian"
+#~ msgstr "Russisk"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbisk"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovakisk"
+
+#~ msgid "Swedish"
+#~ msgstr "Svensk"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kinesisk"
+
+#~ msgid "Spelling language"
+#~ msgstr "Sprog for stavekontrollen"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Hvis Sandt vil Gajim omdanne strengen mellem $$ og $$ til et billede med "
+#~ "dvips og omdanne det inden det bliver sat ind i et samtale vindue."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Du kan ændre værdien for at ændre størrelsen af latex formler som bliver "
+#~ "vist. Jo højere jo større."
+
+#~ msgid "all or space separated status"
+#~ msgstr "alt eller mellemrums separeret status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'ja', 'nej', eller 'begge'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'ja', 'nej' eller ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Kontroller din tilslutning eller prøv igen senere"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Fejl under kørsel af \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "fejl: kan ikke åbne %s for læsning"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Ikke i stand til at tildele port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Måske har du en anden instans af Gajim kørende. Filoverførsler vil blive "
+#~ "annulleret."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "En GTK+ jabber klient"
+
+#~ msgid "Condition"
+#~ msgstr "Betingelse"
+
+#~ msgid "when I am "
+#~ msgstr "når jeg er"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Kræver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Kræver gpg og python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Omdan LaTeX udtryk mellem $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Kræver texlive-latex-base og dvipng (begge findes i MikTeX). Du må sætte "
+#~ "'use_latex' til True i den avancerede konfigurations editor."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Kræver python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
+
+#, fuzzy
+#~ 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)"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakter"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Disk SkriveFejl"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Emne: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Humør:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivitet:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10576,32 +11610,12 @@ msgstr " ressource med prioritet "
 #~ 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"
 
@@ -10704,9 +11718,6 @@ msgstr " ressource med prioritet "
 #~ "Historik For Gruppesamtaler\n"
 #~ "Historik For Alle Samtaler"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Håndter Kontoer"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-slet"
 
diff --git a/po/de.po b/po/de.po
index d472b72e3..338713d04 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 16:01+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2010-08-03 22:43+0200\n"
 "Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -22,311 +22,298 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 0.2\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Persönliche Ereignisse"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Chat starten …"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Gruppenchat betreten …"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "Kont_akt hinzufügen …"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "B_efehl ausführen …"
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "Konto _bearbeiten"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "Google-Mail-Posteingang _öffnen"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Persönliche Ereignisse"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Chat starten …"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "Konto _bearbeiten"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Assistent zum Einrichten eines neuen Kontos"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Zum Server verbinden</b>\n"
-"\n"
-"Bitte warten …"
+"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
+"verbinden können."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Bitte wählen Sie eine der Optionen aus:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Bitte tragen Sie die Daten für Ihr bestehendes Konto ein</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Bitte einen Server wählen</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Passwort:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n"
-"SHA1-Fingerprint dieses Zertifikates:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Pass_wort speichern"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_yme Authentifizierung"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Verbinden, sobald ich auf Fertig klicke"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber-ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Assistent zum Einrichten eines neuen Kontos"
+msgid "Anon_ymous authentication"
+msgstr "Anon_yme Authentifizierung"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Bitte einen Server wählen</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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."
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Verwalten …"
 
 #: ../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:1289 ../src/config.py:1392 ../src/config.py:1703
-#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353
-#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719
-#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
-#: ../src/dialogs.py:532 ../src/roster_window.py:3091
-#: ../src/roster_window.py:3097 ../src/roster_window.py:3102
-msgid "None"
-msgstr "Kein Proxy"
+msgid "Use custom hostname/port"
+msgstr "Benutzerdefinierten Rechnernamen und Port verwenden"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "Rec_hnername:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Pass_wort speichern"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Erweitert"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
-"verbinden können."
+"Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n"
+"SHA1-Fingerprint dieses Zertifikates:\n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:17
-msgid "_Advanced"
-msgstr "_Erweitert"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Beenden"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Rec_hnername:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Zum Server verbinden</b>\n"
+"\n"
+"Bitte warten …"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+msgid "Connect when I press Finish"
+msgstr "Verbinden, sobald ich auf Fertig klicke"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "_Password:"
-msgstr "_Passwort:"
+msgid "Set my profile when I connect"
+msgstr "Mein Profil setzen, wenn ich mich verbinde"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Beenden"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Verschiedenes</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Kein Proxy"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Konten"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Persönliche Informationen</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Löschen"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Mit Status _abgleichen"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "_Umbenennen"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Konto"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Aktivi_eren"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Konten"
+msgid "Anonymous authentication"
+msgstr "Anonyme Authentifizierung"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administrative Aktionen"
+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 ""
+"Die Ressource wird zum Jabber-Server geschickt, um die selbe Jabber-ID in "
+"mehre Teile zu trennen, wenn verschiedene Jabber-Clients mit demselben Konto "
+"verbunden sind. Man kann also mit verschiedenen Ressourcen, z.B. \"Heim\" "
+"und \"Arbeit\", an verschiedenen Computern dasselbe Konto benutzen. Die "
+"Ressource mit der höchsten Priorität (siehe unten) erhält die Nachrichten."
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonyme Authentifizierung"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatisch neu verbinden, falls die Verbindung abbricht"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Kontakte synchronisieren"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "_Durchsuche"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen."
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Beim Pr_ogrammstart verbinden"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Pass_wort ändern"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klicken, um das Konto-Passwort zu ändern."
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Falls aktiviert, fragt Gajim nach, bevor das Passwort über eine unsichere "
-"Verbindung gesendet wird."
+msgid "Administration operations"
+msgstr "Administrative Aktionen"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "Clientzertifikat auswählen …"
+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 ""
+"Die Priorität legt fest, an welchen Client der Jabber-Server neue "
+"Nachrichten sendet, wenn zwei oder mehr Clients mit demselben Konto "
+"verbunden sind. Der Client mit der höchsten Priorität wird ausgewählt."
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "_Schlüssel wählen …"
+msgid "A_djust to status"
+msgstr "Mit Status _abgleichen"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klicken, um das Konto-Passwort zu ändern."
+msgid "Priority will change automatically according to your status."
+msgstr ""
+"Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen."
+msgid "Priori_ty:"
+msgstr "Priori_tät:"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "Clientzertifikat"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Beim _Programmstart verbinden"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Verbindung"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Vorname:"
+msgid "Resour_ce:"
+msgstr "Ressour_ce:"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
-#: ../src/notify.py:474 ../src/notify.py:497 ../src/notify.py:546
-#: ../src/notify.py:562
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr "Datei für _Clientzertifikat:"
 
-#. 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:56
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124
-#: ../src/roster_window.py:3033 ../src/roster_window.py:5648
-msgid "General"
-msgstr "Allgemein"
+#: ../data/gui/accounts_window.ui.h:25
+msgid "Browse..."
+msgstr "_Durchsuche"
 
 #: ../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 ""
-"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-"
-"Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung "
-"erhöht wird."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Zertifikat abgelehnt"
 
-# TODO: GPG/PGP unification in original strings needed
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie "
-"seahorse."
+msgid "Client certificate"
+msgstr "Clientzertifikat"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Konto"
 
 #: ../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 ""
-"Falls aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen "
-"Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern."
+msgid "C_onnect on Gajim startup"
+msgstr "Beim Pr_ogrammstart verbinden"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -337,6 +324,18 @@ msgstr ""
 "mit diesem Konto."
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatisch neu verbinden, falls die Verbindung abbricht"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Unterhaltungsver_lauf für alle Kontakte dieses Kontos speichern"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Konto-Status mit globalem Status synch_ronisieren"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -346,178 +345,208 @@ msgstr ""
 "der Auswahlbox unter der Kontaktliste) auch der Status dieses Kontos "
 "entsprechend geändert."
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Falls der Standardport, der für eingehende Nachrichten benutzt wird, nicht "
-"für Ihre Konfiguration geeignet ist, können Sie hier einen anderen Port "
-"festlegen.\n"
-"Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:1826
-#: ../src/dialogs.py:837
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+msgid "Use file transfer proxies"
+msgstr "Dateiübertragungs-Proxys verwenden"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Nachname:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-"
+"Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung "
+"erhöht wird."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Konten _zusammenführen"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Allgemein"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
-#: ../src/config.py:2367
-msgid "No key selected"
-msgstr "Kein Schlüssel ausgewählt"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "Umgebungsvariable HTTP__PROXY ben_utzen"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Persönliche Informationen"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Verwalten …"
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tät:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Warnen, bevor eine unsichere Verbindung verwendet wird"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Die Priorität legt fest, an welchen Client der Jabber-Server neue "
-"Nachrichten sendet, wenn zwei oder mehr Clients mit demselben Konto "
-"verbunden sind. Der Client mit der höchsten Priorität wird ausgewählt."
+"Falls aktiviert, fragt Gajim nach, bevor das Passwort über eine unsichere "
+"Verbindung gesendet wird."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr ""
-"Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
+msgid "Send _keep-alive packets"
+msgstr "_Keepalive-Pakete senden"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5598
-msgid "Re_name"
-msgstr "_Umbenennen"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Falls aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen "
+"Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern."
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Ressour_ce:"
+msgid "Use cust_om hostname/port"
+msgstr "Benutzerdefinierten Rechnernamen und P_ort verwenden"
 
 #: ../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 ""
-"Die Ressource wird zum Jabber-Server geschickt, um die selbe Jabber-ID in "
-"mehre Teile zu trennen, wenn verschiedene Jabber-Clients mit demselben Konto "
-"verbunden sind. Man kann also mit verschiedenen Ressourcen, z.B. \"Heim\" "
-"und \"Arbeit\", an verschiedenen Computern dasselbe Konto benutzen. Die "
-"Ressource mit der höchsten Priorität (siehe unten) erhält die Nachrichten."
+msgid "_Hostname: "
+msgstr "Rec_hnername: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Unterhaltungsver_lauf für alle Kontakte dieses Kontos speichern"
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Verschiedenes</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "_Keepalive-Pakete senden"
+msgid "Connection"
+msgstr "Verbindung"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Konto-Status mit globalem Status synch_ronisieren"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Kein Schlüssel ausgewählt"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Konto-Status mit globalem Status synchroni_sieren"
+msgid "Choose _Key..."
+msgstr "_Schlüssel wählen …"
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Kontakte synchronisieren"
+msgid "Use G_PG Agent"
+msgstr "G_PG Schlüsselverwaltung verwenden"
 
+# TODO: GPG/PGP unification in original strings needed
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "Pfad zum Clientzertifikat und Schlüssel im PKCS#12 Format"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie "
+"seahorse."
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "G_PG Schlüsselverwaltung verwenden"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Benutzerdefinierten Rechnernamen und P_ort verwenden"
+msgid "_Edit Personal Information..."
+msgstr "Persönliche Informationen b_earbeiten …"
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Benutzerdefinierten P_ort verwenden:"
+msgid "Information about you, as stored in the server"
+msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Dateiübertragungs-Proxys verwenden"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Persönliche Informationen</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr "Datei für _Clientzertifikat:"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Persönliche Informationen"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "Persönliche Informationen b_earbeiten …"
+msgid "Co_nnect on Gajim startup"
+msgstr "Beim _Programmstart verbinden"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Aktivi_eren"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Konto-Status mit globalem Status synchroni_sieren"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "Rec_hnername: "
+msgid "Use cust_om port:"
+msgstr "Benutzerdefinierten P_ort verwenden:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Verwalten …"
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Falls der Standardport, der für eingehende Nachrichten benutzt wird, nicht "
+"für Ihre Konfiguration geeignet ist, können Sie hier einen anderen Port "
+"festlegen.\n"
+"Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Vorname:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Nachname:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Warnen, bevor eine unsichere Verbindung verwendet wird"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "Umgebungsvariable HTTP__PROXY ben_utzen"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber-ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Konten _zusammenführen"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Konto:"
+msgid "Add New Contact"
+msgstr "Neuen Kontakt hinzufügen"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Er_laube diesem Kontakt, meinen Status zu sehen"
+msgid "A_ccount:"
+msgstr "_Konto:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Neuen Kontakt hinzufügen"
+msgid "_Protocol:"
+msgstr "_Protokoll:"
 
-#: ../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 "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "Ben_utzer-ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "Spitz_name:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Gruppe:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Er_laube diesem Kontakt, meinen Status zu sehen"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "_Abonnementnachricht speichern"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -529,7 +558,11 @@ msgstr ""
 "Protokoll hinzufügen zu können. Klicken\n"
 "Sie auf Registrieren, um fortzufahren."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registrieren"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -537,198 +570,188 @@ msgstr ""
 "Sie müssen mit dem Transport verbunden sein, um einen\n"
 "Kontakt über dieses Protokoll hinzufügen zu können."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Gruppe:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "_Nickname:"
-msgstr "Spitz_name:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokoll:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registrieren"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "_Abonnementnachricht speichern"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "Ben_utzer-ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Es ist ein Fehler aufgetreten:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Befehle - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Wählen Sie den auszuführenden Befehl:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Bitte warten Sie, während die Befehlsliste empfangen wird …"
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Befehle - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Wählen Sie den auszuführenden Befehl:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Noch einmal überprüfen"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Fehlerbeschreibung …"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Bitte warten Sie, während der Befehl gesendet wird …"
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "_Fertigstellen"
+msgid "Please wait..."
+msgstr "Bitte warten …"
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Bitte warten Sie, während die Befehlsliste empfangen wird …"
+msgid "This jabber entity does not expose any commands."
+msgstr "Diese Jabber-Instanz zeigt keine Befehle an."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Bitte warten Sie, während der Befehl gesendet wird …"
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Es ist ein Fehler aufgetreten:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Bitte warten …"
+msgid "Error description..."
+msgstr "Fehlerbeschreibung …"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Diese Jabber-Instanz zeigt keine Befehle an."
+msgid "F_inish"
+msgstr "_Fertigstellen"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Erweiterter Konfigurationseditor"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Beschreibung</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>HINWEIS:</b> Sie sollten Gajim neu starten, damit alle Änderungen in "
 "Kraft treten."
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Erweiterter Konfigurationseditor"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Auf Standardfarben zu_rücksetzen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Nachricht des Tages (MOTD) _löschen"
+msgid "Show _XML Console"
+msgstr "_XML-Konsole anzeigen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "_Privatsphären-Listen bearbeiten …"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
+msgid "_Send Server Message..."
+msgstr "Servernachricht _senden …"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 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:6
-msgid "Set MOTD..."
-msgstr "Nachricht des Tages (MOTD) setzen …"
-
 #: ../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:8
-msgid "Show _XML Console"
-msgstr "_XML-Konsole anzeigen"
+msgid "Set MOTD..."
+msgstr "Nachricht des Tages (MOTD) setzen …"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Nachricht des Tages (MOTD) aktualisieren …"
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Nachricht des Tages (MOTD) aktualisieren …"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Nachricht des Tages (MOTD) _löschen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "Servernachricht _senden …"
+msgid "Deletes Message of the Day"
+msgstr "Löscht die Nachricht des Tages (MOTD)."
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Kein Proxy"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Einstellungen"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Automatisch verbinden"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Kein Proxy"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Einstellungen"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Automatisch verbinden"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Eintrag:"
+msgid "New entry received"
+msgstr "Neuer Eintrag empfangen"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Sie haben einen neuen Eintrag erhalten:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed-Name:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Eintrag:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Zuletzt geändert:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Neuer Eintrag empfangen"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Sie haben einen neuen Eintrag erhalten:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
@@ -736,206 +759,185 @@ 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:14 ../src/roster_window.py:5617
-#: ../src/roster_window.py:5744 ../src/roster_window.py:5877
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Entblocken"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Nachricht:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Aktivität setzen"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Setze Aktivität"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Nachricht:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Nachricht:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Stimmung:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Nachricht:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Passwort ändern"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Zur Bestätigung erneut eingeben:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Neues Passwort eingeben:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Zur Bestätigung erneut eingeben:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Geben Sie Ihre neue Statusnachricht ein</b>"
+msgid "Save as Preset..."
+msgstr "Als Voreinstellung speichern …"
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivität:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Stimmung:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivität:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Voreingestellte Nachrichten:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Als Voreinstellung speichern …"
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Geben Sie Ihre neue Statusnachricht ein</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "_Chatraum betreten …"
+msgid "_Copy Link Location"
+msgstr "Link-Adresse _kopieren"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "Zur Kont_aktliste hinzufügen …"
+msgid "_Open Link in Browser"
+msgstr "Link im Br_owser öffnen"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "Jabber-ID/E-Mail-Adresse _kopieren"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "Link-Adresse _kopieren"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "E-Mail-Pr_ogramm öffnen"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "Link im Br_owser öffnen"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "Chat _starten"
 
-#: ../data/gui/chat_control.ui.h:1
-msgid "#"
-msgstr "Nr."
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "_Chatraum betreten …"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "Zur Kont_aktliste hinzufügen …"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Emoticons (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Kontakt zur Kontaktliste hinzufügen (Strg+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Chatverlauf anzeigen (Strg+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Liste erweiterter Funktionen anzeigen (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "Nr."
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Nachricht senden"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Senden"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr "9"
 
-#: ../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:275
-msgid "_Send"
-msgstr "_Senden"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "Bezeichung"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "_Einladen zu"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Freunde einladen!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC-Server"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Bitte wählen Sie einen MUC-Server aus."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -943,122 +945,138 @@ msgstr ""
 "Sie möchten einen Multi-User-Chat beginnen.\n"
 "Bitte wählen Sie die Kontakte, die Sie einladen möchten"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Kontakt darum bitten, seinen Status ein_sehbar zu machen"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Bitte wählen Sie einen MUC-Server aus."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Spezielle Be_nachrichtigung hinzufügen …"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC-Server"
 
-# TODO: GPG/PGP unification in original strings needed
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Open_PGP-Schlüssel zuweisen …"
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "_Einladen zu"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "B_efehl ausführen …"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "_Chat starten"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "_Gruppen bearbeiten …"
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Einzelne _Nachricht senden …"
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "_Datei senden …"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5553
-#: ../src/roster_window.py:5712
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "_Kontakte einladen"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Ent_fernen"
+# TODO: GPG/PGP unification in original strings needed
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Open_PGP-Verschlüsselung aktivieren"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "ESession-Verschlüsselung aktivieren"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5563
-#: ../src/roster_window.py:5801
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Benu_tzerdefinierten Status senden"
 
-#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Einzelne _Nachricht senden …"
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "B_efehl ausführen …"
+
+#: ../data/gui/contact_context_menu.ui.h:10
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Kontakt _verwalten"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "_Datei senden …"
+msgid "_Rename..."
+msgstr "_Umbenennen …"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Benutzerdefinierten Avatar wählen …"
+msgid "Edit _Groups..."
+msgstr "_Gruppen bearbeiten …"
 
+# TODO: GPG/PGP unification in original strings needed
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "_Chat starten"
+msgid "Assign Open_PGP Key..."
+msgstr "Open_PGP-Schlüssel zuweisen …"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "ESession-Verschlüsselung aktivieren"
+msgid "Set Custom _Avatar..."
+msgstr "Benutzerdefinierten Avatar wählen …"
 
-# TODO: GPG/PGP unification in original strings needed
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Open_PGP-Verschlüsselung aktivieren"
+msgid "Add Special _Notification..."
+msgstr "Spezielle Be_nachrichtigung hinzufügen …"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Abonnement"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Er_laube diesem Kontakt, meinen Status zu sehen"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5625
-#: ../src/roster_window.py:5750 ../src/roster_window.py:5880
-msgid "_Block"
-msgstr "_Blockieren"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Kontakt darum bitten, seinen Status ein_sehbar zu machen"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:9 ../data/gui/roster_window.ui.h:23
-#: ../src/roster_window.py:5951
-msgid "_History"
-msgstr "_Verlauf"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorieren"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blockieren"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "Kontakt _verwalten"
+msgid "_Unignore"
+msgstr "Ignorieren a_ufheben"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Umbenennen …"
+msgid "_Ignore"
+msgstr "_Ignorieren"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Abonnement"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Ent_fernen"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "Ignorieren a_ufheben"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Verlauf"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Bitte füllen Sie das Formular aus."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Chatraum-Einstellungen"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Bitte füllen Sie das Formular aus."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Gruppen bearbeiten"
@@ -1071,59 +1089,50 @@ msgstr "(<b>ESession</b>-Informationen)"
 msgid "_Verify"
 msgstr "_Überprüfen"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Features"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Liste der verwendbaren Features:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Features"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateiübertragungen"
+msgid "File Transfers"
+msgstr "Dateiübertragungen"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Dateiübertragung abbrechen"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Zeigt eine Liste von Dateiübertragungen an."
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Bricht die ausgewählte Dateiübertragung ab."
+msgid "file transfers list"
+msgstr "Dateiübertragungs-Liste"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Bricht die ausgewählte Dateiübertragung ab und löscht die unvollständige "
-"Datei."
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateiübertragungen"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Aufrä_umen"
+msgid "_Notify me when a file transfer is complete"
+msgstr "Be_nachrichtige mich, wenn die Dateiübertragung abgeschlossen ist"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Dateiübertragungen"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+"Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Versteckt das Fenster."
-
-#: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Entferne Dateiübertragung aus der Liste"
-
-#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Entfernt beendete, abgebrochene und fehlgeschlagene Dateiübertragungen aus "
 "der Liste."
 
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Zeigt eine Liste von Dateiübertragungen an."
+#: ../data/gui/filetransfers.ui.h:8
+msgid "Remove file transfer from the list."
+msgstr "Entferne Dateiübertragung aus der Liste"
 
-#: ../data/gui/filetransfers.ui.h:11
+#: ../data/gui/filetransfers.ui.h:9
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1131,80 +1140,107 @@ msgstr ""
 "Diese Aktion entfernt eine Dateiübertragung aus der Liste. Falls die "
 "Übertragung aktiv ist, wird sie erst gestoppt und anschließend entfernt."
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Aufrä_umen"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pause"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
-"Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
+"Bricht die ausgewählte Dateiübertragung ab und löscht die unvollständige "
+"Datei."
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
-msgid "_Continue"
-msgstr "_Fortsetzen"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Dateiübertragung abbrechen"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "Be_nachrichtige mich, wenn die Dateiübertragung abgeschlossen ist"
+msgid "Cancels the selected file transfer"
+msgstr "Bricht die ausgewählte Dateiübertragung ab."
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "Öffne _Ordner"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Versteckt das Fenster."
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pause"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Fortsetzen"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "Dateiübertragungs-Liste"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "Öffne _Ordner"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Tabellenfarben des Chat-Status</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "Kontoreihe"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1029
-msgid "Bold"
-msgstr "Fett"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "Gruppenreihe"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "Kontaktreihe"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "Chat-Banner"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Erstellen"
+msgid "Gajim Themes Customization"
+msgstr "Gajim-Design-Einstellungen"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "Kontaktreihe"
+msgid "Text _color:"
+msgstr "Text_farbe:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Schriftart:"
+msgid "_Background:"
+msgstr "_Hintergrund:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim-Design-Einstellungen"
+msgid "Text _font:"
+msgstr "Schri_ftart:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Weg"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "Gruppenreihe"
+msgid "Font style:"
+msgstr "Schriftart:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inaktiv"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Fett"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1030
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kursiv"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Unterbrochen"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Erstellen"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inaktiv"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Tabellenfarben des Chat-Status</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Weg"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1212,7 +1248,7 @@ msgstr ""
 "MUC\n"
 "Nachrichten"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1220,111 +1256,99 @@ msgstr ""
 "an MUC gerichtete\n"
 "Nachrichten"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Unterbrochen"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Text_farbe:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Schri_ftart:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Hintergrund:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Spitz_name ändern …"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Chatraum _verwalten"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "_Thema ändern …"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Chat_raum einrichten …"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "Chatraum zu den Lesezeichen _hinzufügen"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Chatraum auflösen"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Chatraum _verwalten"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "Beim Schließen _minimieren"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
 msgid "_Request Voice"
 msgstr "_Stimme verleihen"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "Chatraum zu den Lesezeichen _hinzufügen"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "_Send Private Message"
+msgstr "Private Nachricht _senden"
+
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "Send _File"
+msgstr "_Datei senden"
 
 #: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "Benutzeraktionen"
 
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "Send _File"
-msgstr "_Datei senden"
+msgid "_Voice"
+msgstr "_Stimme verleihen"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
-msgid "_Add to Roster"
-msgstr "Zur Kont_aktliste hinzufügen"
+msgid "Mo_derator"
+msgstr "Mo_derator"
 
 #: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Mitglied"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:7
-msgid "_Ban"
-msgstr "Ver_bannen"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Besitzer"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Rausschmeißen"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Member"
-msgstr "_Mitglied"
+#: ../data/gui/gc_occupants_menu.ui.h:10
+msgid "_Ban"
+msgstr "Ver_bannen"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Owner"
-msgstr "_Besitzer"
-
-#: ../data/gui/gc_occupants_menu.ui.h:13
-msgid "_Send Private Message"
-msgstr "Private Nachricht _senden"
-
-#: ../data/gui/gc_occupants_menu.ui.h:15
-msgid "_Voice"
-msgstr "_Stimme verleihen"
+msgid "_Add to Roster"
+msgstr "Zur Kont_aktliste hinzufügen"
 
-# 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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Schriftformatierung (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Spitzname ändern (Strg+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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)"
+# TODO: Synchronize with other strings concerning bookmarks
+#: ../data/gui/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Diesen Chatraum speichern (Strg+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1336,34 +1360,19 @@ msgid "From:"
 msgstr "Von:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Betreff:"
 
 #: ../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."
-msgstr ""
-"<b>WARNUNG:</b>\n"
-"Wenn Sie viel löschen möchten, beenden Sie Gajim vorher. Vermeiden Sie "
-"generell Löschungen von Unterhaltungen mit Kontakten, mit denen Sie gerade "
-"chatten."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim-Verlaufsmanager"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Willkommen im Gajim-Verlaufsmanager</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "Export"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Gajim-Verlaufsmanager"
-
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1378,170 +1387,195 @@ msgstr ""
 "Benutzen Sie dieses Programm, um Logs zu löschen oder zu exportieren. Sie "
 "können links Logeinträge auswählen und unten die Datenbank durchsuchen."
 
-#: ../data/gui/history_manager.ui.h:9
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>WARNUNG:</b>\n"
+"Wenn Sie viel löschen möchten, beenden Sie Gajim vorher. Vermeiden Sie "
+"generell Löschungen von Unterhaltungen mit Kontakten, mit denen Sie gerade "
+"chatten."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "Durch_suche Datenbank"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "Alle Chatverläufe"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Unterhaltungsverlauf"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Export"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "Bitte JID oder Kontaktnamen eingeben"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr "Gruppenchatverläufe"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "Alle Chatverläufe"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Unterhaltungsverlauf"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Suchen:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Unterhaltungsver_lauf"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Logge die Statusveränderungen von Kontakten"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-#, fuzzy
-msgid "body"
-msgstr "Jeder"
+msgid "save"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Heiß"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "Jabber-ID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr ""
+#, fuzzy
+msgid "body"
+msgstr "Jeder"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "Jabber-ID"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Heiß"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Räume _Durchsuchen"
-
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2298
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Chatraum betreten"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "Betrete diesen Chatraum _automatisch, wenn ich mich verbinde"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Chatraum:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Spitzname:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Kürzlich:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Kürzlich:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "Betrete diesen Chatraum _automatisch, wenn ich mich verbinde"
 
+# TODO: Synchronize with other strings concerning bookmarks
 #: ../data/gui/join_groupchat_window.ui.h:8
-msgid "Room:"
-msgstr "Chatraum:"
+msgid "_Bookmark this room"
+msgstr "Diesen _Chatraum merken"
 
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
-# TODO: Synchronize with other strings concerning bookmarks
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "Diesen _Chatraum merken"
+msgid "Bro_wse Rooms"
+msgstr "Räume _Durchsuchen"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Betreten"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-#, fuzzy
-msgid "A_uto join"
-msgstr "Automatisch verbinden"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Falls aktiviert, tritt Gajim diesem Chatraum beim Programmstart bei."
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Chatraum-Lesezeichen"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 #, fuzzy
-msgid "Minimi_ze on Auto Join"
-msgstr "Minimieren bei automatischem Beitritt"
+msgid "_Title:"
+msgstr "Titel:"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 #, fuzzy
 msgid "Pr_int status:"
 msgstr "Status anzeigen:"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Roo_m:"
-msgstr ""
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatisch verbinden"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Falls aktiviert, tritt Gajim diesem Chatraum beim Programmstart bei."
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
 #, fuzzy
-msgid "_Title:"
-msgstr "Titel:"
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimieren bei automatischem Beitritt"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1552,141 +1586,132 @@ msgid "_Configure"
 msgstr "_Einstellen"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Eigenschaften</b>"
+msgid "HTTP Connect"
+msgstr "HTTP-Verbindung"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Einstellungen</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP-Verbindung"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Proxy-Verwaltung"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Art:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pass_wort:"
+msgid "_Name:"
+msgstr "_Name:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxy-A_dresse:"
+msgid "<b>Properties</b>"
+msgstr "<b>Eigenschaften</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxy-_Port:"
+msgid "Use HTTP prox_y"
+msgstr "HTTP-Prox_y verwenden"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH-Adresse:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "HTTP-Prox_y verwenden"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Authentifizierung _verwenden"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Benutzername:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH-Adresse:"
+msgid "Pass_word:"
+msgstr "Pass_wort:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Name:"
+msgid "Proxy _Host:"
+msgstr "Proxy-A_dresse:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Art:"
+msgid "Proxy _Port:"
+msgstr "Proxy-_Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Benutzername:"
+msgid "<b>Settings</b>"
+msgstr "<b>Einstellungen</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Konten verwalten"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torisieren"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Angemeldet"
+msgid "Version:"
+msgstr "GTK+-Version:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Einstellen"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Description:"
-msgstr "Beschreibung: "
+msgid "Authors:"
+msgstr "Au_torisieren"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
-msgid "Descrition:"
-msgstr "Beschreibung: "
-
-#: ../data/gui/plugins_window.ui.h:8
-#, fuzzy
 msgid "Homepage:"
 msgstr "<b>Homepage:</b>"
 
-#: ../data/gui/plugins_window.ui.h:9
-msgid "Install"
+#: ../data/gui/plugins_window.ui.h:8
+msgid "homepage url"
 msgstr ""
 
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Steht still"
-
-#: ../data/gui/plugins_window.ui.h:11
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:12
-msgid "Plugins"
-msgstr ""
+msgid "Description:"
+msgstr "Beschreibung: "
 
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:10
 msgid "Uninstall"
 msgstr ""
 
-#: ../data/gui/plugins_window.ui.h:14
+#: ../data/gui/plugins_window.ui.h:11
 #, fuzzy
-msgid "Version:"
-msgstr "GTK+-Version:"
+msgid "Configure"
+msgstr "_Einstellen"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "button"
-msgstr ""
+#: ../data/gui/plugins_window.ui.h:12
+#, fuzzy
+msgid "Installed"
+msgstr "Steht still"
 
-#: ../data/gui/plugins_window.ui.h:16
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1698,916 +1723,922 @@ msgid "Event desc"
 msgstr "Ereignisbeschreibung"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Erweiterter Konfigurationseditor</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Immer KDE Standardanwendungen verwenden"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Anwendungen</b>"
+msgid "Custom"
+msgstr "Benutzerdefiniert"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
+msgid "All chat states"
+msgstr "Alle Chatstatus"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatischer Status</b>"
+msgid "Composing only"
+msgstr "Nur verfassen"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Chat-Aussehen</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Deaktiviert"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Chatlinien-Farben</b>"
+msgid "Never"
+msgstr "Nie"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Chatstatus-Benachrichtigungen</b>"
+msgid "Only when pending events"
+msgstr "Nur bei anhängenden Ereignissen"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Verbindung</b>"
+msgid "Always"
+msgstr "Immer"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "Aufpoppen"
 
-#. 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>Benutzerdefiniert</b>"
+msgid "Notify me about it"
+msgstr "Benachrichtige mich darüber"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Schrift</b>"
+msgid "Show only in roster"
+msgstr "Nur in der Kontaktliste zeigen"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Google-Mail-Optionen</b>"
+msgid "Detached roster with detached chats"
+msgstr "Abgelöste Kontaktliste mit abgelösten Chats"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "Abgelöste Kontaktliste mit einzigem Chat"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Voreingestellte Statusnachrichten</b>"
+msgid "Single window for everything"
+msgstr "Ein Fenster für alles"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privatsphäre</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Konto"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Aussehen der Kontaktliste</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Typ"
 
 #: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Klänge</b>"
+#, fuzzy
+msgid "Last state"
+msgstr "Letzter Status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Statusnachrichten</b>"
+msgid "Preferences"
+msgstr "Einstellungen"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Themen</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "A_vatare der Kontakte in der Kontaktliste anzeigen"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Falls aktiviert, werden die Avatare der Kontakte in der Kontaktliste und in "
+"Chaträumen eingeblendet."
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visuelle Benachrichtigungen</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Status_nachrichten anzeigen"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(Beispiel: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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:23
-msgid "Advanced"
-msgstr "Erweitert"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Position der Kontakte in Kontakt_leiste anzeigen"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "All chat states"
-msgstr "Alle Chatstatus"
+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:25
-msgid "Allow _OS information to be sent"
-msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
+msgid "Sort contacts by status"
+msgstr "Kontakte nach Status sortieren"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow my _idle time to be sent"
-msgstr "Erlaube das Senden meiner Ze_it der Untätigkeit"
+msgid "in _roster"
+msgstr "in der _Kontaktliste"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Popups/Benachrichtigungen zulassen, wenn ich _abwesend/nicht verfügbar/"
-"beschäftigt/unsichtbar bin"
+msgid "in _group chats"
+msgstr "in Chat_räumen"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow sound when I'm _busy"
-msgstr "Soundausgabe erlauben, wenn ich _beschäftigt bin"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Aussehen der Kontaktliste</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Always"
-msgstr "Immer"
+msgid "_Window behavior:"
+msgstr "_Fensterverhalten:"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Ask status message when I:"
-msgstr "Erfrage Statusnachricht beim:"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Falls aktiviert, werden ASCII-Smilies wie \":)\" mit äquivalenten "
+"graphischen Emoticons ersetzt."
 
-#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
-msgid "Audio / Video"
-msgstr "Audio / Video"
+#: ../data/gui/preferences_window.ui.h:31
+msgid "_Emoticons:"
+msgstr "_Emoticons:"
 
 #: ../data/gui/preferences_window.ui.h:32
-msgid "Audio input device"
-msgstr "Audioaufnahmegerät"
+msgid "Ma_ke message windows compact"
+msgstr "Nachrichtenfenster _kompakt anzeigen"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio output device"
-msgstr "Audioausgabegerät"
+msgid "Hide all buttons in chat windows"
+msgstr "Versteckt alle Schaltflächen im Chatfenster"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Chat message:"
-msgstr "Chat-Nachricht:"
+msgid "_Ignore rich content in incoming messages"
+msgstr "Formatierten Inhalt in ankommenden Nachrichten _ignorieren"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Beim Starten überprüfen, ob Gajim der _Standard-Jabber-Client ist"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Einige Nachrichten können formatierten Inhalt enthalten (Farben, "
+"Schriftarten usw.). Falls aktiviert, wird Gajim nur den reinen "
+"Nachrichtentext anzeigen."
 
 #: ../data/gui/preferences_window.ui.h:36
-msgid "Composing only"
-msgstr "Nur verfassen"
+msgid "_Highlight misspelled words"
+msgstr "Falsch geschriebene Wörter _hervorheben"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Configure color and font of the interface"
-msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
+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 ""
+"Falls aktiviert, werden Rechtschreibfehler im Chat-Eingabefenster farblich "
+"hervorgehoben. Wenn keine Sprache im Eingabefeld festgelegt wurde (per "
+"Rechtsklick), wird die Standardsprache für diesen Kontakt oder Chatraum "
+"verwendet."
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Contact's message:"
-msgstr "Nachricht des Kontakts:"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "_Kontaktliste anzeigen"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's nickname:"
-msgstr "Spitzname des Kontakts:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Detached roster with chat grouped by account"
-msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Konto"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Chat-Aussehen</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by type"
-msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Typ"
+msgid "When new event is received:"
+msgstr "Wenn eine neue Nachricht empfangen wird:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with detached chats"
-msgstr "Abgelöste Kontaktliste mit abgelösten Chats"
+msgid "Notify me about contacts that sign _in"
+msgstr "Benachr_ichtigen, wenn sich ein Kontakt anmeldet"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with single chat"
-msgstr "Abgelöste Kontaktliste mit einzigem Chat"
+msgid "Notify me about contacts that sign _out"
+msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
 
-#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
-#: ../src/config.py:672
-msgid "Disabled"
-msgstr "Deaktiviert"
+#: ../data/gui/preferences_window.ui.h:45
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+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:46
-msgid "Display _activity of contacts in roster"
-msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Popups/Benachrichtigungen zulassen, wenn ich _abwesend/nicht verfügbar/"
+"beschäftigt/unsichtbar bin"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _extra email details"
-msgstr "Zusätzliche _E-Mail-Details anzeigen"
+msgid "Notify on new _GMail email"
+msgstr "Bei neuen E-Mails bei _Google-Mail benachrichtigen"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _location of contacts in roster"
-msgstr "Position der Kontakte in Kontakt_leiste anzeigen"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Falls aktiviert, wird eine Benachrichtigung angezeigt, wenn eine neue E-Mail "
+"über Google-Mail empfangen wurde."
 
 #: ../data/gui/preferences_window.ui.h:49
-msgid "Display _tunes of contacts in roster"
-msgstr "Die gerade abgespielten Musik_titel anzeigen"
+msgid "Display _extra email details"
+msgstr "Zusätzliche _E-Mail-Details anzeigen"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display a_vatars of contacts in roster"
-msgstr "A_vatare der Kontakte in der Kontaktliste anzeigen"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Falls aktiviert, fügt Gajim auch Informationen über den Absender neuer E-"
+"Mails hinzu."
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display m_ood of contacts in roster"
-msgstr "_Stimmungen anzeigen"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Google-Mail-Optionen</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display status _messages of contacts in roster"
-msgstr "Status_nachrichten anzeigen"
+msgid "Show notification area icon:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:53
-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 kann Zusatzinformationen zu einer Unterhaltung empfangen und "
-"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
-"in Ihrem Chatfenster anzeigt werden sollen."
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Visuelle Benachrichtigungen</b>"
 
 #: ../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 "
-"send to the other party."
-msgstr ""
-"Gajim kann Zusatzinformationen zu einer Unterhaltung empfangen und "
-"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
-"Sie Ihrem Gegenüber senden möchten."
+msgid "Play _sounds"
+msgstr "Klänge ab_spielen"
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
-msgstr ""
-"Gajim informiert Sie über ein Popup-Fenster in der rechten unteren "
-"Bildschirmecke über Kontakte, die sich gerade abgemeldet haben."
+msgid "Ma_nage..."
+msgstr "Verwalte_n …"
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Soundausgabe erlauben, wenn ich _beschäftigt bin"
 
 #: ../data/gui/preferences_window.ui.h:57
-msgid "Hide all buttons in chat windows"
-msgstr "Versteckt alle Schaltflächen im Chatfenster"
+msgid "<b>Sounds</b>"
+msgstr "<b>Klänge</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
-"festzustellen."
+msgid "Notifications"
+msgstr "Benachrichtigungen"
 
 #: ../data/gui/preferences_window.ui.h:59
 msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
+"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 ""
-"Falls aktiviert, fügt Gajim auch Informationen über den Absender neuer E-"
-"Mails hinzu."
+"Gajim kann Zusatzinformationen zu einer Unterhaltung empfangen und "
+"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
+"in Ihrem Chatfenster anzeigt werden sollen."
 
 #: ../data/gui/preferences_window.ui.h:60
-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."
+msgid "_Display chat state notifications:"
+msgstr "Benachrichtigungen über _den Chatstatus anzeigen:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
+"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 ""
-"Falls aktiviert, wird der Status in Nicht Verfügbar geändert, wenn der "
-"Computer längere Zeit nicht genutzt wird."
+"Gajim kann Zusatzinformationen zu einer Unterhaltung empfangen und "
+"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
+"Sie Ihrem Gegenüber senden möchten."
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Falls aktiviert, werden die Avatare der Kontakte in der Kontaktliste und in "
-"Chaträumen eingeblendet."
+msgid "_Send chat state notifications:"
+msgstr "Benachrichtigungen über den Chatstatus _senden:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"Falls aktiviert, wird unter dem Namen jeden Kontaktes in der Kontaktliste "
-"und in Chaträumen die Statusnachricht angezeigt."
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Chatstatus-Benachrichtigungen</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
-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."
+msgid "Personal Events"
+msgstr "Persönliche Ereignisse"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr ""
-"Falls aktiviert, wird die Position der Kontakte in der Kontaktliste angezeigt"
+msgid "_Away after:"
+msgstr "Automatisch _abwesend nach:"
 
 #: ../data/gui/preferences_window.ui.h:66
 msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
-"angezeigt."
+"Falls aktiviert, wird der Status in Abwesend geändert, wenn der Computer "
+"nicht genutzt wird."
 
 #: ../data/gui/preferences_window.ui.h:67
-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."
+msgid "_Not available after:"
+msgstr "Automatisch _nicht verfügbar nach:"
 
 #: ../data/gui/preferences_window.ui.h:68
 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."
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Falls aktiviert, werden Rechtschreibfehler im Chat-Eingabefenster farblich "
-"hervorgehoben. Wenn keine Sprache im Eingabefeld festgelegt wurde (per "
-"Rechtsklick), wird die Standardsprache für diesen Kontakt oder Chatraum "
-"verwendet."
+"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:69
-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 ""
-"Falls aktiviert, werden eingehende Ereignisse von nicht autorisierten "
-"Kontakten ignoriert. Vorsicht: Sie können nur noch Nachrichten von Kontakten "
-"empfangen, die in Ihrer Kontaktliste sind."
+msgid "minutes"
+msgstr "Minuten"
 
 #: ../data/gui/preferences_window.ui.h:70
 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 ""
-"Falls aktiviert, werden Logs von verschlüsselten Nachrichten aufgezeichnet. "
-"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:71
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-msgstr ""
-"Falls aktiviert, wird eine Benachrichtigung angezeigt, wenn eine neue E-Mail "
-"über Google-Mail empfangen wurde."
-
-#: ../data/gui/preferences_window.ui.h:72
-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...)"
+"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 ""
-"Falls aktiviert, werden protokollspezifische Symbole verwendet. (Zum "
-"Beispiel wird für einen MSN-Kontakt das jeweilige MSN-Symbol für den Status "
-"\"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. angezeigt.)"
+"Dieser Text wird als Statusnachricht zum Status Abwesend gesetzt, wenn der "
+"Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, wird die "
+"aktuelle Statusnachricht belassen. $S kann für die vorherige Statusnachricht "
+"eingesetzt werden. $T kann für die Zeit eingesetzt werden, seit der der "
+"Status auf Abwesend gestellt ist."
 
 #: ../data/gui/preferences_window.ui.h:73
 msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"Falls aktiviert, werden Sie nicht nach einer Statusnachricht gefragt. Die "
-"Standardnachricht wird benutzt."
-
-#: ../data/gui/preferences_window.ui.h:74
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Falls aktiviert, werden ASCII-Smilies wie \":)\" mit äquivalenten "
-"graphischen Emoticons ersetzt."
-
-#: ../data/gui/preferences_window.ui.h:75
-#, fuzzy
-msgid "Last state"
-msgstr "Letzter Status: %s"
+"Dieser Text wird als Statusnachricht zum Status Nicht Verfügbar gesetzt, "
+"wenn der Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, "
+"wird die aktuelle Statusnachricht belassen. $S kann für die vorherige "
+"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:76
-msgid "Log _encrypted chat session"
-msgstr "V_erschlüsselte Sitzungen aufzeichnen"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatischer Status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Nachrichtenfenster _kompakt anzeigen"
+msgid "Ask status message when I:"
+msgstr "Erfrage Statusnachricht beim:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Verwalte_n …"
+msgid "Sign _in"
+msgstr "_anmelden"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Never"
-msgstr "Nie"
+msgid "Sign _out"
+msgstr "a_bmelden"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Benachrichtigungen"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Falls aktiviert, werden Sie nicht nach einer Statusnachricht gefragt. Die "
+"Standardnachricht wird benutzt."
 
 #: ../data/gui/preferences_window.ui.h:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Benachr_ichtigen, wenn sich ein Kontakt anmeldet"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Statusnachrichten</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Voreingestellte Statusnachrichten</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notify me about it"
-msgstr "Benachrichtige mich darüber"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Bei neuen E-Mails bei _Google-Mail benachrichtigen"
+msgid "Use system _default"
+msgstr "Benutze System-_Voreinstellung"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr "Nur bei anhängenden Ereignissen"
+msgid "Chat message:"
+msgstr "Chat-Nachricht:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Persönliche Ereignisse"
+msgid "<b>Font</b>"
+msgstr "<b>Schrift</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Klänge ab_spielen"
+msgid "Use _transports icons"
+msgstr "_Transport-Symbole verwenden"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
-msgstr "Aufpoppen"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Falls aktiviert, werden protokollspezifische Symbole verwendet. (Zum "
+"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:89
-msgid "Preferences"
-msgstr "Einstellungen"
+msgid "Status _iconset:"
+msgstr "Status-S_ymbole:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
-"STUN Server Rechnername. Falls nicht definiert, wird Gajim versuchen\n"
-"einen vom Server zu ermitteln."
+msgid "Configure color and font of the interface"
+msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "D_esign:"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "STUN Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Themen</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr ""
+msgid "Contact's nickname:"
+msgstr "Spitzname des Kontakts:"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid "Show only in roster"
-msgstr "Nur in der Kontaktliste zeigen"
+msgid "Your nickname:"
+msgstr "Dein Spitzname:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_anmelden"
+msgid "_Status message:"
+msgstr "_Statusnachricht:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "a_bmelden"
+msgid "_URL highlight:"
+msgstr "_URL hervorheben:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr "Ein Fenster für alles"
+msgid "_Reset to Default Colors"
+msgstr "Auf Standardfarben zu_rücksetzen"
 
 #: ../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 ""
-"Einige Nachrichten können formatierten Inhalt enthalten (Farben, "
-"Schriftarten usw.). Falls aktiviert, wird Gajim nur den reinen "
-"Nachrichtentext anzeigen."
+msgid "Contact's message:"
+msgstr "Nachricht des Kontakts:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Kontakte nach Status sortieren"
+msgid "Your message:"
+msgstr "Deine Nachricht:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Hervorhebung von Chatraum-Nachrichten"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Status-S_ymbole:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Chatlinien-Farben</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "D_esign:"
+msgid "Audio input device"
+msgstr "Audioaufnahmegerät"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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 ""
-"Dieser Text wird als Statusnachricht zum Status Abwesend gesetzt, wenn der "
-"Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, wird die "
-"aktuelle Statusnachricht belassen. $S kann für die vorherige Statusnachricht "
-"eingesetzt werden. $T kann für die Zeit eingesetzt werden, seit der der "
-"Status auf Abwesend gestellt ist."
+msgid "Audio output device"
+msgstr "Audioausgabegerät"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
+msgstr "Videoaufnahmegeräte"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
-msgstr ""
-"Dieser Text wird als Statusnachricht zum Status Nicht Verfügbar gesetzt, "
-"wenn der Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, "
-"wird die aktuelle Statusnachricht belassen. $S kann für die vorherige "
-"Statusnachricht eingesetzt werden. $T kann für die Zeit eingesetzt werden, "
-"seit der der Status auf Nicht Verfügbar gestellt ist."
+msgid "Video output device"
+msgstr "Videoausgabegerät"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "Video Frame-Rate"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "Videogröße"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "_Transport-Symbole verwenden"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-#, fuzzy
-msgid "Use default applications"
-msgstr "Immer KDE Standardanwendungen verwenden"
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Benutze System-_Voreinstellung"
+msgid "STUN server:"
+msgstr "STUN Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr "Video Frame-Rate"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(Beispiel: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr "Videoaufnahmegeräte"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
-msgstr "Videoausgabegerät"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+"STUN Server Rechnername. Falls nicht definiert, wird Gajim versuchen\n"
+"einen vom Server zu ermitteln."
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr "Videogröße"
+msgid "<b>Connection</b>"
+msgstr "<b>Verbindung</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Audio / Video"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "Deine Nachricht:"
+msgid "_File manager:"
+msgstr "_Dateimanager:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "Dein Spitzname:"
+msgid "_Mail client:"
+msgstr "E-_Mail-Programm:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "Automatisch _abwesend nach:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Benachrichtigungen über _den Chatstatus anzeigen:"
+msgid "<b>Custom</b>"
+msgstr "<b>Benutzerdefiniert</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emoticons:"
+msgid "<b>Applications</b>"
+msgstr "<b>Anwendungen</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Dateimanager:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "Falsch geschriebene Wörter _hervorheben"
+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 ""
+"Falls aktiviert, werden eingehende Ereignisse von nicht autorisierten "
+"Kontakten ignoriert. Vorsicht: Sie können nur noch Nachrichten von Kontakten "
+"empfangen, die in Ihrer Kontaktliste sind."
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "Formatierten Inhalt in ankommenden Nachrichten _ignorieren"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
+"festzustellen."
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Logge die Statusveränderungen von Kontakten"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "E-_Mail-Programm:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
+"festzustellen."
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "Automatisch _nicht verfügbar nach:"
+msgid "Log _encrypted chat session"
+msgstr "V_erschlüsselte Sitzungen aufzeichnen"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "Ö_ffnen …"
+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 ""
+"Falls aktiviert, werden Logs von verschlüsselten Nachrichten aufgezeichnet. "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "Auf Standardfarben zu_rücksetzen"
+msgid "Allow my _idle time to be sent"
+msgstr "Erlaube das Senden meiner Ze_it der Untätigkeit"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "Benachrichtigungen über den Chatstatus _senden:"
-
-#: ../data/gui/preferences_window.ui.h:134
-#, fuzzy
-msgid "_Show roster on startup:"
-msgstr "_Kontaktliste anzeigen"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Status message:"
-msgstr "_Statusnachricht:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatsphäre</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_URL highlight:"
-msgstr "_URL hervorheben:"
+msgid "_Log status changes of contacts"
+msgstr "_Logge die Statusveränderungen von Kontakten"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "_Window behavior:"
-msgstr "_Fensterverhalten:"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _group chats"
-msgstr "in Chat_räumen"
+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:139
-msgid "in _roster"
-msgstr "in der _Kontaktliste"
+msgid "_Open..."
+msgstr "Ö_ffnen …"
 
 #: ../data/gui/preferences_window.ui.h:140
-msgid "minutes"
-msgstr "Minuten"
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Erweiterter Konfigurationseditor</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Erweitert"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privatsphären-Listen:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Hinzufügen / Ändern einer Regel</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Privatsphären-Liste"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Liste aller Regeln</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privatsphären-Liste</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktiviert für diese Sitzung"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Bei jedem Programmstart aktiv"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Liste aller Regeln</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "allen"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Hinzufügen / Ändern einer Regel</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Alle (Abonnement eingeschlossen)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Erlaube"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Verbiete"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "der Jabber-ID:"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "allen in der Gruppe"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Reihenfolge:"
+msgid "all by subscription"
+msgstr "Kontakten, die:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3936
-msgid "Privacy List"
-msgstr "Privatsphären-Liste"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "allen"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "Kontakten, die:"
+msgid "to send me messages"
+msgstr "mir Nachrichten zu senden"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "allen in der Gruppe"
+msgid "to send me queries"
+msgstr "mir Anfragen zu schicken"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "Beide"
+msgid "to view my status"
+msgstr "meinen Status zu sehen"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "von"
+msgid "to send me status"
+msgstr "mir seinen/ihren Status zu senden"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "Niemand"
+msgid "All (including subscription)"
+msgstr "Alle (Abonnement eingeschlossen)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "zu"
+msgid "Order:"
+msgstr "Reihenfolge:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "mir Nachrichten zu senden"
+msgid "none"
+msgstr "Niemand"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "mir Anfragen zu schicken"
+msgid "both"
+msgstr "Beide"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "mir seinen/ihren Status zu senden"
+msgid "from"
+msgstr "von"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "meinen Status zu sehen"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresse</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+msgid "to"
+msgstr "zu"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Geburtstag:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Stadt:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Nachname:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Firma:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Country:</b>"
-msgstr "<b>Land:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Zweiter Vorname:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>Department:</b>"
-msgstr "<b>Abteilung:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Namenspräfix:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:13
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Zusatzadresse:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Vorname:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:15
-msgid "<b>Family:</b>"
-msgstr "<b>Nachname:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Namenszusatz:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Vollständiger Name</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Straße:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Given:</b>"
-msgstr "<b>Vorname:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Stadt:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:19
-msgid "<b>Homepage:</b>"
-msgstr "<b>Homepage:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Bundesland:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Zusatzadresse:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Middle:</b>"
-msgstr "<b>Zweiter Vorname:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Postleitzahl:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Name:</b>"
-msgstr "<b>Name:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Land:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Nickname:</b>"
-msgstr "<b>Spitzname:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresse</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefonnummer:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Homepage:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Position:</b>"
-msgstr "<b>Position:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Name:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:27
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Postleitzahl:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Spitzname:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefonnummer:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:29
-msgid "<b>Prefix:</b>"
-msgstr "<b>Namenspräfix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: JJJJ-MM-TT"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>Role:</b>"
-msgstr "<b>Rolle:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Geburtstag:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:32
-msgid "<b>State:</b>"
-msgstr "<b>Bundesland:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:34
-msgid "<b>Street:</b>"
-msgstr "<b>Straße:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Hier klicken, um den Avatar zu auszuwählen."
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:38
-msgid "<b>Suffix:</b>"
-msgstr "<b>Namenszusatz:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Persönliche Details"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/profile_window.ui.h:30
 #: ../data/gui/vcard_information_window.ui.h:42
-msgid "About"
-msgstr "Über"
+msgid "<b>Company:</b>"
+msgstr "<b>Firma:</b>"
+
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Position:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Hier klicken, um den Avatar zu auszuwählen."
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Abteilung:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: JJJJ-MM-TT"
+#: ../data/gui/vcard_information_window.ui.h:45
+msgid "<b>Role:</b>"
+msgstr "<b>Rolle:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "Personal Info"
-msgstr "Persönliche Details"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Arbeit"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Was möchten Sie tun?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Über"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Kont_o entfernen (nur in Gajim)"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Was möchten Sie tun?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5635
-#: ../src/roster_window.py:5760 ../src/roster_window.py:5890
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Entfernen"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Austausch der Kontaktlistenelemente"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2615,113 +2646,114 @@ msgstr ""
 "<b>jemand@irgendwo.de</b> möchte Sie als Kontakt zu seiner Kontaktliste "
 "<b>hinzufügen</b>."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:3
+#: ../data/gui/service_registration_window.ui.h:3
+msgid "_OK"
+msgstr "_OK"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:4
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 "Nachrichtenkörper <gegenwärtig unbenutzt, so dass er standardmäßig versteckt "
 "wird>"
 
-#: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Austausch der Kontaktlistenelemente"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
-#: ../data/gui/service_registration_window.ui.h:3
-msgid "_OK"
-msgstr "_OK"
+#. 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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Aktionen"
 
-#: ../data/gui/roster_window.ui.h:1
+#: ../data/gui/roster_window.ui.h:6
 msgid "Add _Contact..."
 msgstr "_Kontakt hinzufügen …"
 
-#: ../data/gui/roster_window.ui.h:2
-msgid "Fea_tures"
-msgstr "Fea_tures"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Dateiübertragungen"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "Änd_ern"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Häufig gestellte Fragen (online)"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Konten"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Online-Hilfe"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil und A_vatar"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "A_nsicht"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Abgemeldete K_ontakte anzeigen"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Nur _aktive Kontakte anzeigen"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Trans_porte anzeigen"
 
-#: ../data/gui/roster_window.ui.h:13
-msgid "Show _Offline Contacts"
-msgstr "Abgemeldete K_ontakte anzeigen"
-
-#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "_Kontaktliste anzeigen"
 
-#: ../data/gui/roster_window.ui.h:15
-msgid "_Accounts"
-msgstr "_Konten"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Dateiübertragungen"
 
-#. 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:16
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Aktionen"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Hilfe"
 
-#: ../data/gui/roster_window.ui.h:18
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "Änd_ern"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Online-Hilfe"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:22
-msgid "_Help"
-msgstr "_Hilfe"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Häufig gestellte Fragen (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "A_nsicht"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Bitte warten Sie, während das Suchformular geladen wird …"
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fea_tures"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Suche"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Bitte warten Sie, während das Suchformular geladen wird …"
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5902
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informationen"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Suche"
 
@@ -2741,41 +2773,37 @@ msgstr "Registrieren auf"
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Nachricht beantworten"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "An:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Sen_den"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Nachricht senden"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Nachricht senden und Fenster schließen"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "Antwo_rten"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "An:"
+msgid "Reply to this message"
+msgstr "Nachricht beantworten"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "Antwo_rten"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Senden & Schließen"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Nachricht senden und Fenster schließen"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torisieren"
+msgid "Subscription Request"
+msgstr "Abonnementanfrage"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Kontakt autorisieren, sodass er Ihren Status sehen kann"
+msgid "_Deny"
+msgstr "_Ablehnen"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2785,264 +2813,274 @@ msgstr ""
 "Autorisierung des Kontakts verweigern, so dass er Ihren Status nicht sehen "
 "kann"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Abonnementanfrage"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torisieren"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Ablehnen"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Kontakt autorisieren, sodass er Ihren Status sehen kann"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Kontakte synchronisieren"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Das Konto auswählen, das Sie synchronisieren möchten"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Kontakte auswählen, die Sie synchronisieren möchten"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronisieren: Kontakte auswählen"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Klänge stummschalten"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Einzelne Nachricht _senden"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Zeige alle neuen _Ereignisse"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Kontakte auswählen, die Sie synchronisieren möchten"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Gruppenchat"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Anfrage:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Einzelne Nachricht _senden"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Client:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Zeige alle neuen _Ereignisse"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Configured avatar:</b>"
-msgstr "Gewählter Avatar:"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Klänge stummschalten"
 
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Contact time:</b>"
-msgstr "<b>Uhrzeit beim Kontakt:</b>"
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontaktinformationen"
 
-#: ../data/gui/vcard_information_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber-ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:36
-msgid "<b>Subscription:</b>"
-msgstr "<b>Abonnement:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Client:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:39
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Uhrzeit beim Kontakt:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>User avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-msgid "Comments"
-msgstr "Kommentare"
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
+msgstr "Gewählter Avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Abonnement:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:45
-msgid "Contact Information"
-msgstr "Kontaktinformationen"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Anfrage:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Mehr"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Filter</b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Kommentare"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber-Datentransfer</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML-Direkteingabe</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "IN Strophen verstecken"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "IQ Strophen verstecken"
+msgid "Hide OUT stanzas"
+msgstr "OUT Strophen verstecken"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "Nachrichtenstrophen verstecken"
+msgid "Hide Presence stanzas"
+msgstr "Presence Strophen verstecken"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "OUT Strophen verstecken"
+msgid "Hide IQ stanzas"
+msgstr "IQ Strophen verstecken"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "Presence Strophen verstecken"
+msgid "Hide Message stanzas"
+msgstr "Nachrichtenstrophen verstecken"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Query"
+msgid "<b>Filter</b>"
+msgstr "<b>Filter</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_Info/Query"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Query"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Anwesenheit"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Anwesenheit"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML-Direkteingabe</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Konto bearbeiten …"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokale Jabber-ID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Persönlich"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Ein Jabber-Client in GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Persönlich"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM-Client"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Ein Jabber-Client in GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Bestätigung abbrechen"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Ungültiger Raum"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Der Dienst sendete unzureichende Daten."
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Der Dienst änderte die Sitzungskennung."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Befehle - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Der Dienst gab einen Fehler zurück."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktiviert"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Deaktiviert"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1049
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Einstellungsname"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Keine)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Versteckt"
 
@@ -3053,158 +3091,49 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Sie haben neue Einträge erhalten (und %d werden nicht angezeigt):"
 msgstr[1] "Sie haben neue Einträge erhalten (und %d werden nicht angezeigt):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:83
-msgid "English"
-msgstr "Englisch"
-
-#: ../src/chat_control.py:83
-msgid "Belarusian"
-msgstr "Weißrussisch"
-
-#: ../src/chat_control.py:83
-msgid "Bulgarian"
-msgstr "Bulgarisch"
-
-#: ../src/chat_control.py:83
-msgid "Breton"
-msgstr "Bretonisch"
-
-#: ../src/chat_control.py:83
-msgid "Czech"
-msgstr "Tschechisch"
-
-#: ../src/chat_control.py:83
-msgid "German"
-msgstr "Deutsch"
-
-#: ../src/chat_control.py:83
-msgid "Greek"
-msgstr "Griechisch"
-
-#: ../src/chat_control.py:83
-msgid "British"
-msgstr "Britisch"
-
-#: ../src/chat_control.py:83
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:83
-msgid "Spanish"
-msgstr "Spanisch"
-
-#: ../src/chat_control.py:83
-msgid "Basque"
-msgstr "Baskisch"
-
-#: ../src/chat_control.py:83
-msgid "French"
-msgstr "Französisch"
-
-#: ../src/chat_control.py:83
-msgid "Croatian"
-msgstr "Kroatisch"
-
-#: ../src/chat_control.py:83
-msgid "Italian"
-msgstr "Italienisch"
-
-#: ../src/chat_control.py:83
-msgid "Norwegian (b)"
-msgstr "Norwegisch (Bokmål)"
-
-#: ../src/chat_control.py:83
-msgid "Dutch"
-msgstr "Niederländisch"
-
-#: ../src/chat_control.py:83
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-#: ../src/chat_control.py:83
-msgid "Polish"
-msgstr "Polnisch"
-
-#: ../src/chat_control.py:83
-msgid "Portuguese"
-msgstr "Portugiesisch"
-
-#: ../src/chat_control.py:83
-msgid "Brazilian Portuguese"
-msgstr "Brasilianisch"
-
-#: ../src/chat_control.py:83
-msgid "Russian"
-msgstr "Russsich"
-
-#: ../src/chat_control.py:83
-msgid "Serbian"
-msgstr "Serbisch"
-
-#: ../src/chat_control.py:83
-msgid "Slovak"
-msgstr "Slovakisch"
-
-#: ../src/chat_control.py:83
-msgid "Swedish"
-msgstr "Schwedisch"
-
-#: ../src/chat_control.py:83
-msgid "Chinese (Ch)"
-msgstr "Chinesisch"
-
-#: ../src/chat_control.py:226
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/chat_control.py:231
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:236
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "Fehler:"
 
-#: ../src/chat_control.py:561
-msgid "Spelling language"
-msgstr "Sprache für die Rechtschreibprüfung"
-
 #. we are not connected
-#: ../src/chat_control.py:593 ../src/chat_control.py:809
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:594 ../src/chat_control.py:810
+#: ../src/chat_control.py:801
 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:1031
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:1032
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:1064
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Formatierung löschen"
 
-#: ../src/chat_control.py:1141
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/chat_control.py:1142
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
@@ -3212,105 +3141,140 @@ msgstr ""
 "kennen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1622 ../src/chat_control.py:2144
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG-Verschlüsselung aktiviert"
 
-#: ../src/chat_control.py:1643 ../src/chat_control.py:1646
-msgid "Requires python-farsight."
-msgstr "Erfordert python-farsight."
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Der Kontakt unterstützt keine Dateiübertragung."
 
 #. Add to roster
-#: ../src/chat_control.py:1672 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:60
-#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2192
-#: ../src/dialogs.py:2221 ../src/gui_interface.py:507
-#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
-#: ../src/roster_window.py:1644 ../src/roster_window.py:1646
-#: ../src/roster_window.py:1979 ../src/roster_window.py:3506
-#: ../src/roster_window.py:3533
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1702
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Zwischen Audio-Sitzung umschalten"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Zwischen Video-Sitzung umschalten"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Funktion unter Windows nicht verfügbar."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "_Datei senden"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Der Kontakt unterstützt keine Dateiübertragung."
 
-#: ../src/chat_control.py:1705
+#: ../src/chat_control.py:1788
 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:1812
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s Status: %(state)s, Grund: %(reason)s"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2098
 #, 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:2124 ../src/dialogs.py:4997
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:2125
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht mit "
 "GPG verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:2134
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:2160
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:2162
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:2179
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:2179
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2181
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:2181
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2185
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2189
+#: ../src/chat_control.py:2294
 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:2196
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3319,32 +3283,32 @@ msgstr ""
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:2357
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:2367
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2369
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
-#: ../src/chat_control.py:2378
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:2381
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " und wird AUFGEZEICHNET"
 
-#: ../src/chat_control.py:2383
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3352,25 +3316,25 @@ msgstr ""
 "Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
 "Informationen durch Klicken auf das Schild-Symbol."
 
-#: ../src/chat_control.py:2390
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:2434 ../src/chat_control.py:2447
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:2440
+#: ../src/chat_control.py:2526
 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:2731
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2732
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3378,15 +3342,14 @@ msgstr ""
 "Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
 "Nachricht verloren."
 
-#: ../src/chat_control.py:2899 ../src/common/connection_handlers_events.py:871
-#: ../src/common/connection_handlers.py:945
-#: ../src/common/connection_handlers.py:1046
-#: ../src/common/connection_handlers.py:1703 ../src/common/connection.py:462
-#: ../src/common/logger.py:1126 ../src/gajim.py:203 ../src/session.py:97
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2900
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3395,7 +3358,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:3136 ../src/gui_interface.py:1059
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3404,128 +3367,419 @@ msgstr ""
 "Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
 "Eventuell wurde sie verändert."
 
-#: ../src/chat_control.py:3169
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
 
-#: ../src/common/check_paths.py:38
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Dateiübertragungen"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Größe: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "_Konten"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Dateiübertragung abgeschlossen"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Gruppenchat-Einladung"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Fehler beim Öffnen der Datei:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Dateiübertragung gestoppt"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Dateiübertragung abgebrochen"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Verwendung: /%s, versteckt die Chatschaltflächen."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nicht gefunden"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Abwesend"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Angemeldet"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Verwendung: /%s, leert das Textfenster."
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Open_PGP-Verschlüsselung aktivieren"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s ist kein gültiger Loglevel."
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Keine Verbindung verfügbar"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Verbindung nicht verfügbar"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Spitzname ändern (Strg+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Ungültiger Benutzername"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem "
+"Inhaber des angegebenen Spitznamens."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Spitzname nicht gefunden: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem "
+"Inhaber des angegebenen Spitznamens."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Sende %s an %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Sie wurden in einen Chatraum eingeladen"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Ungültiger Server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Zugehörigkeit geändert:"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Verwendung: /%s, zeigt die Namen der Teilnehmer im Chatraum an."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Fehlendes Argument \"contact_Jabber-ID\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:86
+#: ../src/common/check_paths.py:87
 msgid "creating cache database"
 msgstr "Erstelle Cache-Datenbank"
 
-#: ../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:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
+#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:352
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Ändere Statusinformation"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Status ändern"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Status und Beschreibung festlegen"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:106 ../src/common/helpers.py:242
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Abwesend"
-
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Längere Zeit abwesend"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Bitte nicht stören"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Offline - Abgemeldet"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Statusbeschreibung:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Der Status hat sich verändert."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Verlasse Chaträume"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s aus dem Chatraum %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Sie sind derzeit in keinem Chatraum."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 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:60 ../src/roster_window.py:817
-#: ../src/roster_window.py:1648 ../src/roster_window.py:1650
-#: ../src/roster_window.py:2508 ../src/roster_window.py:5520
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Sie haben folgende Chaträume verlassen:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Ungelesene Nachrichten weiterleiten"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr "Ungelesene Nachrichten weiterleiten, dann Verbindung trennen"
 
@@ -3553,7 +3807,8 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Abwesend wegen Untätigkeit für mehr als $T Minuten)"
 
 #: ../src/common/config.py:83
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die "
 "Abwesenheitszeit."
@@ -3567,7 +3822,8 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nicht verfügbar wegen Untätigkeit seit mehr als $T Minuten)"
 
 #: ../src/common/config.py:86
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
 "Verfügbar-Zeit."
@@ -3606,26 +3862,77 @@ msgid "Status message text color."
 msgstr "Farbe der Statusnachricht."
 
 #: ../src/common/config.py:102
+msgid "Contact signed in notification color."
+msgstr ""
+
+#. limegreen
+#: ../src/common/config.py:103
+msgid "Contact signout notification color"
+msgstr ""
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Anfrage zur Dateiübertragung"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Dateiübertragung abgebrochen"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr ""
+"Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Gruppenchat-Einladung"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Schriftart des eingehenden Spitznamens."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Schriftart des ausgehenden Spitznamens."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Schriftart des eingehenden Textes."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Schriftart des abgehenden Textes."
 
-#: ../src/common/config.py:106
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Schriftart der Statusnachricht"
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3633,17 +3940,17 @@ msgstr ""
 "eingeklappt sind."
 
 #. sorted alphanum
-#: ../src/common/config.py:108 ../src/common/config.py:495
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:2659
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "Standard"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Sprache der Rechtschreibprüfung"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3653,7 +3960,7 @@ msgstr ""
 "'sometimes' - Zeige Zeit alle print_ichat_every_foo_minutes Minuten.\n"
 "'never' - Zeige nie die Zeit."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:125
 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. "
@@ -3664,18 +3971,18 @@ msgstr ""
 "ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf "
 "'sometimes' gesetzt ist."
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Falls aktiviert, wird */_ nicht entfernt. So wird *abc* fett gedruckt, aber "
 "* * wird nicht entfernt."
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3686,7 +3993,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie "
 "dieses Feature benutzen möchten, installieren Sie docutils.)"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3694,7 +4001,7 @@ msgstr ""
 "Zeichen, das hinter Spitznamen angezeigt wird, wenn die "
 "Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3702,13 +4009,13 @@ msgstr ""
 "Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im "
 "Chatraum bereits vergeben ist."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
+"If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3719,57 +4026,58 @@ msgstr ""
 "Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" "
 "unter http://docs.python.org/lib/module-time.html (Englisch)."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Zeichen, die vor dem Spitznamen ausgegeben werden"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 "Definieren Sie den auszuführenden Befehl, wenn neue E-Mails eintreffen, z."
 "B.: /usr/bin/getmail -q"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein "
 "Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:182
 #, fuzzy
 msgid ""
-"How many lines to request to server when entering a groupchat. -1 means no "
+"How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
 "Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats "
 "abgefragt werden?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:183
 #, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats "
 "abgefragt werden?"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3778,12 +4086,12 @@ msgstr ""
 "automatisch betreten wird, von dem Sie getrennt worden sind? Setze den Wert "
 "auf 0, um das automatische Betreten zu deaktivieren."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:185
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3791,11 +4099,11 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Standardeinstellung im ICQ-Client Mirabilis)."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3804,13 +4112,13 @@ msgstr ""
 "Entweder eine spezielle URL mit %s, wobei %s das Wort / die Phrase ist oder "
 "'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
 "werden."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:195
 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 "
@@ -3822,14 +4130,14 @@ msgstr ""
 "(vorausgesetzt, Sie haben listen_to_network_manager nicht auf False gesetzt "
 "und Ihre Konten synchronisieren sich mit dem globalen Status)."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Senden von Chatstatus-Benachrichtigungen. Kann auf \"all\", \"composing_only"
 "\" oder \"disabled\" gesetzt werden."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3837,7 +4145,7 @@ msgstr ""
 "Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann auf \"all\", "
 "\"composing_only\" oder \"disabled\" gesetzt werden."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3845,35 +4153,38 @@ msgstr ""
 "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
 "(print_time==sometimes), wird sie alle x Minuten angezeigt."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Immer fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
 "Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Niemals fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
 "Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Frage bevor ein Chatfenster mit mehreren Tabs geschlossen wird, wenn dadurch "
 "Daten verloren gehen würden (Chat, Privatchat, nicht minimierter Gruppenchat)"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3882,28 +4193,34 @@ msgstr ""
 "Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
 "gesendet werden."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:208
 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:200
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Neue Ereignisse per Trayicon anzeigen"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Tableiste bei nur einer Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenze im Chatfenster anzeigen?"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:220
 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 "
@@ -3916,18 +4233,18 @@ msgstr ""
 "Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung "
 "mehr Rechenzeit."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Eine durch Semikola getrennte Liste von Worten, die in einem Chatraum "
 "hervorgehoben werden sollen."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -3937,14 +4254,14 @@ msgstr ""
 "geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
 "wird."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Falls aktiviert, wird beim Starten überprüft, ob Gajim der Standard-Jabber-"
 "Client ist."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3952,7 +4269,7 @@ msgstr ""
 "Falls aktiviert, wird auf jedem Tab, der ungelesene Nachrichten enthält, ein "
 "Icon angezeigt. Abhängig vom Chat-Design kann dieses Icon auch animiert sein."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3960,13 +4277,13 @@ msgstr ""
 "Falls aktiviert, wird in der Kontaktliste unter dem Namen eines jeden "
 "Kontaktes dessen Statusnachricht angezeigt, sofern diese nicht leer ist."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Legt die Position des Avatars in der Kontaktliste fest. \"left\" (links) "
 "oder \"right\" (rechts) sind mögliche Optionen."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:257
 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."
@@ -3974,7 +4291,7 @@ msgstr ""
 "Falls aktiviert, wird jeder Kontakt, der beim letzten Mal keinen Avatar "
 "hatte oder dessen gespeicherter Avatar zu alt ist, nach einem neuen gefragt."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:258
 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."
@@ -3982,9 +4299,10 @@ msgstr ""
 "Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
 "Kontakt seinen Status oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -3996,34 +4314,34 @@ msgstr ""
 "Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status "
 "angezeigt, wenn jemand den Chatraum betritt oder verlässt."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:261
 msgid "Log XHTML messages instead of plain text messages."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade angemeldet haben."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade abgemeldet haben."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Falls aktiviert, werden wiederhergestellte Nachrichten mit einer etwas "
 "kleineren Schrift als normal dargestellt."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selbst an."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:268
 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 "
@@ -4033,7 +4351,7 @@ msgstr ""
 "Ereignisse anstehen (Standardverhalten der meisten Fenster-Manager; benötigt "
 "GTK+ und PyGTK >= Version 2.8)."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:270
 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 "
@@ -4044,7 +4362,8 @@ msgstr ""
 "Informationen gesendet."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:250
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4052,7 +4371,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrolliert das Fenster, in dem neue Nachrichten angezeigt werden.\n"
@@ -4066,7 +4385,7 @@ msgstr ""
 "einem eigenen Fenster. Eine Änderung dieser Option tritt erst nach einem "
 "Neustart von Gajim in Kraft."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:274
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -4074,32 +4393,32 @@ msgid ""
 "'last_state' - Restore the last state roster."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs und Fenster."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Versteckt die Schaltflächen im Chatraum-Fenster."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Chatraum-Fenster."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:281
 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."
@@ -4107,17 +4426,17 @@ msgstr ""
 "Der Spitzname wird im Chat nur dann vor einer Nachricht angezeigt, wenn sie "
 "nicht von der Person stammt, die schon die letzte Nachricht geschrieben hat."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
 "verwendet wird."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4125,13 +4444,13 @@ msgstr ""
 "Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet "
 "werden sollen (Werte getrennt durch \":\")."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene "
 "Nachrichten enthält."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4139,7 +4458,7 @@ msgstr ""
 "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
 "werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4147,7 +4466,7 @@ msgstr ""
 "Soll der Bestätigungsdialog zum Blockieren von Benutzern angezeigt werden? "
 "Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4155,7 +4474,7 @@ msgstr ""
 "Soll der Bestätigungsdialog für den speziellen Chatstatus angezeigt werden? "
 "Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:289
 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 "
@@ -4165,7 +4484,7 @@ msgstr ""
 "Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet "
 "sind ehalten Sie keine Nachrichten mehr vom Server."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4173,7 +4492,7 @@ msgstr ""
 "Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
 "um die Passwörter der Konten zu speichern."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4181,7 +4500,7 @@ msgstr ""
 "Falls aktiviert, wird Gajim KDE Wallet (wenn kwalletcli verfügbar ist) um "
 "Kontopasswörter zu speichern."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4189,7 +4508,7 @@ msgstr ""
 "Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
 "den Konto- und Gruppenreihen angezeigt."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4197,7 +4516,7 @@ msgstr ""
 "Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, werden alle "
 "eingehenden Nachrichten so behandelt, als wären sie vom gewählten Typ."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4206,20 +4525,12 @@ msgstr ""
 "auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster "
 "nicht bereits geöffnet ist."
 
-#: ../src/common/config.py:272
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Falls aktiviert, wird Gajim eine Zeichenkette zwischen $$ und $$ mittels "
-"dvips vor dem Einfügen in ein Chatfenster in ein Bild umwandeln."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wartezeit, bevor das \"Status ändern\"-Fenster automatisch geschlossen wird."
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4227,7 +4538,7 @@ msgstr ""
 "Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
 "Zeilen werden gelöscht."
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4236,19 +4547,11 @@ msgstr ""
 "Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
 "an das Systray-Icon angehängt."
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Legen Sie den Zeitabstand zwischen den Leerlaufüberprüfungen fest."
 
-#: ../src/common/config.py:277
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Legt die LaTeX-Anzeigengröße fest. Je höher der Wert, desto größer die "
-"Anzeige."
-
-#: ../src/common/config.py:278
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4256,22 +4559,23 @@ msgstr ""
 "Gültige URI-Schemata. Nur Schemata in dieser Liste werden als \"wirkliche\" "
 "URIs akzeptiert. (mailto und xmpp werden separat behandelt)"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Frage nach der Offline Statusnachricht von allen nicht verbundenen "
 "Kontakten, sobald eine Verbindung zu einem Konto hergestellt wird. WARNUNG: "
 "Diese Einstellung erfordert eine Menge Sendeanfragen an den Server!"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Falls aktiviert, wird die Autovervollständigung in Gruppenchats ähnlich der "
 "Autovervollständigung in der Shell sein."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4280,16 +4584,20 @@ msgstr ""
 "\" (immer), \"when_other_resource\" (wenn eine andere Ressource online ist) "
 "oder \"never\" (niemals)"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 "Jingle Videoausgabe-Framerate optional korrigieren. Beispiel: 10/1 oder 25/2"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "Jingle Videoausgabegröße optional ändern. Beispiel: 320x240"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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."
@@ -4298,11 +4606,11 @@ msgstr ""
 "verwenden. Entweder jenen in der \"stun_server\" Option, oder einen vom "
 "Jabber-Server vorgegebenen Server."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr "Zu benutzender STUN server für Jingle"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
@@ -4310,7 +4618,32 @@ msgstr ""
 "Falls aktiviert, wird Gajim die Zuordnung der Teilnehmer im Gruppenchat "
 "anzeigen, indem ein farbiges Quadrat zum Status-Icon hinzugefügt wird."
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Falls aktiviert, werden Sie nicht nach einer Statusnachricht gefragt. Die "
+"Standardnachricht wird benutzt."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4318,7 +4651,7 @@ msgstr ""
 "Die Priorität ändert sich automatisch gemäß dem Status. Die Prioritäten "
 "werden in den \"autopriority_*\"-Optionen festgelegt."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:340
 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"
@@ -4327,19 +4660,19 @@ msgstr ""
 "Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option "
 "kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 "Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Falls aktiviert, werden Authorisationsanfragen von Kontakten automatisch "
 "akzeptiert."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
@@ -4347,23 +4680,23 @@ msgstr ""
 "Kontaktliste."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/common/config.py:320
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Falls deaktiviert, wird die Anwesenheit selbst dann nicht mit einem GPG-"
 "Schlüssel signiert, wenn GPG konfiguriert ist."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiviere die ESession-Verschlüsselung für dieses Konto."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4371,20 +4704,22 @@ msgstr ""
 "Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
 "Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
 "übertragen wird."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
 "Bibliothek geschützte Verbindung übertragen wird."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -4392,33 +4727,46 @@ msgstr ""
 "Warnmeldung anzeigen, bevor das PLAIN Passwort über eine unsichere "
 "Verbindung übertragen wird."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace nach Untätigkeit gesendet"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP Ping nach Untätigkeit gesendet"
 
-#: ../src/common/config.py:343
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Wie viele Sekunden soll auf die Wartezeit in Sekunden, bevor eine Verbindung "
 "wieder hergestellt wird."
 
 #. yes, no, ask
-#: ../src/common/config.py:347
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2-Workaround"
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4427,15 +4775,21 @@ msgstr ""
 "file_transfer_proxies Option definierten Proxys für den Dateitransfer "
 "verwenden."
 
-#: ../src/common/config.py:364
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungen anfordern"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:403
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -4443,12 +4797,12 @@ msgstr ""
 "Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
 "festzustellen."
 
-#: ../src/common/config.py:375
+#: ../src/common/config.py:404
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/common/config.py:376
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4456,20 +4810,52 @@ msgstr ""
 "Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
 "Sie Ihre Nachrichten aufzeichnen wollen?"
 
-#: ../src/common/config.py:379
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr ""
 "Nachricht, die an Kontakte gesendet wird, die hinzugefügt werden sollen"
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonyme Authentifizierung"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_yme Authentifizierung"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4477,94 +4863,112 @@ msgstr ""
 "Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
 "werden?"
 
-#: ../src/common/config.py:444 ../src/common/config.py:447
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:483
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats "
+"abgefragt werden?"
+
+#: ../src/common/config.py:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats "
+"abgefragt werden?"
+
+#: ../src/common/config.py:487
+msgid ""
+"State whether plugins should be activated on startup (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:455 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:456
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:456
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:457 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:459 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:472
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:473
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:474 ../src/config.py:1609
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:477 ../src/common/config.py:478
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:488
+#: ../src/common/config.py:526
 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."
@@ -4572,27 +4976,32 @@ 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:489
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:498 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:502 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:506
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "Menschlich"
 
-#: ../src/common/config.py:510
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers_events.py:355
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "An"
+
+#: ../src/common/connection_handlers_events.py:370
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4602,25 +5011,23 @@ msgstr ""
 "hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru."
 "jabberstudio.org/>, um sie zu entfernen."
 
-#: ../src/common/connection_handlers_events.py:784
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers_events.py:868
-#: ../src/common/connection_handlers.py:339
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1044
-#: ../src/common/connection_handlers.py:1701 ../src/common/connection.py:459
-#: ../src/common/logger.py:1124 ../src/gajim.py:385
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers_events.py:872
-#: ../src/common/connection_handlers.py:946
-#: ../src/common/connection_handlers.py:1047
-#: ../src/common/connection_handlers.py:1704 ../src/common/connection.py:463
-#: ../src/common/logger.py:1127 ../src/gajim.py:204 ../src/session.py:98
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4632,82 +5039,130 @@ msgstr ""
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:893
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "Der Chatraum wurde gelöscht"
 
-#: ../src/common/connection_handlers_events.py:901
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
 
-#: ../src/common/connection_handlers_events.py:974
-#: ../src/common/connection.py:258 ../src/config.py:2102 ../src/config.py:2111
-#: ../src/config.py:2179 ../src/config.py:3608 ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3049
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers_events.py:975
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 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_events.py:1423
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
-#. single message
-#: ../src/common/connection_handlers_events.py:1947 ../src/dialogs.py:2741
-#: ../src/notify.py:194 ../src/notify.py:423
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
-#: ../src/common/connection_handlers_events.py:1949 ../src/notify.py:196
+#: ../src/common/connection_handlers_events.py:2213
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Einzelne neue Nachricht von %(nickname)s"
 
-#. private message
-#: ../src/common/connection_handlers_events.py:1952 ../src/dialogs.py:2742
-#: ../src/notify.py:200 ../src/notify.py:424
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/common/connection_handlers_events.py:1954 ../src/notify.py:203
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht aus dem Chatraum %s"
 
-#: ../src/common/connection_handlers_events.py:1957 ../src/notify.py:205
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/connection_handlers_events.py:1960 ../src/notify.py:208
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#. chat message
-#: ../src/common/connection_handlers_events.py:1963 ../src/dialogs.py:2741
-#: ../src/notify.py:212 ../src/notify.py:423
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../src/common/connection_handlers_events.py:1965 ../src/notify.py:214
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/common/connection_handlers.py:95
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s änderte seinen Status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s ist jetzt %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt hat Status verändert"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s angemeldet"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt hat sich angemeldet"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s abgemeldet"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt hat sich abgemeldet"
+
+#: ../src/common/connection_handlers.py:92
+#: ../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:128
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
@@ -4726,14 +5181,14 @@ msgstr "Registrierung war erfolgreich"
 msgid "Registration with agent %s succeeded"
 msgstr "Registrierung mit Agent %s war erfolgreich"
 
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:145
 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:144
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4741,176 +5196,176 @@ msgstr ""
 "Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:564 ../src/common/connection.py:1520
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/common/connection_handlers.py:565 ../src/common/connection.py:1521
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1746
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar."
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Die Zertifikats-CRL ist nicht verfügbar."
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Die Zertifikatsunterschrift konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Die CRL-Unterschrift konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Der öffentliche Schlüssel konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Fehler bei der Zertifikat-Unterschrift"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Fehler bei der CRL-Unterschrift"
 
 # TODO: How should we handle full sentences that miss a . at their end in the original string?
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig."
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen."
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "Die CRL ist nocht nicht gültig."
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "Die CRL ist abgelaufen."
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatfehler im \"notBefore\"-Feld des Zertifikats"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatfehler im \"notAfter\"-Feld des Zertifikats"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatfehler im \"lastUpdate\"-Feld der CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatfehler im \"nextUpdate\"-Feld der CRL"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Zu wenig Speicher"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Selbstsigniertes Zertifikat in der Zertifikatkette"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Das lokale Herausgeberzertifikat ist nicht verfügbar."
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Das erste Zertifikat konnte nicht überprüft werden."
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Zertifikatkette zu lang"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Zertifikat wurde widerrufen"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Ungültiges CA-Zertifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Pfadlängenbeschränkung überschritten"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Nicht unterstützter Zertifikatsverwendungszweck"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Zertifikat abgelehnt"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Betreffs-Aussteller unpassend"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Zertifizierungsstelle und Betreffsschlüssel unpassend"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
 "Zertifikats."
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:259 ../src/dialogs.py:3050
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:281
+#: ../src/common/connection.py:304
 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:284
+#: ../src/common/connection.py:307
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 "Der Kontaktschlüssel (%s) stimmt nicht mit dem in Gajim zugewiesenen "
 "Schlüssel überein."
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:337
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:446
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4919,18 +5374,18 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:839
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:840
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:851
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
@@ -4938,62 +5393,65 @@ msgstr ""
 "%(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:893
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#. wrong answer
-#: ../src/common/connection.py:909
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:910
+#: ../src/common/connection.py:1002
 #, 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:1198 ../src/common/connection.py:1332
-#: ../src/common/connection.py:1941
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1199 ../src/gui_interface.py:564
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 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:1204
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server antwortete: %s"
 
-#: ../src/common/connection.py:1217
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:1249 ../src/common/connection.py:1311
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1250 ../src/common/connection.py:1312
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1275
+#: ../src/common/connection.py:1388
 #, 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:1278
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -5002,7 +5460,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:1280
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -5011,24 +5469,33 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:1333
-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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1367
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1369
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:1442
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../src/common/connection.py:1443
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5038,65 +5505,65 @@ msgstr ""
 "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
 "es erneut."
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Kontakt gesendet: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1811
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Gesendete Kontakte:"
 
-#: ../src/common/connection.py:1958 ../src/common/connection.py:1981
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
-#: ../src/common/connection.py:2511
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "De-Registrierung fehlgeschlagen"
 
-#: ../src/common/connection.py:2512
+#: ../src/common/connection.py:2827
 #, 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:60
-#: ../src/gui_interface.py:507
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:856
-#: ../src/roster_window.py:1552 ../src/roster_window.py:1640
-#: ../src/roster_window.py:1642 ../src/roster_window.py:1804
-#: ../src/roster_window.py:2485
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporte"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Auf diesem Computer fehlen die Python-Bibliotheken für D-Bus."
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Die D-Bus-Fähigkeiten können nicht genutzt werden."
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus läuft nicht korrekt auf diesem Rechner: System Bus no present"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus läuft nicht korrekt auf diesem Rechner: Session Bus not present"
 
@@ -5110,7 +5577,7 @@ msgstr ""
 "Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist "
 "deaktiviert."
 
-#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-Bus ist auf diesem Computer nicht vorhanden oder das Python-Modul fehlt."
@@ -5296,273 +5763,292 @@ msgstr "Ende der Woche"
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen im Rechnernamen."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Server-Adresse benötigt."
 
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:178
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in der Ressource."
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:220 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:230 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:240
 msgid "?user status:_Available"
 msgstr "?Benutzerstatus:Verfügb_ar"
 
-#: ../src/common/helpers.py:235 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "?Benutzerstatus:Verfügbar"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:247 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:259
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?Kontakt hat Status: Unbekannt"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?Kontakt hat Status: Hat einen Fehler"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Abonnement schon vorhanden:Keines"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Von"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Frage nach Abonnement: Keine"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppenchat Kontaktrolle: Keine"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:309 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:311 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:313 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:315 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:356
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:365
 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:361
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:631
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:638
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #. B means bytes
-#: ../src/common/helpers.py:648
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: ../src/common/helpers.py:1112
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr "Vom Chatraum %s"
 
-#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " vom Benutzer %s"
 
-#: ../src/common/helpers.py:1117
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr "Von %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d neues Ereignis"
 msgstr[1] "%d neue Ereignisse"
 
-#: ../src/common/helpers.py:1162
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "Hallo, Ich bin $name"
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Konnte Bild nicht laden"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Das Bild ist zu groß"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "Die CRL ist nocht nicht gültig."
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Konnte Bild nicht laden"
+
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s Konfigurationsfehler"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5581,11 +6067,11 @@ msgstr ""
 "Fehler war:\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "Fehler mit GStreamer"
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5594,106 +6080,114 @@ msgstr ""
 "Fehler: %s\n"
 "Debug: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "Audioaufnahme"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "Audioausgabe"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "Videoaufnahme"
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "Videoausgabe"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s ist kein gültiger Loglevel."
 
-#: ../src/common/multimedia_helpers.py:39
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr "Standardgerät"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:60
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Audiotest"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:79
-#: ../src/common/multimedia_helpers.py:93
-#: ../src/common/multimedia_helpers.py:111
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "Automatische Erkennung"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
 #, fuzzy, python-format
 msgid "Pulse: %s"
 msgstr "Datei: %s"
 
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:77
-#: ../src/common/multimedia_helpers.py:105
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "Simulierte Audioausgabe"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:90
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Videotest"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#: ../src/common/multimedia_helpers.py:108
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "grün"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "Videoausgabe"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X Window System (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:110
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X Window System (ohne Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
+msgid "Error: cannot open %s for reading"
+msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -6330,19 +6824,115 @@ msgstr "Lernen"
 msgid "Writing"
 msgstr "Schreiben"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Standard"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "Marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Verstecken"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Konto"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Kontoreihe"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Beschreibung"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Fehler"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "Eins"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "Chatraum"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "URI"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6351,20 +6941,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
 "aus <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Port %s konnte nicht belegt werden (Bindung fehlgeschlagen)."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr "Möglicherweise läuft Gajim bereits. Dateiübertragung wird abgebrochen."
-
 #. we're not english
-#: ../src/common/stanza_session.py:424
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6372,7 +6950,7 @@ msgstr ""
 "[Dies ist ein Teil einer verschlüsselten Unterhaltung. Wenn Sie diese "
 "Nachricht sehen, ist etwas schief gegangen.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi-Fehler"
 
@@ -6385,75 +6963,73 @@ msgstr ""
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 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:215
-#: ../src/common/zeroconf/connection_zeroconf.py:219
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Lokaler Dienst konnte nicht gestartet werden"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Die Verbindung mit Port %d ist fehlgeschlagen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:220
-#: ../src/common/zeroconf/connection_zeroconf.py:304
-#: ../src/common/zeroconf/connection_zeroconf.py:317
-#: ../src/common/zeroconf/connection_zeroconf.py:333
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:303
-#: ../src/common/zeroconf/connection_zeroconf.py:316
-#: ../src/common/zeroconf/connection_zeroconf.py:332
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:351
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Die Nachricht konnte nicht gesendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:365
-#: ../src/common/zeroconf/connection_zeroconf.py:404
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:432
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Die Verbindung zum Server konnte nicht hergestellt werden: "
 "Zeitüberschreitung beim Senden von Daten."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:193
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 
-#: ../src/config.py:406
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Standard-Nachricht"
 
-#: ../src/config.py:415
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3105
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:746 ../src/dialogs.py:1493
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Kein Wörterburch für die Sprache %s verfügbar"
 
-#: ../src/config.py:747
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6462,73 +7038,73 @@ msgstr ""
 "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
 "um die Rechtschreibprüfung nutzen zu können."
 
-#: ../src/config.py:1223
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1223
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "Statusnachricht"
 
 #. Name column
-#: ../src/config.py:1523 ../src/dialogs.py:2498 ../src/dialogs.py:2565
-#: ../src/dialogs.py:3352 ../src/disco.py:886 ../src/disco.py:1744
-#: ../src/disco.py:2046 ../src/history_window.py:90
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1618
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Jetzt erneut anmelden?"
 
-#: ../src/config.py:1619
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
 "anmelden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:1773 ../src/config.py:1902
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
 
-#: ../src/config.py:1942 ../src/config.py:1989
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1943
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: ../src/config.py:1972
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
-#: ../src/config.py:1973
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:1985 ../src/config.py:2521 ../src/config.py:2557
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden."
 
-#: ../src/config.py:1986
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
 
-#: ../src/config.py:1990
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen "
 "Ereignisse lesen."
 
-#: ../src/config.py:1996
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Der Kontoname wird bereits verwendet."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6536,152 +7112,153 @@ msgstr ""
 "Dieser Name wird bereits für eines Ihrer Konten verwendet. Bitte wählen Sie "
 "einen anderen Namen."
 
-#: ../src/config.py:2001 ../src/config.py:2005
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:2002
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Der Kontoname darf nicht leer sein."
 
-#: ../src/config.py:2006
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:2083
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:2084
+#: ../src/config.py:2139
 #, 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:2112
+#: ../src/config.py:2168
 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:2329 ../src/config.py:3654
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2330 ../src/config.py:3655
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2351
+#: ../src/config.py:2417
 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:2352
+#: ../src/config.py:2418
 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:2386
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Schlüssel-Auswahl"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2387
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2395
+#: ../src/config.py:2466
 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:2402 ../src/dialogs.py:2251 ../src/dialogs.py:2487
-#: ../src/dialogs.py:2675 ../src/disco.py:515 ../src/profile_window.py:361
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2403
+#: ../src/config.py:2474
 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:2407
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2408
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2522 ../src/config.py:2558
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Zum Deaktivieren des Kontos, müssen Sie offline sein."
 
-#: ../src/config.py:2527
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2528
+#: ../src/config.py:2605
 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:2685
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2687
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2723
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2724
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2724
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2725
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2789 ../src/disco.py:893 ../src/history_manager.py:207
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "Jabber-ID"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2806
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2812
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Verbannen …"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2841
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6689,11 +7266,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2843
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2844
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6701,11 +7278,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2846
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2847
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6713,11 +7290,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2849
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2850
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6725,7 +7302,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2851
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6742,110 +7319,105 @@ msgstr ""
 "benutzer@domain, jede domain/Ressource oder jede Adresse, die eine Subdomain "
 "enthält)."
 
-#: ../src/config.py:2952
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "Konto ist deaktiviert"
 
-#: ../src/config.py:2968
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr "Um sich vom Server abzumelden, muss das Konto aktiviert sein."
 
-#: ../src/config.py:2981 ../src/gui_interface.py:271
-#: ../src/gui_interface.py:723
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2982 ../src/gui_interface.py:703
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:2983 ../src/gui_interface.py:723
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2993
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:2994
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:3008
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Verbindung zu Server %s fehlgeschlagen"
 
-#: ../src/config.py:3009
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "Was möchten Sie tun?"
 
-#: ../src/config.py:3010
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "Kont_o nur aus Gajim entfernen"
 
-#: ../src/config.py:3011
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "Bitte nichts entfernen. Ich versuche es später noch einmal"
 
-#: ../src/config.py:3105
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3106
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:3107
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:3179
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 # TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:3212
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:3213
+#: ../src/config.py:3280
 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:3338 ../src/dialogs.py:2040
-msgid "Invalid nickname"
-msgstr "Ungültiger Benutzername"
-
-#: ../src/config.py:3339 ../src/config.py:3350 ../src/config.py:3359
-#: ../src/config.py:3370 ../src/config.py:3378
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Zeichen nicht erlaubt"
 
-#: ../src/config.py:3350 ../src/config.py:3358 ../src/config.py:3370
-#: ../src/config.py:3630
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:3377
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Ungültiger Raum"
 
-#: ../src/config.py:3546
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3547 ../src/config.py:3553
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6855,35 +7427,35 @@ msgstr ""
 "Button drücken, oder später den Eintrag Konto im Ändern Menü in der "
 "Kontaktliste auswählen."
 
-#: ../src/config.py:3552
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3591
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3593
+#: ../src/config.py:3661
 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:3631
+#: ../src/config.py:3703
 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:3687 ../src/gui_interface.py:1201
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3688 ../src/gui_interface.py:1202
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3765
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6898,7 +7470,7 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3771 ../src/gui_interface.py:1230
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6909,77 +7481,89 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3803 ../src/config.py:3837
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3902
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3903
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:4033
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP-Knoten wurde nicht entfernt"
 
-#: ../src/config.py:4034
+#: ../src/config.py:4119
 #, 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:4062
+#: ../src/config.py:4147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Einstellen"
 
-#: ../src/config.py:4078 ../src/plugins/gui.py:73
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:4121
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Erste empfangene Nachricht"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:4122
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht ausgewählt"
 
-#: ../src/config.py:4124
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht ausgewählt"
 
-#: ../src/config.py:4125
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:4126
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:4127
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:4128
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Hervorhebung von Chatraum-Nachrichten"
 
-#: ../src/config.py:4129
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Chatraum-Nachricht empfangen"
 
-#: ../src/config.py:4130
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "E-Mail über Google-Mail empfangen"
 
-#: ../src/conversation_textview.py:603
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6989,7 +7573,7 @@ msgstr ""
 "am anderen Ende eingetroffen ist. Falls es längere\n"
 "Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
 
-#: ../src/conversation_textview.py:622
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6997,44 +7581,44 @@ msgstr ""
 "Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
 "diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Zitieren"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:767
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:835
 #, 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:797
+#: ../src/conversation_textview.py:848
 #, 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:800
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:806
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1309
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7042,190 +7626,191 @@ msgstr[0] "Gestern"
 msgstr[1] "vor %(nb_days)i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1358 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: ../src/dataforms_widget.py:565
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/dataforms_widget.py:567
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Medientyp wird nicht unterstützt"
 
-#: ../src/dataforms_widget.py:582
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Die Jabber-ID steht bereits in der Liste"
 
-#: ../src/dataforms_widget.py:628
+#: ../src/dataforms_widget.py:638
 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:639
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "neu@jabber.id"
 
-#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:197
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:295
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:475
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:595
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
 
-#: ../src/dialogs.py:609
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: ../src/dialogs.py:800
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:805
 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:809
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Als Vorlage für Statusnachrichten speichern"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG-Nummer"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo-Adresse"
 
-#: ../src/dialogs.py:879
+#: ../src/dialogs.py:883
 #, 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:882
+#: ../src/dialogs.py:886
 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:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
-#: ../src/dialogs.py:3585
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:1081
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:1086
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:1273
-msgid "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
 msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1275
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1305
 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:1311
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -7235,7 +7820,7 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7248,109 +7833,155 @@ msgstr ""
 "\n"
 "Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1842
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Unsichere Verbindung"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Sie sind dabei, eine ungesicherte Verbindung zu einem Server aufzubauen. Das "
+"bedeutet, dass alle Unterhaltungen unverschlüsselt übertragen werden. Sind "
+"Sie sicher, dass Sie das tun wollen?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "_Nicht noch einmal fragen"
+
+#: ../src/dialogs.py:1950
 msgid "_Resume"
 msgstr ""
 
-#: ../src/dialogs.py:1850
+#: ../src/dialogs.py:1958
 msgid "Re_place"
 msgstr ""
 
-#: ../src/dialogs.py:2041 ../src/dialogs.py:2440
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Die Jabber-ID enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2277
 #, 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:2162
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:2246 ../src/gui_interface.py:1950
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:2252
+#: ../src/dialogs.py:2370
 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:2296
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:2427
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Falscher URI"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Dies ist kein Chatraum"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Ungültiges Konto"
 
-#: ../src/dialogs.py:2428
+#: ../src/dialogs.py:2599
 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:2439
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:2444 ../src/dialogs.py:2450
-#: ../src/groupchat_control.py:2088
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:2445
+#: ../src/dialogs.py:2617
 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:2451 ../src/groupchat_control.py:2089
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2455 ../src/gui_interface.py:1932
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:2456 ../src/gui_interface.py:1933
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:2488
+#: ../src/dialogs.py:2663
 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:2501
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2537
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:2538
+#: ../src/dialogs.py:2713
 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:2563
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:2626
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:2627
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7359,150 +7990,135 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2654 ../src/dialogs.py:3035 ../src/dialogs.py:3265
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:2655 ../src/dialogs.py:3036 ../src/dialogs.py:3266
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:2664 ../src/dialogs.py:2667
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:2667
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:2676
+#: ../src/dialogs.py:2851
 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:2695
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2695
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2699
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2700
+#: ../src/dialogs.py:2875
 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:2737 ../src/notify.py:182 ../src/notify.py:419
-msgid "Contact Signed In"
-msgstr "Kontakt hat sich angemeldet"
-
-#: ../src/dialogs.py:2739 ../src/notify.py:190 ../src/notify.py:421
-msgid "Contact Signed Out"
-msgstr "Kontakt hat sich abgemeldet"
-
-#: ../src/dialogs.py:2742 ../src/gui_interface.py:840 ../src/notify.py:433
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2744 ../src/gui_interface.py:895 ../src/notify.py:426
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2746 ../src/gui_interface.py:802
-#: ../src/gui_interface.py:866 ../src/notify.py:428
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2748 ../src/gui_interface.py:941
-#: ../src/gui_interface.py:964 ../src/gui_interface.py:981
-#: ../src/notify.py:430
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2749 ../src/gui_interface.py:944 ../src/notify.py:431
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:2751 ../src/gui_interface.py:649 ../src/notify.py:435
-msgid "Groupchat Invitation"
-msgstr "Gruppenchat-Einladung"
-
-#: ../src/dialogs.py:2753 ../src/notify.py:174 ../src/notify.py:437
-msgid "Contact Changed Status"
-msgstr "Kontakt hat Status verändert"
-
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2956
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2961
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3007
+#: ../src/dialogs.py:3185
 #, 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:3086
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:3087
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:3146
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:3148
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML-Konsole"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3295
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "hinzufügen"
 
-#: ../src/dialogs.py:3295
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "Verändern"
 
-#: ../src/dialogs.py:3296
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "Entfernen"
 
-#: ../src/dialogs.py:3325
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7512,199 +8128,188 @@ msgstr ""
 "%(action)s</b>."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3341 ../src/dialogs.py:3387
-msgid "Add"
-msgstr "Hinzufügen"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3343 ../src/dialogs.py:3418
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Verändern"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3345 ../src/dialogs.py:3442
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../src/dialogs.py:3349
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3355
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Gruppen"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3463
+#: ../src/dialogs.py:3646
 #, 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:3477
-#, python-format
-msgid "Added %d contacts"
-msgstr "%d Kontakte hinzugefügt"
-
-#: ../src/dialogs.py:3477
-#, python-format
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
 msgid "Added %d contact"
-msgstr "%d Kontakt hinzugefügt"
-
-#: ../src/dialogs.py:3514
-#, python-format
-msgid "Removed %d contacts"
-msgstr "%d Kontakte entfernt"
+msgid_plural "Added %d contacts"
+msgstr[0] "%d Kontakt hinzugefügt"
+msgstr[1] "%d Kontakt hinzugefügt"
 
-#: ../src/dialogs.py:3514
-#, python-format
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
 msgid "Removed %d contact"
-msgstr "%d Kontakt entfernt"
+msgid_plural "Removed %d contacts"
+msgstr[0] "%d Kontakt entfernt"
+msgstr[1] "%d Kontakt entfernt"
 
-#: ../src/dialogs.py:3554 ../src/dialogs.py:3731
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3594
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Ungültiger Servername"
 
-#: ../src/dialogs.py:3595
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3642
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3862
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Der Dienst gab einen Fehler zurück."
 
-#: ../src/dialogs.py:3930
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3934
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:4001
+#: ../src/dialogs.py:4186
 #, 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:4006
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:4057
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:4168
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:4267
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:4269
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:4358
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:4359
+#: ../src/dialogs.py:4544
 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:4391
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:4396
+#: ../src/dialogs.py:4585
 #, 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:4404
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:4406
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:4468
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "Clientzertifikat #PCKS12 auswählen"
 
-#: ../src/dialogs.py:4478 ../src/dialogs.py:4520 ../src/dialogs.py:4576
-#: ../src/dialogs.py:4664
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:4483
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "PKCS12 Dateien"
 
-#: ../src/dialogs.py:4510
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:4563
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:4581
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4651
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:4669
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:4695
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:4697
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
-#: ../src/dialogs.py:4917
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7716,19 +8321,19 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>"
 "%(sas)s</b>"
 
-#: ../src/dialogs.py:4920
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:4926 ../src/dialogs.py:5010
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:4932
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:4937
+#: ../src/dialogs.py:5133
 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 "
@@ -7738,19 +8343,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:4940 ../src/dialogs.py:4991 ../src/dialogs.py:5004
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:4956
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:4957
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7766,13 +8371,13 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
 "b>"
 
-#: ../src/dialogs.py:4958
+#: ../src/dialogs.py:5154
 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:4992
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
@@ -7780,17 +8385,21 @@ msgstr ""
 "Schlüssel überein."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4998
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5005
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "Ein GPG-Schlüssel ist dem Kontakt zugewiesen, aber <b>Sie vertrauen dem "
 "Schlüssel nicht<b/>. Die Nachricht <b>kann nicht</b> verschlüsselt werden. "
@@ -7798,27 +8407,28 @@ msgstr ""
 "einzustufen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:5011
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "Ein vertrauenswürdiger GPG-Schlüssel ist dem Kontakt zugewiesen. Die "
 "Nachrichten werden verschlüsselt."
 
-#: ../src/dialogs.py:5076
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "eine Audio und Video"
 
-#: ../src/dialogs.py:5078
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "eine Audio"
 
-#: ../src/dialogs.py:5080
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "eine Video"
 
-#: ../src/dialogs.py:5084
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7827,12 +8437,12 @@ msgstr ""
 "%(contact)s möchte eine %(type)s-Sitzung mit dir starten. Möchten Sie den "
 "Anruf annehmen?"
 
-#: ../src/dialogs.py:5152
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/dialogs.py:5152
+#: ../src/dialogs.py:5376
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -7854,37 +8464,42 @@ msgid ""
 "SHA1 Fingerprint: %(sha1)s"
 msgstr ""
 
-#: ../src/dialogs.py:5186 ../src/dialogs.py:5203
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
 msgid "View cert..."
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Clientzertifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Andere"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:517
 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:602
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7893,96 +8508,96 @@ msgstr ""
 "Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
 "erneut."
 
-#: ../src/disco.py:765 ../src/disco.py:1102
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 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:806 ../src/disco.py:816
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: ../src/disco.py:914
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:1103
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1343
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Befehl ausführen"
 
-#: ../src/disco.py:1353 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Durchsuche %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2468
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Chatraum ist bereits gespeichert"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2469
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2483
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Chatraum wurde erfolgreich gespeichert"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2484
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2055
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:2063
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2127
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:2133
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:2139
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
@@ -7999,7 +8614,8 @@ msgstr ""
 "Verbindung gewährleisten."
 
 #: ../src/features_window.py:52 ../src/features_window.py:53
-msgid "Requires python-pyopenssl."
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Erfordert python-pyopenssl."
 
 #: ../src/features_window.py:54
@@ -8017,9 +8633,10 @@ msgid "Requires python-avahi."
 msgstr "Erfordert python-avahi."
 
 #: ../src/features_window.py:57
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
-"Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
 
 #: ../src/features_window.py:58
 msgid "Command line"
@@ -8035,18 +8652,20 @@ msgstr "Erfordert python-dbus."
 
 #: ../src/features_window.py:61 ../src/features_window.py:69
 #: ../src/features_window.py:73 ../src/features_window.py:77
-#: ../src/features_window.py:85 ../src/features_window.py:89
-#: ../src/features_window.py:109
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Funktion unter Windows nicht verfügbar."
 
 #: ../src/features_window.py:62
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
 # TODO: GPG/PGP unification in original strings needed
 #: ../src/features_window.py:63
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
 
 #: ../src/features_window.py:64
@@ -8124,6 +8743,11 @@ msgstr ""
 msgid "Requires libgtkspell."
 msgstr "Erfordert die libgtkspell-Bibliothek."
 
+#: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Erfordert die libgtkspell-Bibliothek."
+
 #: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Benachrichtigungen"
@@ -8159,50 +8783,22 @@ msgid "Requires python2.5."
 msgstr "Erfordert python-gnome2 (Version 2.5)."
 
 #: ../src/features_window.py:94
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:95
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-"Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als "
-"LaTeX interpretiert."
-
-#: ../src/features_window.py:96
-#, fuzzy
-msgid ""
-"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:97
-#, 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 ""
-"Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie müssen "
-"'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
-
-#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "ESession-Verschlüsselung"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Nachrichten können per ESession verschlüsselt werden."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Erfordert python-crypto"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST-Generator"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8210,139 +8806,137 @@ msgstr ""
 "Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe http://docutils.sourceforge."
 "net/docs/ref/rst/restructuredtext.html (Englisch))."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Erfordert python-docutils."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Audio und Video Chat sind möglich."
 
-#: ../src/features_window.py:108
+#: ../src/features_window.py:104
 #, fuzzy
-msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgid "Requires python-farstream and gstreamer-plugins-bad."
 msgstr "Erfordert python-farsight."
 
-#: ../src/features_window.py:116
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "Erfordert python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Erfordert python-dbus."
+
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "?Features:Verfügbar"
 
-#: ../src/features_window.py:123
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Feature"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Datei"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:541
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Sie"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Absender: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Dateiübertragung abgeschlossen"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Dateiübertragung abgebrochen"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Dateiübertragung gestoppt"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:266
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Datei auswählen …"
 
-#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Auf diese Datei kann nicht zugegriffen werden"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:330
-#, python-format
-msgid "File: %s"
-msgstr "Datei: %s"
-
-#: ../src/filetransfers_window.py:336
-#, python-format
-msgid "Type: %s"
-msgstr "Typ: %s"
-
-#: ../src/filetransfers_window.py:338
-#, python-format
-msgid "Description: %s"
-msgstr "Beschreibung: %s"
-
-#: ../src/filetransfers_window.py:339
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s möchte Ihnen eine Datei senden:"
-
-#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8350,35 +8944,66 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
 "erforderlichen Rechte, um sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:379 ../src/gtkgui_helpers.py:862
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
 "anzulegen."
 
-#: ../src/filetransfers_window.py:389
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Datei speichern unter …"
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Datei: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Typ: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Beschreibung: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s möchte Ihnen eine Datei senden:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Sende Profil …"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Dateiübertragungsfehler"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:459
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8386,65 +9011,107 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:552
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:595
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:599
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:787
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "Nachricht"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Emoticons:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Nur in der Kontaktliste zeigen"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Erweiterter Konfigurationseditor"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s Konfigurationsfehler"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "_Einstellen"
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "Import von PyGTIK fehlgeschlagen: %s"
 
-#: ../src/gajim.py:230
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim benötigt PyGTK 2.16 oder höher"
 
-#: ../src/gajim.py:231
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim benötigt PyGTK 2.16 oder höher. Abbruch …"
 
-#: ../src/gajim.py:233
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim benötigt GTK 2.16 oder höher"
 
-#: ../src/gajim.py:234
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.16 oder höher. Abbruch …"
 
-#: ../src/gajim.py:243
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt pywin32 zum Laufen"
 
-#: ../src/gajim.py:244
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8453,12 +9120,11 @@ msgstr ""
 "Bitte stellen Sie sicher das Pywin32 auf Ihrem Computer installiert ist. Sie "
 "können es unter folgender URL herunterladen: %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:360
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:361
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8466,63 +9132,65 @@ msgstr ""
 "Gajim schein bereits zu laufen.\n"
 "Soll eine weitere Instanz gestartet werden?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Zeigt die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "Gibt eine Liste aller Kontakte in der Kontaktliste aus. Eine Zeile je Kontakt"
 
-#: ../src/gajim-remote.py: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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ändert den Status eines oder mehrerer Konten"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:110
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -8531,11 +9199,18 @@ msgstr ""
 "Ein Wert von: offline, online, chat, away, xa, dnd, invisible. Wenn nicht "
 "definiert, wird der letzte Kontostatus verwendet"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "Nachricht"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8544,19 +9219,20 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "Ändert die Priorität eines oder mehrerer Konten"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "Priorität"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "Priorität, die Sie dem Konto geben möchten"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:122
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -8565,25 +9241,25 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:128
 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.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Jabber-ID des Kontakts, mit dem Sie chatten möchten"
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
 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.py:140
 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 "
@@ -8593,30 +9269,30 @@ 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:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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.py:153
 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 "
@@ -8626,135 +9302,135 @@ 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.py:158
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 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.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Jabber-ID des Kontakts"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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.py:197
 msgid "Lists all preferences and their values"
 msgstr "Zeigt alle Einstellungen und ihre Werte"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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.py:208
 msgid "Deletes a preference item"
 msgstr "Löscht eine Einstellung"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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.py:219
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Fügt den Kontakt der Kontaktliste hinzu"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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.py:236
 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.py:243
 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:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öffnet den Dialog zum Beginnen eines Chats"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Startet einen Chat über dieses Konto"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8762,15 +9438,15 @@ 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
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "Avatar ändern"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "Bild, das benutzt werden soll"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -8778,71 +9454,74 @@ msgstr ""
 "Konto, für das der Avatar definiert wird; falls nicht angegeben, wird der "
 "Avatar allen Konten zugewiesen"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Verarbeite einen xmpp:/-URI"
 
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "URI"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "Zu verarbeitender URI"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr "Konto, mit dem er verarbeitet werden soll"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Neuen Chatraum betreten"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "Chatraum"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "Jabber-ID des Chatraums"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "Spitzname, der benutzt werden soll"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "Das Passwort, um den Chatraum zu betreten"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 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.py:297
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 
-#: ../src/gajim-remote.py:349
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8851,17 +9530,17 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:352
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 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:432
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8870,25 +9549,27 @@ msgstr ""
 "Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:440
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:446
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Der Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:515
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8898,7 +9579,7 @@ msgstr ""
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8908,11 +9589,11 @@ msgstr ""
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: ../src/gajim-remote.py:539
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "Kein URI angegeben"
 
-#: ../src/gajim-remote.py:541
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
@@ -8938,226 +9619,225 @@ msgid "You cannot delete your current theme"
 msgstr "Sie können Ihr derzeitiges Design nicht löschen"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr ""
 "Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
 
-#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, 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:202 ../src/groupchat_control.py:1761
-#: ../src/history_window.py:447 ../src/notify.py:169
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s ist jetzt %(status)s"
-
-#: ../src/groupchat_control.py:230
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:232
+#: ../src/groupchat_control.py:238
 #, 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:561
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:746
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:748
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#: ../src/groupchat_control.py:1228
+#: ../src/groupchat_control.py:1268
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s hat das Thema in %(subject)s geändert"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1246 ../src/groupchat_control.py:1505
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
 
-#: ../src/groupchat_control.py:1249
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
 
-#: ../src/groupchat_control.py:1251
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: ../src/groupchat_control.py:1253
+#: ../src/groupchat_control.py:1293
 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/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
 
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "Der Chatraum ist jetzt nicht mehr anonym"
 
-#: ../src/groupchat_control.py:1264
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "Der Chatraum ist jetzt semi-anonym"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "Der Chatraum ist jetzt komplett anonym"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1512
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1515
+#: ../src/groupchat_control.py:1597
 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:1521
+#: ../src/groupchat_control.py:1603
 #, 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:1524
+#: ../src/groupchat_control.py:1606
 #, 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:1533
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1536
+#: ../src/groupchat_control.py:1618
 #, 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:1547 ../src/groupchat_control.py:1651
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1605 ../src/groupchat_control.py:1610
-#: ../src/groupchat_control.py:1616
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1607
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1612
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 "Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1618
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1795
 #, 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:1705
+#: ../src/groupchat_control.py:1799
 #, 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:1720
+#: ../src/groupchat_control.py:1814
 #, 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:1724
+#: ../src/groupchat_control.py:1818
 #, 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:1754
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Chatraum betreten"
 
-#: ../src/groupchat_control.py:2015
+#: ../src/groupchat_control.py:2124
 #, 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:2017
+#: ../src/groupchat_control.py:2126
 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:2021 ../src/gui_interface.py:695
-#: ../src/gui_interface.py:1304 ../src/gui_interface.py:1344
-#: ../src/gui_interface.py:1385 ../src/message_window.py:224
-#: ../src/roster_window.py:2941 ../src/roster_window.py:3616
-#: ../src/roster_window.py:4385
-msgid "_Do not ask me again"
-msgstr "_Nicht noch einmal fragen"
-
-#: ../src/groupchat_control.py:2055
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:2056
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:2063
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:2064
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2095
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Lösche %s"
 
-#: ../src/groupchat_control.py:2096
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9165,22 +9845,22 @@ msgstr ""
 "Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:2098
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2293
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: ../src/groupchat_control.py:2294 ../src/groupchat_control.py:2631
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2630
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -9205,23 +9885,17 @@ msgstr "Fehler melden"
 msgid "Details"
 msgstr "Details"
 
-#. we talk about file
-#: ../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:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 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:392
+#: ../src/gtkgui_helpers.py:393
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -9229,44 +9903,44 @@ msgstr ""
 "funktionieren"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ist nicht Ihr Standard-Jabber-Client"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 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:768
+#: ../src/gtkgui_helpers.py:769
 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:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Bild speichern unter …"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:126 ../src/gui_interface.py:283
-#: ../src/gui_interface.py:292 ../src/gui_interface.py:297
-#: ../src/gui_interface.py:300 ../src/gui_interface.py:303
-#: ../src/gui_interface.py:308
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Fehler beim Betreten des Chatraums"
 
-#: ../src/gui_interface.py:127
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9277,93 +9951,87 @@ msgstr ""
 "von einem anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/gui_interface.py:130
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Benutze bei einem Konflikt immer diesen Spitznamen"
 
-#: ../src/gui_interface.py:147
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:160
 #, 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:195 ../src/notify.py:439
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gui_interface.py:272
+#: ../src/gui_interface.py:287
 #, 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:284
-#, python-format
-msgid "Maximum number of users for %s has been reached"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Die maximale Anzahl an Benutzern für %s wurde erreicht"
 
-#: ../src/gui_interface.py:293
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Sie wurden aus dem Chatraum %s verbannt."
 
-#: ../src/gui_interface.py:298
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Der Chatraum %s existiert nicht."
 
-#: ../src/gui_interface.py:301
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Die Chatraumerstellung ist eingeschränkt."
 
-#: ../src/gui_interface.py:304
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr ""
 "Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
 
-#: ../src/gui_interface.py:309
+#: ../src/gui_interface.py:325
 #, 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:440 ../src/gui_interface.py:444
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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:455 ../src/gui_interface.py:469
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
-
-#: ../src/gui_interface.py:496 ../src/notify.py:441
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Abonnementanfrage"
 
-#: ../src/gui_interface.py:521
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gui_interface.py:522
+#: ../src/gui_interface.py:500
 #, 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:530
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gui_interface.py:531
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9371,72 +10039,110 @@ msgstr ""
 "Er wird Ihnen von nun an als offline angezeigt.\n"
 "Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
 
-#: ../src/gui_interface.py:552 ../src/notify.py:443
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: ../src/gui_interface.py:563
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:661
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "Sie haben Gajim für die Verwendung des GPG-Agenten konfiguriert, es läuft "
 "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:663 ../src/gui_interface.py:671
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
 
-#: ../src/gui_interface.py:665
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gui_interface.py:670
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG Passphrase ist falsch"
 
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Das Zertifikat ist abgelaufen."
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr ""
+"Geben Sie die GPG-Passphrase für den Schlüssel %(keyid)s ein (Konto: "
+"%(account)s)."
+
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:693
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG-Schlüssel ist nicht vertrauenswürdig"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:693
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 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:706
+#: ../src/gui_interface.py:717
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Gnome Keyring ist installiert, wurde aber nicht korrekt gestartet (die "
 "Umgebungsvariablen sind möglicherweise nicht korrekt gesetzt gesetzt)"
 
-#: ../src/gui_interface.py:813
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
 
-#: ../src/gui_interface.py:815
+#: ../src/gui_interface.py:858
 #, 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:828
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9451,59 +10157,67 @@ msgstr ""
 "Betreff: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:893
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/gui_interface.py:930 ../src/roster_window.py:1891
-msgid "Remote contact stopped transfer"
-msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
-
-#: ../src/gui_interface.py:933 ../src/roster_window.py:1893
-msgid "Error opening file"
-msgstr "Fehler beim Öffnen der Datei:"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/gui_interface.py:965
+#: ../src/gui_interface.py:1059
 #, 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:969
+#: ../src/gui_interface.py:1063
 #, 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:982
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr ""
+"Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
+
+#: ../src/gui_interface.py:1080
 #, 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:986
+#: ../src/gui_interface.py:1084
 #, 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:1061
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
+
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: ../src/gui_interface.py:1073
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gui_interface.py:1074
+#: ../src/gui_interface.py:1176
 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:1089
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/gui_interface.py:1090
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9512,20 +10226,20 @@ msgstr ""
 "geben Sie eine neue Ressource ein"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1135
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s möchte einen Sprachchat beginnen."
 
-#: ../src/gui_interface.py:1138
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Anfrage für Sprachchat"
 
-#: ../src/gui_interface.py:1225
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9536,17 +10250,22 @@ msgstr ""
 "Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/gui_interface.py:1235
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gui_interface.py:1260
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL/TLS-Zertifikatprüfung"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
 # FIXME: Check English. Should be:
 # your connection has been hacked.
-#: ../src/gui_interface.py:1261
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9564,28 +10283,7 @@ msgstr ""
 "Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
 "aktualisieren?"
 
-#: ../src/gui_interface.py:1297 ../src/gui_interface.py:1339
-#: ../src/gui_interface.py:1381
-msgid "Insecure connection"
-msgstr "Unsichere Verbindung"
-
-#: ../src/gui_interface.py:1298
-#, fuzzy, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) with an "
-"insecure connection. This means all your conversations will be exchanged "
-"unencrypted. Are you sure you want to do that?"
-msgstr ""
-"Sie sind dabei, eine ungesicherte Verbindung zu einem Server aufzubauen. Das "
-"bedeutet, dass alle Unterhaltungen unverschlüsselt übertragen werden. Sind "
-"Sie sicher, dass Sie das tun wollen?"
-
-#: ../src/gui_interface.py:1303 ../src/gui_interface.py:1343
-#: ../src/gui_interface.py:1384
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
-
-#: ../src/gui_interface.py:1340
+#: ../src/gui_interface.py:1447
 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?"
@@ -9594,7 +10292,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:1382
+#: ../src/gui_interface.py:1489
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -9603,11 +10301,11 @@ msgstr ""
 "zu übertragen. Sind Sie sicher, dass Sie dies tun möchten?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1889 ../src/gui_interface.py:1912
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gui_interface.py:1890
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9615,7 +10313,7 @@ msgstr ""
 "Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
 "deaktiviert."
 
-#: ../src/gui_interface.py:1913
+#: ../src/gui_interface.py:2019
 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 "
@@ -9625,94 +10323,97 @@ 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:1957 ../src/roster_window.py:3783
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2344
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gui_interface.py:2891
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:2892
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Geben Sie die GPG-Passphrase für den Schlüssel %(keyid)s ein (Konto: "
 "%(account)s)."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:2906
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG-Schlüssel abgelaufen"
 
 # TODO: GPG/PGP unification in original strings needed
 # FIXME: should be "has expired"
-#: ../src/gui_interface.py:2907
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
 "Ihr GPG-Schlüssel ist abgelaufen. Sie werden ohne OpenPGP-Verschlüsselung "
 "mit %s verbunden."
 
 #. ask again
-#: ../src/gui_interface.py:2916
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:2917
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
 "Abbrechen."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/gui_menu_builder.py:419
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
 
-#: ../src/history_manager.py:116
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "Erstelle Verzeichnis %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufs-Datenkbank nicht finden"
 
-#. holds jid
-#: ../src/history_manager.py:156
-msgid "Contacts"
-msgstr "Kontakte"
-
 #. holds time
-#: ../src/history_manager.py:169 ../src/history_manager.py:213
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:176 ../src/history_manager.py:232
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. holds message
-#: ../src/history_manager.py:185 ../src/history_manager.py:220
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Nachricht"
 
 #. holds subject
-#: ../src/history_manager.py:193 ../src/history_manager.py:226
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Thema"
 
-#: ../src/history_manager.py:252
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9720,7 +10421,7 @@ msgstr ""
 "Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE "
 "LÄUFT)"
 
-#: ../src/history_manager.py:254
+#: ../src/history_manager.py:264
 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 "
@@ -9734,112 +10435,108 @@ msgstr ""
 "\n"
 "Falls Sie JA klicken, warten Sie danach bitte einen Augenblick …"
 
-#: ../src/history_manager.py:259
+#: ../src/history_manager.py:269
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Datenbankfehler"
 
-#: ../src/history_manager.py:477
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exportiere Verlauf …"
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s sagte um %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:592
+#: ../src/history_manager.py:602
 #, fuzzy, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
 msgstr "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
 
-#: ../src/history_manager.py:596
+#: ../src/history_manager.py:606
 #, fuzzy
 msgid "Do you really want to delete logs of the selected contacts?"
 msgstr "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
 
-#: ../src/history_manager.py:598 ../src/history_manager.py:637
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Bestätigung abbrechen"
 
-#: ../src/history_manager.py:634
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
 msgstr[1] "Möchten Sie die ausgewählten Nachrichten wirklich löschen?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Unterhaltungs-Verlauf mit %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Festplattenfehler"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Fehler: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
-#: ../src/htmltextview.py:518 ../src/htmltextview.py:528
-msgid "Timeout loading image"
-msgstr "Konnte Bild nicht laden"
-
-#: ../src/htmltextview.py:538
-msgid "Image is too big"
-msgstr "Das Bild ist zu groß"
-
-#: ../src/htmltextview.py:571
+#: ../src/htmltextview.py:523
 #, fuzzy
 msgid "Loading"
 msgstr "Programmieren"
 
-#: ../src/message_window.py:222
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
+
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Sie sind dabei verschiedene Tabs zu schließen"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Möchten Sie wirklich alle schließen?"
 
-#: ../src/message_window.py:497
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:499
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Chatraum"
 
-#: ../src/message_window.py:501
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:507
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -9851,67 +10548,57 @@ msgstr "- Nachrichten werden aufgezeichnet"
 msgid "- messages will not be logged"
 msgstr "- Nachrichten werden nicht aufgezeichnet"
 
-#: ../src/notify.py:167
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s änderte seinen Status"
-
-#: ../src/notify.py:177
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s angemeldet"
-
-#: ../src/notify.py:185
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s abgemeldet"
-
-#: ../src/notify.py:482
+#: ../src/notify.py:324
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/plugins/gui.py:67
+#: ../src/plugins/gui.py:82
 msgid "Plugin"
 msgstr ""
 
-#: ../src/plugins/gui.py:160
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "%s verbannen"
+
+#: ../src/plugins/gui.py:209
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registrierung ist fehlgeschlagen"
 
-#: ../src/plugins/gui.py:204
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
 #. members not safe
-#: ../src/plugins/gui.py:212 ../src/plugins/pluginmanager.py:495
-#: ../src/plugins/pluginmanager.py:503
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Der Dienst sendete unzureichende Daten."
 
-#: ../src/plugins/gui.py:235 ../src/plugins/gui.py:243
-#: ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/plugins/gui.py:235
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr ""
 
-#: ../src/plugins/gui.py:264
+#: ../src/plugins/gui.py:316
 #, fuzzy
 msgid "Configuration"
 msgstr "Chatraum-Einstellungen"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:481 ../src/plugins/pluginmanager.py:487
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
 msgid "Archive corrupted"
 msgstr ""
 
-#: ../src/plugins/pluginmanager.py:483
+#: ../src/plugins/pluginmanager.py:514
 #, fuzzy
 msgid "Archive empty"
 msgstr "Datei ist leer"
@@ -9920,52 +10607,53 @@ msgstr "Datei ist leer"
 msgid "Retrieving profile..."
 msgstr "Empfange Profil …"
 
-#: ../src/profile_window.py:125 ../src/roster_window.py:3136
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:128 ../src/roster_window.py:3139
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:142 ../src/profile_window.py:158
-#: ../src/roster_window.py:3141 ../src/roster_window.py:3152
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "Falsches Datumsformat"
 
-#: ../src/profile_window.py:230
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Datumsformat muss JJJJ-MM-TT entsprechen"
 
-#: ../src/profile_window.py:284
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informationen empfangen"
 
-#: ../src/profile_window.py:362
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:375
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Sende Profil …"
 
-#: ../src/profile_window.py:394
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informationen NICHT veröffentlicht"
 
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Veröffentlichung der vCard fehlgeschlagen"
 
-#: ../src/profile_window.py:402
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9973,54 +10661,55 @@ msgstr ""
 "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
 "aufgetreten. Versuchen Sie es später erneut."
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1028
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1956
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1957
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2084
 #, 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:1995
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1996
+#: ../src/roster_window.py:2099
 #, 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:2023
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG ist nicht benutzbar"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:2024
+#: ../src/roster_window.py:2127
 #, 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:2236 ../src/roster_window.py:3713
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2237 ../src/roster_window.py:3714
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10028,27 +10717,27 @@ 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:2263
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Gajim wirklich beenden?"
 
-#: ../src/roster_window.py:2330
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Möchten Sie Gajim wirklich verlassen?"
 
-#: ../src/roster_window.py:2331
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Gajim immer schließen"
 
-#: ../src/roster_window.py:2415
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "Sie haben laufende Dateiübertragungen"
 
-#: ../src/roster_window.py:2416
+#: ../src/roster_window.py:2520
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
@@ -10057,11 +10746,11 @@ msgstr ""
 "Wenn Sie jetzt beenden, werden die laufenden Dateiübertragungen abgebrochen. "
 "Möchten Sie noch beenden?"
 
-#: ../src/roster_window.py:2447 ../src/roster_window.py:2855
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2448
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10069,16 +10758,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:2856
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2859
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2860
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10086,11 +10775,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
 "austauschen."
 
-#: ../src/roster_window.py:2863
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:2868
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10099,12 +10788,12 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
 "austauschen: %s"
 
-#: ../src/roster_window.py:2936
+#: ../src/roster_window.py:3043
 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:2938
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10113,57 +10802,57 @@ msgstr ""
 "Nachrichten empfangen, die er Ihnen sendet."
 
 #. it's jid
-#: ../src/roster_window.py:3028
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:3029
+#: ../src/roster_window.py:3085
 #, 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:3036
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:3037
+#: ../src/roster_window.py:3093
 #, 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:3082
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:3083
+#: ../src/roster_window.py:3139
 #, 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:3084
+#: ../src/roster_window.py:3140
 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:3123
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3523
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3525
+#: ../src/roster_window.py:3637
 #, 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:3530
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10173,11 +10862,11 @@ msgstr ""
 "offline sehen wird."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3536
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3540
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10186,17 +10875,17 @@ msgstr ""
 "Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
 "offline sehen wird."
 
-#: ../src/roster_window.py:3543
+#: ../src/roster_window.py:3655
 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:3547
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3552
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10206,14 +10895,15 @@ 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:3610
+#: ../src/roster_window.py:3722
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen angepassten Status zu senden. Wollen Sie wirklich "
 "fortfahren?"
 
-#: ../src/roster_window.py:3612
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10222,38 +10912,39 @@ msgstr ""
 "Dieser 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:3631
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3632
+#: ../src/roster_window.py:3744
 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:4285
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:4287
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Ihr Server unterstützt das Speichern von Metakontakt-Informationen nicht. "
 "Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
 "gespeichert."
 
-#: ../src/roster_window.py:4379
+#: ../src/roster_window.py:4550
 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:4381
+#: ../src/roster_window.py:4552
 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 "
@@ -10263,28 +10954,28 @@ msgstr ""
 "gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
 "Jabber- oder Transport-Konten hat."
 
-#: ../src/roster_window.py:4502
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:4514
+#: ../src/roster_window.py:4685
 #, 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:4649
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Sende %s an %s"
 
-#: ../src/roster_window.py:4660
+#: ../src/roster_window.py:4831
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "%s und %s zu Metakontakt zusammenführen"
 
-#: ../src/roster_window.py:4663
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "%s und %s zu Metakontakt zusammenführen"
@@ -10294,129 +10985,129 @@ msgstr "%s und %s zu Metakontakt zusammenführen"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5103 ../src/roster_window.py:5157
-#: ../src/roster_window.py:5166 ../src/statusicon.py:264
-#: ../src/statusicon.py:311 ../src/statusicon.py:317
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:5173
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:5178
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:5217 ../src/statusicon.py:327
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:5237
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:5278
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:5338 ../src/roster_window.py:5443
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:5371
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:5373
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "Position veröffentlichen"
 
-#: ../src/roster_window.py:5376
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5521
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
-#: ../src/roster_window.py:5531 ../src/roster_window.py:5704
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5539
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5543
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5724
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
 #. Edit Groups
-#: ../src/roster_window.py:5733
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. Send single message
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
 #. Execute Command
-#: ../src/roster_window.py:5835
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Befehl ausführen …"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5845
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5854
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Ändern"
 
 #. Rename
-#: ../src/roster_window.py:5864
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:5924
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5933
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "Wieder ve_rbinden"
 
-#: ../src/roster_window.py:5940
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
 #. History manager
-#: ../src/roster_window.py:6029
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:6040
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:6259
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht …"
 
@@ -10433,19 +11124,14 @@ msgstr "Fehler im empfangenen Datenformular"
 msgid "No result"
 msgstr "Kein Ergebnis"
 
-#: ../src/session.py:95
-msgid "Disk WriteError"
-msgstr "Fehler beim Schreiben auf Festplatte"
-
-#: ../src/session.py:431 ../src/session.py:475
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
-#: ../src/session.py:432
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10457,7 +11143,7 @@ msgstr ""
 "\n"
 "Sind diese Optionen akzeptabel?"
 
-#: ../src/session.py:476
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10472,146 +11158,151 @@ msgstr ""
 "\n"
 "Mit der Sitzung fortfahren?"
 
-#: ../src/statusicon.py:228
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht …"
 
-#: ../src/statusicon.py:342
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "_Kontaktliste verstecken"
 
-#: ../src/statusicon.py:353
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dieses Chatraums"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blockiert]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Letzter Status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " seit %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "Untätig seit %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "Untätig seit %s"
 
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "Stimmung: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "Stimmung:"
 
-#: ../src/tooltips.py:702
-#, python-format
-msgid "Activity: %s"
-msgstr "Aktivität: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "Aktivität:"
 
-#: ../src/tooltips.py:706
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Musiktitel: %s"
 
-#: ../src/tooltips.py:710
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Position: %s"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?Transferstatus:Pausiert"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10619,32 +11310,32 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich veraltet oder defekt"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Unbekannt"
 
-#: ../src/vcard.py:310
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Time:Unbekannt"
 
-#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Rolle im Gruppenchat:<b>Rolle:</b>"
 
-#: ../src/vcard.py:371
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Mitgliedschaft:</b>"
 
-#: ../src/vcard.py:379
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10652,7 +11343,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
 "seinem interessiert"
 
-#: ../src/vcard.py:381
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10660,12 +11351,12 @@ msgstr ""
 "Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
 "interessiert"
 
-#: ../src/vcard.py:383
+#: ../src/vcard.py:412
 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:385
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10673,19 +11364,236 @@ msgstr ""
 "Sie sind nicht am Status des Kontakts interessiert, und er ist nicht Ihrem "
 "interessiert"
 
-#: ../src/vcard.py:392
+#: ../src/vcard.py:421
 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:394
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
+#~ msgid "Choose Client Cert"
+#~ msgstr "Clientzertifikat auswählen …"
+
+#~ msgid "The path to the client certificate and key in PKCS#12 format"
+#~ msgstr "Pfad zum Clientzertifikat und Schlüssel im PKCS#12 Format"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Benutzerprofil anzeigen (Strg+I)"
+
+#~ msgid "label"
+#~ msgstr "Bezeichung"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Beschreibung: "
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Die gerade abgespielten Musik_titel anzeigen"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "_Stimmungen anzeigen"
+
+#~ 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."
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Falls aktiviert, wird die Position der Kontakte in der Kontaktliste "
+#~ "angezeigt"
+
+#~ 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."
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "Englisch"
+
+#~ msgid "Belarusian"
+#~ msgstr "Weißrussisch"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarisch"
+
+#~ msgid "Breton"
+#~ msgstr "Bretonisch"
+
+#~ msgid "Czech"
+#~ msgstr "Tschechisch"
+
+#~ msgid "German"
+#~ msgstr "Deutsch"
+
+#~ msgid "Greek"
+#~ msgstr "Griechisch"
+
+#~ msgid "British"
+#~ msgstr "Britisch"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spanisch"
+
+#~ msgid "Basque"
+#~ msgstr "Baskisch"
+
+#~ msgid "French"
+#~ msgstr "Französisch"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroatisch"
+
+#~ msgid "Italian"
+#~ msgstr "Italienisch"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norwegisch (Bokmål)"
+
+#~ msgid "Dutch"
+#~ msgstr "Niederländisch"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norwegisch"
+
+#~ msgid "Polish"
+#~ msgstr "Polnisch"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugiesisch"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brasilianisch"
+
+#~ msgid "Russian"
+#~ msgstr "Russsich"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbisch"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovakisch"
+
+#~ msgid "Swedish"
+#~ msgstr "Schwedisch"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chinesisch"
+
+#~ msgid "Spelling language"
+#~ msgstr "Sprache für die Rechtschreibprüfung"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Erfordert python-farsight."
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Falls aktiviert, wird Gajim eine Zeichenkette zwischen $$ und $$ mittels "
+#~ "dvips vor dem Einfügen in ein Chatfenster in ein Bild umwandeln."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Legt die LaTeX-Anzeigengröße fest. Je höher der Wert, desto größer die "
+#~ "Anzeige."
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr ""
+#~ "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Port %s konnte nicht belegt werden (Bindung fehlgeschlagen)."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Möglicherweise läuft Gajim bereits. Dateiübertragung wird abgebrochen."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Ein Jabber-Client in GTK+"
+
+#~ msgid "Added %d contacts"
+#~ msgstr "%d Kontakte hinzugefügt"
+
+#~ msgid "Removed %d contacts"
+#~ msgstr "%d Kontakte entfernt"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr ""
+#~ "Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour "
+#~ "(Englisch))."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr ""
+#~ "Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird "
+#~ "als LaTeX interpretiert."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie "
+#~ "müssen 'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakte"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Fehler beim Schreiben auf Festplatte"
+
+#~ msgid "Mood: %s"
+#~ msgstr "Stimmung: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivität: %s"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10719,12 +11627,6 @@ msgstr " Resource mit Priorität "
 #~ msgid "Don't have "
 #~ msgstr "habe nicht "
 
-#~ msgid "File Transfer Finished"
-#~ msgstr "Dateiübertragung abgeschlossen"
-
-#~ msgid "File Transfer Request "
-#~ msgstr "Anfrage zur Dateiübertragung"
-
 #~ msgid "File Transfer Started "
 #~ msgstr "Dateiübertragung gestartet "
 
@@ -10969,9 +11871,6 @@ msgstr " Resource mit Priorität "
 #~ "Gruppenchat-Verlauf\n"
 #~ "Gesamter Chatverlauf"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Konten verwalten"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -11143,18 +12042,9 @@ msgstr " Resource mit Priorität "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Open_PGP-Schlüssel zuweisen"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Befehle: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Verwendung: /%s, leert das Textfenster."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Verwendung: /%s, versteckt die Chatschaltflächen."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -11163,12 +12053,6 @@ msgstr " Resource mit Priorität "
 #~ "Chatraum. Verwenden Sie die Person Singular, z.B. mit /%(command)s kratzt "
 #~ "sich am Kinn)."
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Keine Hilfe vorhanden für /%s."
 
@@ -11185,10 +12069,6 @@ msgstr " Resource mit Priorität "
 #~ msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Spitzname nicht gefunden: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -11201,13 +12081,6 @@ msgstr " Resource mit Priorität "
 #~ "nicht unterstützt."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit "
-#~ "dem Inhaber des angegebenen Spitznamens."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -11249,9 +12122,6 @@ msgstr " Resource mit Priorität "
 #~ msgstr ""
 #~ "Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Verwendung: /%s, zeigt die Namen der Teilnehmer im Chatraum an."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
diff --git a/po/el.po b/po/el.po
index caeb7d096..f4eec5a80 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,15 +7,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team:  <>\n"
@@ -29,321 +25,313 @@ msgstr ""
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,-1,623\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Κατάσταση"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Προσωπικές πληροφορίες"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Έναρξη συζήτησης"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 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:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Εκτέλεση εντολής..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Επεξεργασία λογαριασμού"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "Άνοιγμα υπάρχοντος μενού"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Προσωπικές πληροφορίες"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Έναρξη συζήτησης"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Κατάσταση"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Επεξεργασία λογαριασμού"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Οδηγός δημιουργίας λογαριασμού"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Ο λογαριασμός δημιουργείται</b>\n"
-"\n"
-"Παρακαλώ περιμένετε..."
+"Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
+"να συνδεθείτε στο Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, fuzzy
+msgid "I already have an account I want to _use"
+msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Παρακαλώ επιλέξτε ένα από τα παρακάτω:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "Παρακαλώ συμπληρώστε τα δεδομένα για τον υπάρχων λογαριασμό σας"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Κωδικός πρόσβασης:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "_Αποθήκευση κωδικού"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Χρήση πιστοποίησης"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Σύνδεση όταν επιλέξω Τέλος"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Οδηγός δημιουργίας λογαριασμού"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Χρήση πιστοποίησης"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-#, fuzzy
-msgid "I already have an account I want to _use"
-msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Εξυπηρετητής:"
 
 #: ../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 θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Μεσολαβητής:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 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: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 "Κανένα"
+msgid "Use custom hostname/port"
+msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Μεσολαβητής:"
+msgid "_Hostname:"
+msgstr "Εξυπηρετητής:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "_Αποθήκευση κωδικού"
+msgid "_Port:"
+msgstr "_Θύρα:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "Για προ_χωρημένους"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
-"να συνδεθείτε στο Jabber."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Τέλος"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Εξυπηρετητής:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Ο λογαριασμός δημιουργείται</b>\n"
+"\n"
+"Παρακαλώ περιμένετε..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Σύνδεση όταν επιλέξω Τέλος"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Κωδικός πρόσβασης:"
+msgid "Set my profile when I connect"
+msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Θύρα:"
+msgid "_Finish"
+msgstr "_Τέλος"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Εξυπηρετητής:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Διάφορα</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Κανένα"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Προσωπικές πληροφορίες</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Ιστορικό</b>"
+msgid "Accounts"
+msgstr "Λογαριασμοί"
 
-#: ../data/gui/accounts_window.ui.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "Αδυναμία φόρτωσης"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Προσθήκη"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Λογαριασμός"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Διαγραφή"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Λογαριασμοί"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "_Μετονομασία"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "Λίστα διαχειριστών"
+msgid "_Enable"
+msgstr "Ενεργοποίηση"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Χρήση πιστοποίησης"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 σε "
+"δύο ή περισσότερα μέρη ανάλογα με τον αριθμό των εφαρμογών που είναι "
+"συνδεδεμένες στον ίδιο εξυπηρετητή με τον ίδιο λογαριασμό. Έτσι μπορείτε να "
+"είστε συνδεδεμένος με τον ίδιο λογαριασμό με πόρο 'Σπίτι' και 'Δουλειά' την "
+"ίδια στιγμή. Ο πόρος με τη μεγαλύτερη προτεραιότητα θα λαμβάνει τα γεγονότα. "
+"(βλέπε και πιο κάτω)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
-msgid "Auto-reconnect when connection is lost"
-msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
+msgid "Synchronize contacts"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Περιήγηση"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Αλλα_γή κωδικού πρόσβασης"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's 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 ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "Λίστα διαχειριστών"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
+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:16
-msgid "Choose _Key..."
-msgstr "Επιλογή _κλειδιού..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Αδυναμία φόρτωσης"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Πατήστε για να αλλάξετε τον κωδικό του λογαριασμού"
+msgid "Priority will change automatically according to your status."
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "Π_ροτεραιότητα:"
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "Μη έγκυρο όνομα χρήστη"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Σύνδεση"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Ε-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Όνομα:"
+msgid "Resour_ce:"
+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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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:25
+#, fuzzy
+msgid "Browse..."
+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 εκτός από τη δική "
-"σας, ώστε να υπάρχουν περισσότερες πιθανότητες να δουλέψει η μεταφορά "
-"αρχείων."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
+msgid "Client certificate"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Λογαριασμός"
 
 #: ../data/gui/accounts_window.ui.h:29
-#, fuzzy
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Αν επιλεγεί, το Gajim θα στέλνει πακέτα keep-alive ώστε να αποφύγει την "
-"διακοπή της σύνδεσης"
+msgid "C_onnect on Gajim startup"
+msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -354,6 +342,19 @@ msgstr ""
 "χρησιμοποιώντας αυτόν το λογαριασμό"
 
 #: ../data/gui/accounts_window.ui.h:31
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -363,187 +364,213 @@ 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"
-"You might consider to change possible firewall settings."
-msgstr ""
-
-#: ../data/gui/accounts_window.ui.h:34
-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:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Επώνυμο:"
+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:37
-msgid "Mer_ge accounts"
-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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Γενικά"
 
-#: ../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:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Προσωπικές πληροφορίες"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Διαχείριση..."
+
+#: ../data/gui/accounts_window.ui.h:40
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Π_ροτεραιότητα:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Η προτεραιότητα χρησιμοποιείται στο Jabber για να καθορίσει ποιος λαμβάνει "
-"τα γεγονότα από τον jabber διακομιστή όταν δύο ή περισσότερες εφαρμογές "
-"είναι συνδεδεμένες χρησιμοποιώντας τον ίδιο λογαριασμό· Η εφαρμογή με την "
-"μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr ""
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Αποστολή πακέτων keep-alive"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "_Μετονομασία"
+#: ../data/gui/accounts_window.ui.h:44
+#, fuzzy
+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:45
 #, fuzzy
-msgid "Resour_ce:"
-msgstr "_Πόρος: "
+msgid "Use cust_om hostname/port"
+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 σε "
-"δύο ή περισσότερα μέρη ανάλογα με τον αριθμό των εφαρμογών που είναι "
-"συνδεδεμένες στον ίδιο εξυπηρετητή με τον ίδιο λογαριασμό. Έτσι μπορείτε να "
-"είστε συνδεδεμένος με τον ίδιο λογαριασμό με πόρο 'Σπίτι' και 'Δουλειά' την "
-"ίδια στιγμή. Ο πόρος με τη μεγαλύτερη προτεραιότητα θα λαμβάνει τα γεγονότα. "
-"(βλέπε και πιο κάτω)"
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Εξυπηρετητής:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Θύρα:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Διάφορα</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Αποστολή πακέτων keep-alive"
+msgid "Connection"
+msgstr "Σύνδεση"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Δεν έχει επιλεχτεί κλειδί"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
+msgid "Choose _Key..."
+msgstr "Επιλογή _κλειδιού..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
+msgid "_Edit Personal Information..."
+msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Χρήση προσαρμοσμένης θύρας:"
+msgid "Information about you, as stored in the server"
+msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Προσωπικές πληροφορίες</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Προσωπικές πληροφορίες"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Τροποποίηση προσωπικών πληροφοριών..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Ενεργοποίηση"
+msgid "Synchroni_ze account status with global status"
+msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Εξυπηρετητής:"
+msgid "Use cust_om port:"
+msgstr "Χρήση προσαρμοσμένης θύρας:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Διαχείριση..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Όνομα:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "_Θύρα:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Επώνυμο:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Ε-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Συ_γχώνευση λογαριασμών"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
+msgid "Add New Contact"
+msgstr "Προσθήκη νέας επαφής"
+
+#: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_ccount:"
 msgstr "_Λογαριασμός:"
 
-#: ../data/gui/add_new_contact_window.ui.h:2
+#: ../data/gui/add_new_contact_window.ui.h:3
+msgid "_Protocol:"
+msgstr "_Πρωτόκολλο:"
+
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Ταυτότητα χρήστη:"
+
+#: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Όνομα χρήστη:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Ομάδα:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
 #, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Προσθήκη νέας επαφής"
-
-#: ../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 "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Συνδρομή"
 
-#: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -551,51 +578,35 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Εγγραφή"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Ομάδα:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Όνομα χρήστη:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Πρωτόκολλο:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Εγγραφή"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Συνδρομή"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Ταυτότητα χρήστη:"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:2
 #, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
+msgid "Please wait while retrieving command list..."
+msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
 
-#: ../data/gui/adhoc_commands_window.ui.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:3
 #, fuzzy
 msgid "<b>Choose command to execute:</b>"
 msgstr "Η εκτέλεση του \"%s\" απέτυχε"
 
-#: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr ""
-
 #: ../data/gui/adhoc_commands_window.ui.h:4
 #, fuzzy
 msgid "Check once more"
@@ -603,360 +614,177 @@ msgstr "Αντικατάσταση _όλων"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
-msgid "Error description..."
-msgstr "Σφάλμα συστήματος"
+msgid "Please wait while the command is being sent..."
+msgstr "Ανανέωση περιεχομένων αρχείου, παρακαλώ περιμένετε..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Τέλος"
+msgid "Please wait..."
+msgstr "Παρακαλώ περιμένετε..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-#, fuzzy
-msgid "Please wait while retrieving command list..."
-msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
+msgid "This jabber entity does not expose any commands."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
 #, fuzzy
-msgid "Please wait while the command is sending..."
-msgstr "Ανανέωση περιεχομένων αρχείου, παρακαλώ περιμένετε..."
+msgid "<b>An error has occurred:</b>"
+msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Παρακαλώ περιμένετε..."
+#, fuzzy
+msgid "Error description..."
+msgstr "Σφάλμα συστήματος"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr ""
+#, fuzzy
+msgid "F_inish"
+msgstr "_Τέλος"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Φιλτράρισμα:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Περιγραφή</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>ΣΗΜΕΙΩΣΗ:</b> Θα πρέπει να επανεκκινήσετε το gajim για να εφαρμοστούν "
 "μερικές ρυθμίσεις"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Φιλτράρισμα:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Διαγραφή MOTD"
+msgid "Show _XML Console"
+msgstr "Κονσόλα _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Προσωπικές συζητήσεις"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Διαχειριστής"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
-msgid "Sends a message to users currently connected to this server"
-msgstr ""
-"Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
+msgid "_Send Server Message..."
+msgstr "_Αποστολή μηνύματος διακομιστή"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Ορισμός MOTD"
+msgid "Sends a message to users currently connected to this server"
+msgstr ""
+"Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Ορίζει το Μήνυμα της ημέρας (MOTD)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Κονσόλα _XML"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Ορισμός MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Ενημερώνει το Μήνυμα της ημέρας (MOTD)"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Ενημέρωση MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
-msgid "Updates Message of the Day"
-msgstr "Ενημερώνει το Μήνυμα της ημέρας (MOTD)"
-
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Διαχειριστής"
+msgid "Delete MOTD"
+msgstr "Διαγραφή MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Αποστολή μηνύματος διακομιστή"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Ενέργειες</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Συνθήκες</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Ήχοι</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Προχωρημένες ενέργειες"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Προχωρημένος έλεγχος ειδοποιήσεων"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Όλες οι καταστάσεις"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Απομακρυσμένος"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Απασχολημένος"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Η επαφή άλλαξε κατάσταση"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Αποσύνδεση επαφής"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Δεν έχει"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Μεταφορές αρχείων"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Αίτηση μεταφοράς αρχείου"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Η μεταφορά αρχείου διακόπηκε"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Επισήμανση "
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Έχει"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Αφανής"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Εκτέλεση εντολής"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Μη διαθέσιμος"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-#, fuzzy
-msgid "One or more special statuses..."
-msgstr "Ορισμένες ειδικές καταστάσεις..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-#, fuzzy
-msgid "Online / Free For Chat"
-msgstr "Online εγχειρίδιο για αυτήν την εφαρμογή"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Αναπαραγωγή ήχου"
+msgid "Deletes Message of the Day"
+msgstr "Διαγράφει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "Receive a Message"
-msgstr "Νέο προσωπικό μήνυμα"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Όταν"
+msgid "No"
+msgstr "Κανένα"
 
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:28
-#, fuzzy
-msgid "_Disable auto opening chat window"
-msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-#, fuzzy
-msgid "_Disable existing popup window"
-msgstr "Εμφάνιση ενός αναδυόμενου παραθύρου κατά την λήψη μιας κλήσης"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "_Disable existing sound for this event"
-msgstr "Το αρχείο ήχου για το παρόν γεγονός δεν υπάρχει."
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr ""
+msgid "Prefer"
+msgstr "Προτιμήσεις"
 
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:34
-#, fuzzy
-msgid "_Open chat window with user"
-msgstr "Χρήση ενός παραθύρου κουβέντας με _καρτέλες"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Προβολή τίτλου στο κουμπί"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-#, fuzzy
-msgid "_Show event in roster"
-msgstr "_Προβολή τίτλου στο κουμπί"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "και εγώ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Επαφές"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "για"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Ομάδα"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "όταν είμαι στο"
-
-#: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:2
+#: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Local</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:4
+#: ../data/gui/archiving_preferences_window.ui.h:9
 #, 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
+#: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
-msgid "No"
-msgstr "Κανένα"
+msgid "New entry received"
+msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: ../data/gui/archiving_preferences_window.ui.h:8
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
 #, 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 "Εγγραφή:"
+msgid "You have received new entry:"
+msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Feed name:"
 msgstr "Όνομα εικονιδίου"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Εγγραφή:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Τελευταία τροποποίηση:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-#, fuzzy
-msgid "New entry received"
-msgstr "Προσθήκη νέας εγγραφής στο μενού"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-#, fuzzy
-msgid "You have received new entry:"
-msgstr "Προσθήκη νέας εγγραφής στο μενού"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
@@ -964,28 +792,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -993,327 +816,320 @@ msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b
 msgid "<b>Mood:</b>"
 msgstr "<b>Ιστορικό</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Εισάγετε τον ξανά για επιβεβαίωση:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Εισάγετε τον ξανά για επιβεβαίωση:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Εισάγετε το νέο μήνυμα κατάστασης</b>"
+msgid "Save as Preset..."
+msgstr "Αποθήκευση ως προκαθορισμένο..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Ενεργό"
+msgid "Mood:"
+msgstr "Δωμάτιο:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Δωμάτιο:"
+msgid "Activity:"
+msgstr "Ενεργό"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Προκαθορισμένα μηνύματα:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Αποθήκευση ως προκαθορισμένο..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Εισάγετε το νέο μήνυμα κατάστασης</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Συμμετοχή σε _ομαδική συζήτηση"
+msgid "_Copy Link Location"
+msgstr "_Αντιγραφή τοποθεσίας δεσμού"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Προσθήκη στη λίστα επαφών"
+msgid "_Open Link in Browser"
+msgstr "_Άνοιγμα δεσμού στον περιηγητή"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Αντιγραφή τοποθεσίας δεσμού"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Άνοιγμα δεσμού στον περιηγητή"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Έναρξη συζήτησης"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Συμμετοχή σε _ομαδική συζήτηση"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Προσθήκη στη λίστα επαφών"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "έχει την προσοχή του στην κουβέντα"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "έχει την προσοχή του στην κουβέντα"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Αποστολή"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Αδυναμία φόρτωσης"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Παρατηρητές"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-
-#: ../data/gui/contact_context_menu.ui.h:1
 #, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
+msgid "MUC server"
+msgstr "Παρατηρητές"
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Προσθήκη ειδικής _γνωστοποίησης"
+msgid "In_vite"
+msgstr "Αδυναμία φόρτωσης"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Ανάθεση κλειδιού Open_PGP"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Έναρξη _συζήτησης"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Αδυναμία εκτέλεσης της εντολής:"
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Αποστολή μονού _μηνύματος"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Επεξεργασία _ομάδων"
+msgid "Send _File..."
+msgstr "Αποστολή _αρχείου"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Επαφές"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Αφαίρεση"
+msgid "Toggle End to End Encryption"
+msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Αδυναμία εκτέλεσης της εντολής:"
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Αποστολή μονού _μηνύματος"
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Μετονομασία αρχείων"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Αποστολή _αρχείου"
+msgid "_Rename..."
+msgstr "_Μετονομασία"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Επεξεργασία _ομάδων"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Έναρξη _συζήτησης"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Ανάθεση κλειδιού Open_PGP"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Προσθήκη ειδικής _γνωστοποίησης"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Συνδρομή"
 
 #: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
-msgid "_Allow him/her to see my status"
-msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
 
 #: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
-msgid "_Forbid him/her to see my status"
+msgid "_Forbid contact to see my status"
 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:5755
-msgid "_History"
-msgstr "_Ιστορικό"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "_Μετονομασία αρχείων"
+msgid "_Unignore"
+msgstr "εννιά"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Μετονομασία"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Συνδρομή"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Αφαίρεση"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "εννιά"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Ιστορικό"
 
 #: ../data/gui/data_form_window.ui.h:1
+msgid "Room Configuration"
+msgstr "Ρυθμίσεις δωματίου"
+
+#: ../data/gui/data_form_window.ui.h:2
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../data/gui/data_form_window.ui.h:2
-msgid "Room Configuration"
-msgstr "Ρυθμίσεις δωματίου"
-
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Τροποποίηση ομάδων"
@@ -1327,60 +1143,51 @@ msgstr "<b>Περιγραφή</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Χαρακτηριστικά διακομιστή"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
+msgid "File Transfers"
+msgstr "Μεταφορές αρχείων"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Ακύρωση μεταφοράς αρχείου"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
+msgid "file transfers list"
+msgstr "λίστα μεταφορών αρχείων"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Ακυρώνει την επιλεγμένη μεταφορά αρχείου και διαγράφει το ημιτελές αρχείο"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Εκκα_θάριση"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Μεταφορές αρχείων"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Αποκρύπτει το παράθυρο"
-
-#: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λίστα."
-
-#: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Αφαιρεί τις ολοκληρωμένες, ακυρωμένες και αποτυχημένες μεταφορές από τη λίστα"
 
-#: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
+#: ../data/gui/filetransfers.ui.h:8
+msgid "Remove file transfer from the list."
+msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λίστα."
 
-#: ../data/gui/filetransfers.ui.h:11
+#: ../data/gui/filetransfers.ui.h:9
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1388,42 +1195,55 @@ msgstr ""
 "Αυτή η ενέργεια αφαιρεί μια μεταφορά αρχείου από τη λίστα. Αν η μεταφορά "
 "είναι ενεργή, τότε πρώτα διακόπτεται και μετά αφαιρείται"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Εκκα_θάριση"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Παύση"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr ""
+"Ακυρώνει την επιλεγμένη μεταφορά αρχείου και διαγράφει το ημιτελές αρχείο"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Συνέχεια"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Ακύρωση μεταφοράς αρχείου"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
+msgid "Cancels the selected file transfer"
+msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Άνοιγμα του περιέχοντος φακέλου"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Αποκρύπτει το παράθυρο"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Παύση"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Συνέχεια"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "λίστα μεταφορών αρχείων"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Λογαριασμός"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Έντονα"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Ομάδα"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Επικοινωνία"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 #, fuzzy
@@ -1431,40 +1251,54 @@ msgid "Chat Banner"
 msgstr "Πανό:"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Σύνθεση"
+msgid "Gajim Themes Customization"
+msgstr "Προσαρμογή θεμάτων Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Επικοινωνία"
+msgid "Text _color:"
+msgstr "Χρώμα _κειμένου:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Γραμματοσειρά:"
+msgid "_Background:"
+msgstr "Χρώμα _φόντου:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Προσαρμογή θεμάτων Gajim"
+msgid "Text _font:"
+msgstr "Γρα_μματοσειρά κειμένου:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Έξω"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Ομάδα"
+msgid "Font style:"
+msgstr "Γραμματοσειρά:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Ανενεργό"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Έντονα"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Πλάγια"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Παύση"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Σύνθεση"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Ανενεργό"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Έξω"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1472,7 +1306,7 @@ msgstr ""
 "MUC\n"
 "Μηνύματα"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1480,22 +1314,6 @@ msgstr ""
 "Μηνύματα προς\n"
 "ομαδικές κουβέντες"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Παύση"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Χρώμα _κειμένου:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Γρα_μματοσειρά κειμένου:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "Χρώμα _φόντου:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1503,91 +1321,101 @@ msgstr "Αλλαγή _ψευδώνυμου"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Διαχείριση σελιδοδεικτών"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Αλλαγή _θέματος"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Ρύθμιση _δωματίου"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Περιγραφή: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Διαχείριση σελιδοδεικτών"
+msgid "_Request Voice"
+msgstr "_Φωνή"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "_Συντονιστής"
+msgid "_Send Private Message"
+msgstr "_Αποστολή προσωπικού μηνύματος"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Αποστολή _αρχείου"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Ενέργειες για τους συμμετέχοντες"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Αποστολή _αρχείου"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Προσθήκη στη λίστα επαφών"
+msgid "_Voice"
+msgstr "_Φωνή"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "_Συντονιστής"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Μέλος"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Διαχειριστής"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Απαγόρευση πρόσβασης"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Ιδιοκτήτης"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Μέλος"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Ιδιοκτήτης"
+msgid "_Ban"
+msgstr "_Απαγόρευση πρόσβασης"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Αποστολή προσωπικού μηνύματος"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Φωνή"
+msgid "_Add to Roster"
+msgstr "_Προσθήκη στη λίστα επαφών"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+msgid "Show a list of formattings"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Αλλαγή _ψευδώνυμου"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Αλλαγή _ψευδώνυμου"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
 #: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
@@ -1600,11 +1428,29 @@ msgid "From:"
 msgstr "Από:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Θέμα:"
 
 #: ../data/gui/history_manager.ui.h:1
+msgid "Gajim History Logs Manager"
+msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
+
+#: ../data/gui/history_manager.ui.h:2
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
+
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:6
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1621,203 +1467,190 @@ msgstr ""
 "Gajim. Γενικά να αποφύγετε να διαγράψετε από επαφές που συζητάτε αυτή τη "
 "στιγμή."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Διαγραφή"
+#: ../data/gui/history_manager.ui.h:8
+msgid "_Search Database"
+msgstr "_Αναζήτηση στη βάση δεδομένων"
 
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:9
 msgid "Export"
 msgstr "Εξαγωγή"
 
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-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"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
-msgid "_Search Database"
-msgstr "_Αναζήτηση στη βάση δεδομένων"
-
 #: ../data/gui/history_window.ui.h:1
 #, fuzzy
-msgid "All Chat Histories"
-msgstr "Παλιό όνομα - Κείμενο - Αριθμός"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Ιστορικό συζητήσεων"
-
-#: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Ομαδικές συζητήσεις"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Παλιό όνομα - Κείμενο - Αριθμός"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Ιστορικό συζητήσεων"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Αναζήτηση"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Ε_ξυπηρετητής:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Ε_ξυπηρετητής:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Δωμάτιο:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Ψευδώνυμο:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Πρόσφατα:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Πρόσφατα:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Δωμάτιο:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+msgid "Bro_wse Rooms"
+msgstr "_Περιήγηση"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Αυτόματη είσοδος"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
-"εκκίνηση"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Διαχείριση σελιδοδεικτών"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Τίτλος:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Εμφάνιση κατάστασης:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Αυτόματη είσοδος"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Τίτλος:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1830,145 +1663,141 @@ msgid "_Configure"
 msgstr "_Συνέχεια"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Ιδιότητες</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Σύνδεση HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Ρυθμίσεις</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Σύνδεση HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση προφίλ μεσολαβητή"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Τύπος:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Κωδικός πρόσβασης:"
+msgid "_Name:"
+msgstr "_Όνομα:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Μεσολαβητής:"
+msgid "<b>Properties</b>"
+msgstr "<b>Ιδιότητες</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Θύρα:"
+msgid "Use HTTP prox_y"
+msgstr "_Χρήση μεσολαβητή"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Χρήση μεσολαβητή"
+msgid "_BOSH URL:"
+msgstr "Διεύ_θυνση:"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Χρήση πιστοποίησης"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "Όν_ομα χρήστη:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "Διεύ_θυνση:"
+msgid "Pass_word:"
+msgstr "_Κωδικός πρόσβασης:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Όνομα:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Μεσολαβητής:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Τύπος:"
+msgid "Proxy _Port:"
+msgstr "_Θύρα:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "Όν_ομα χρήστη:"
+msgid "<b>Settings</b>"
+msgstr "<b>Ρυθμίσεις</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Διαχείριση λογαριασμών"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Φράση πρόσβασης"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Αμερική/Πορτ-Ο-Πρενς"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "Μη διαθέσιμος"
+msgid "Version:"
+msgstr "Έκδοση GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Συνέχεια"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Περιγραφή: %s"
+msgid "Authors:"
+msgstr "Αμερική/Πορτ-Ο-Πρενς"
 
 #: ../data/gui/plugins_window.ui.h:7
 msgid "Homepage:"
 msgstr "Προσωπ. σελίδα:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr ""
+#, fuzzy
+msgid "homepage url"
+msgstr "Προσωπ. σελίδα:"
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Πάγωσε"
+msgid "Description:"
+msgstr "Περιγραφή: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Συνέχεια"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:13
 #, fuzzy
-msgid "Version:"
-msgstr "Έκδοση GTK+:"
+msgid "Installed"
+msgstr "Πάγωσε"
 
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 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"
@@ -1980,515 +1809,502 @@ msgid "Event desc"
 msgstr "Γεγονότα"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Επεξεργασία προχωρημένων ρυθμίσεων</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Εφαρμογές</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Ενέργειες</b>"
+msgid "All chat states"
+msgstr "Όλες οι καταστάσεις"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Ενέργειες</b>"
+msgid "Composing only"
+msgstr "Σύνθεση"
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Επεξεργασία κανόνα</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
+msgid "Never"
+msgstr "_Ποτέ"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Συνθήκες</b>"
+msgid "Always"
+msgstr "Απομακρυσμένος"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Εμφάνισε το"
 
-#. 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>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Ειδοποίησε με για αυτό"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Ιστορικό</b>"
+msgid "Show only in roster"
+msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Επιλογές Gmail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "backdrops.list"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
+msgid "Last state"
+msgstr "Τελευταία κατάσταση: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Προτιμήσεις"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Ιστορικό</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Προσθήκη κανόνα</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+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:23
-msgid "Advanced"
-msgstr "Προχωρημένοι"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Προχωρημένοι"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Όλες οι καταστάσεις"
+msgid "Sort contacts by status"
+msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
+#, fuzzy
+msgid "in _roster"
+msgstr "Εκτέλεση στο Τερματικό"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
+msgid "in _group chats"
+msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./"
-"απασχολ./αφανής"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Απομακρυσμένος"
+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:31
-msgid "Ask status message when I:"
-msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Φατσούλες:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Παρά_θυρο ενός μηνύματος:"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "Μήνυμα κατά_στασης:"
+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:36
-#, fuzzy
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
+msgid "_Highlight misspelled words"
+msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Σύνθεση"
+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:38
-msgid "Configure color and font of the interface"
-msgstr ""
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Εμφάνιση του κεντρικού παραθύρου κατά την εκκίνηση του Gajim"
 
 #: ../data/gui/preferences_window.ui.h:39
-#, fuzzy
-msgid "Contact's message:"
-msgstr "Μήνυμα κατά_στασης:"
+msgid "Show icon when your messages are received"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Όνομα επαφής"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Επεξεργασία κανόνα</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Ειδοποίηση όταν μια επαφή:"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Ειδοποίηση όταν μια επαφή:"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
+"μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Απενεργοποιημένο"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./"
+"απασχολ./αφανής"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+msgid "Notify on new _GMail email"
+msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+msgid "Display _extra email details"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Επιλογές Gmail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+msgid "Show notification area icon:"
+msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-#, fuzzy
-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 "Play _sounds"
+msgstr "Αναπαραγωγή _ήχων"
 
 #: ../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 μπορεί να να στέλνει και να λαμβάνει μετα-πληροφορίες σχετικές με "
-"μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
-"θέλετε να στέλνετε στους άλλους."
+msgid "Ma_nage..."
+msgstr "Δια_χείριση..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 msgstr ""
-"Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
-"μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Ήχοι</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
+msgid "Notifications"
+msgstr "Τροποποίηση λογαριασμού"
 
 #: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
+"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 θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
-"εκκίνηση"
+"Το Gajim μπορεί να να στέλνει και να λαμβάνει μετα-πληροφορίες σχετικές με "
+"μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
+"θέλετε να στέλνετε στους άλλους."
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
 #: ../data/gui/preferences_window.ui.h:61
-#, fuzzy
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
 #: ../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 θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
-"και στις ομαδικές κουβέντες"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
 #: ../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 θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
-"κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Προσωπικές πληροφορίες"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
-"και στις ομαδικές κουβέντες"
+msgid "_Away after:"
+msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
-"και στις ομαδικές κουβέντες"
+"Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
-"και στις ομαδικές κουβέντες"
+msgid "_Not available after:"
+msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"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: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 ""
+msgid "minutes"
+msgstr "λεπτά"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Επιλέξτε το, μόνο αν κάποιος που δεν έχετε στη λίστα επαφών σας στέλνει spam "
-"ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
-"όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
-
-#: ../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:72
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Αν επιλεγεί, το Gajim θα χρησιμοποιήσει εικονίδια κατάστασης σχετικά με το "
-"πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
-"εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 θα μετατρέπει όλα ascii σύμβολα όπως το "
-"':)' με τις αντίστοιχες γραφικές φατσούλες"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Ενέργειες</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Παρά_θυρο ενός μηνύματος:"
+msgid "Ask status message when I:"
+msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Δια_χείριση..."
+msgid "Sign _in"
+msgstr "Σύν_δεση"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Ποτέ"
+msgid "Sign _out"
+msgstr "Αποσ_ύνδεση"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Τροποποίηση λογαριασμού"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Ειδοποίηση όταν μια επαφή:"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Ειδοποίηση όταν μια επαφή:"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Ειδοποίησε με για αυτό"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Κατάσταση"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
+#, fuzzy
+msgid "Use system _default"
+msgstr "Χρήση _προκαθορισμένου χρώματος"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Μήνυμα κατά_στασης:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Προσωπικές πληροφορίες"
+msgid "<b>Font</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Αναπαραγωγή _ήχων"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Εμφάνισε το"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. 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:89
-msgid "Preferences"
-msgstr "Προτιμήσεις"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
+msgid "Configure color and font of the interface"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Θέμα:"
+
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Εξυπηρετητής:"
+msgid "<b>Themes</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
+msgid "Contact's nickname:"
+msgstr "Όνομα επαφής"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
+msgid "Your nickname:"
+msgstr "Π_ριν το ψευδώνυμο:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Σύν_δεση"
+msgid "_Status message:"
+msgstr "Μήνυμα κατά_στασης:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Αποσ_ύνδεση"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
 #: ../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 ""
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Μήνυμα κατά_στασης:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
+msgid "Your message:"
+msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Κατάσταση"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Επισήμανση "
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2496,581 +2312,597 @@ msgid "Style"
 msgstr "Πάγωσε"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Θέμα:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Ενέργειες</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Προσθήκη κανόνα</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
 #, fuzzy
-msgid "Use system _default"
-msgstr "Χρήση _προκαθορισμένου χρώματος"
+msgid "STUN server:"
+msgstr "Εξυπηρετητής:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
+msgid "<b>Connection</b>"
+msgstr "<b>Συνθήκες</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Μήνυμα σφάλματος: %s"
+msgid "_File manager:"
+msgstr "_Διαχειριστής αρχείων:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Π_ριν το ψευδώνυμο:"
+msgid "_Mail client:"
+msgstr "_Εφαρμογή αλληλογραφίας:"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Αυτόματα _απομακρυσμένος μετά:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+msgid "<b>Custom</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Φατσούλες:"
+msgid "<b>Applications</b>"
+msgstr "<b>Εφαρμογές</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Διαχειριστής αρχείων:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
+#, fuzzy
+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 ""
+"Επιλέξτε το, μόνο αν κάποιος που δεν έχετε στη λίστα επαφών σας στέλνει spam "
+"ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
+"όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
 
 #: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Εφαρμογή αλληλογραφίας:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Αυτόματα _μη διαθέσιμος μετά:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Άνοιγμα..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
-
-#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+msgid "Allow my _idle time to be sent"
+msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "Μήνυμα κατά_στασης:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "backdrops.list"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
 #: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
-msgid "in _group chats"
-msgstr "Συμμετοχή σε _ομαδική συζήτηση"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Εκτέλεση στο Τερματικό"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "λεπτά"
+msgid "_Open..."
+msgstr "_Άνοιγμα..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Επεξεργασία προχωρημένων ρυθμίσεων</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Προχωρημένοι"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-#, fuzzy
-msgid "<b>Add / Edit a rule</b>"
-msgstr "Επεξεργασία καταχώρησης μενού"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Λίστα κανόνων</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 #, fuzzy
 msgid "<i>Privacy List</i>"
 msgstr "backdrops.list"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 #, fuzzy
 msgid "Active for this session"
 msgstr "Αποθήκευ_ση της συνεδρίας"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 #, fuzzy
 msgid "Active on each startup"
 msgstr "Εμφάνιση συμβουλών κατά την _εκκίνηση"
 
-#: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Όλα"
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Λίστα κανόνων</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:7
+#: ../data/gui/privacy_list_window.ui.h:6
 #, fuzzy
-msgid "All (including subscription)"
-msgstr "όλους κατά συνδρομή"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "Επεξεργασία καταχώρησης μενού"
 
-#: ../data/gui/privacy_list_window.ui.h:8
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "Allow"
 msgstr "Επέτρεψε"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Άρνηση"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "όλους στην ομάδα"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Σειρά:"
+msgid "all by subscription"
+msgstr "όλους κατά συνδρομή"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr ""
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Όλα"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "όλους κατά συνδρομή"
+#, fuzzy
+msgid "to send me messages"
+msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "όλους στην ομάδα"
+#, fuzzy
+msgid "to send me queries"
+msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
 #: ../data/gui/privacy_list_window.ui.h:15
 #, fuzzy
-msgid "both"
-msgstr "Και τα δυο"
+msgid "to view my status"
+msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #: ../data/gui/privacy_list_window.ui.h:16
 #, fuzzy
-msgid "from"
-msgstr "Από"
+msgid "to send me status"
+msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "ένα"
+msgid "All (including subscription)"
+msgstr "όλους κατά συνδρομή"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "δύο"
+msgid "Order:"
+msgstr "Σειρά:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
-msgid "to send me messages"
-msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
+msgid "none"
+msgstr "ένα"
 
 #: ../data/gui/privacy_list_window.ui.h:20
 #, fuzzy
-msgid "to send me queries"
-msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
+msgid "both"
+msgstr "Και τα δυο"
 
 #: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
-msgid "to send me status"
-msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
+msgid "from"
+msgstr "Από"
 
 #: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "to view my status"
-msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-#, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Προσθήκη κανόνα</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-#, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "_Ορισμός Avatar"
+msgid "to"
+msgstr "δύο"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Γενέθλια:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+msgid "<b>Family:</b>"
+msgstr "Οικογένεια:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Ήχοι</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Προσθήκη κανόνα</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Τμήμα:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "Ε-Mail:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Ιδιότητες</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Επιπλέον διεύθυνση:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Οικογένεια:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Ήχοι</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Ρυθμίσεις</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "<b>Ιστορικό</b>"
+msgid "<b>State:</b>"
+msgstr "<b>Ρυθμίσεις</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Επιπλέον διεύθυνση:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Προσθήκη κανόνα</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Τ.Κ.:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Ιστορικό</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Ήχοι</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Ψευδώνυμο:"
+msgid "<b>Address</b>"
+msgstr "<b>Προσθήκη κανόνα</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Τηλέφωνο:"
+msgid "<b>Homepage:</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Συνθήκες</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Τ.Κ.:"
+msgid "<b>Nickname:</b>"
+msgstr "Ψευδώνυμο:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Ιδιότητες</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Τηλέφωνο:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Ιστορικό</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Γενέθλια:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Ρυθμίσεις</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "Ε-Mail:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Ρυθμίσεις</b>"
+msgid "<b>Avatar:</b>"
+msgstr "_Ορισμός Avatar"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr ""
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Προσωπικές πληροφορίες"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Ήχοι</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Περί"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Συνθήκες</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr ""
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Τμήμα:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Προσωπικές πληροφορίες"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Δουλειά"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Περί"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Αφαίρεση λογαριασμού από το Gajim και από τον _εξυπηρετητή"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Προσθήκη επαφής..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Ενέργειες"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Χαρακτηριστικά διακομιστή"
+msgid "Add _Contact..."
+msgstr "_Προσθήκη επαφής..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Μεταφορές αρχείων"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "Ε_πεξεργασία"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Συχνές ερωτήσεις (online)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Λογαριασμοί"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Online βοήθεια"
+#: ../data/gui/roster_window.ui.h:11
+#, fuzzy
+msgid "Profile, A_vatar"
+msgstr "Όνομα προφίλ:"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-#, fuzzy
-msgid "Profile, A_vatar"
-msgstr "Όνομα προφίλ:"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Προβολή"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:16
 #, fuzzy
-msgid "Show Trans_ports"
+msgid "Show T_ransports"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Εμφάνιση _λίστας επαφών"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Λογαριασμοί"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+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:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Ενέργειες"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Βοήθεια"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "Ε_πεξεργασία"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Online βοήθεια"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_Συχνές ερωτήσεις"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Βοήθεια"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Αποστολή μονού _μηνύματος"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Συχνές ερωτήσεις (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Προβολή"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
+msgid "Fea_tures"
+msgstr "Χαρακτηριστικά διακομιστή"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Αναζήτηση"
 
+#: ../data/gui/search_window.ui.h:2
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
+
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Προσθήκη _επαφής"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
@@ -3090,44 +2922,37 @@ msgstr "Εγγραφή σε"
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Απάντηση σε αυτό το μήνυμα"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Προς:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Α_ποστολή"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Αποστολή μηνύματος"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Απάντηση"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Προς:"
+msgid "Reply to this message"
+msgstr "Απάντηση σε αυτό το μήνυμα"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Απάντηση"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Αποστολή & κλείσιμο"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-#, fuzzy
-msgid "Au_thorize"
-msgstr "Αμερική/Πορτ-Ο-Πρενς"
+msgid "Subscription Request"
+msgstr "Αίτηση εγγραφής"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-#, fuzzy
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
-"Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
+msgid "_Deny"
+msgstr "_Άρνηση"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
@@ -3138,275 +2963,289 @@ msgstr ""
 "Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μη μπορεί να γνωρίζει πότε "
 "είστε συνδεδεμένος"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Αίτηση εγγραφής"
+#: ../data/gui/subscription_request_window.ui.h:6
+#, fuzzy
+msgid "Au_thorize"
+msgstr "Αμερική/Πορτ-Ο-Πρενς"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Άρνηση"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+"Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Σίγαση ήχων"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Αποστολή ενός _μηνύματος"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
-
-#: ../data/gui/systray_context_menu.ui.h:4
 msgid "Sta_tus"
 msgstr "Κατάσ_ταση"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Ομαδική συζήτηση"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Ιστορικό</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Αποστολή ενός _μηνύματος"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Ρυθμίσεις</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Σίγαση ήχων"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Πληροφορίες επαφής"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Πόρος:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Περιγραφή</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Σχόλια"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Ρυθμίσεις</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "_Ορισμός Avatar"
+
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>Configured avatar:</b>"
 msgstr "Ρύθμιση _δωματίου"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Επικοινωνία"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Περιγραφή</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Πληροφορίες επαφής"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Ιστορικό</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Περισσότερα"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Επιλογή Εικόνας"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Επικοινωνία"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Ιστορικό</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Σχόλια"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Κίνηση Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Είσοδος δεδομένων XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Πληροφορία/Ερώτηση (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Ιστορικό</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Πληροφορία/Ερώτηση (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Παρουσία"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Μήνυμα"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Παρουσία"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Είσοδος δεδομένων XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Επεξεργασία λογαριασμού..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Τοπικό jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Προσωπικά"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Πόρος:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Προσωπικά"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr ""
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Ενεργό"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Ανενεργό"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Ακέραιος"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Όνομα προτίμησης"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Είδος"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Κενή)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Μυστικό"
 
@@ -3417,240 +3256,179 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Προσθήκη νέας εγγραφής στο μενού"
 msgstr[1] "Προσθήκη νέας εγγραφής στο μενού"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Αγγλικά"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Βουλγαρικά"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
+#: ../src/chat_control.py:209
+msgid "Ping?"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Τσέχικα"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Γερμανικά"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Εληνικά"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Βρετανικά"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Εσπεράντο"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Ισπανικά"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Γαλλικά"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Κροατικά"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Ιταλικά"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Νορβηγικά (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Ολλανδικά"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Νορβηγικά"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Πολωνέζικα"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Πορτογαλικά"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Πορτογαλικά Βραζιλίας"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ρώσικα"
-
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:219
 #, fuzzy
-msgid "Serbian"
-msgstr "Γερμανικά"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Σλοβάκικα"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Σουηδικά"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Κινέζικα (Ch)"
-
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr ""
+msgid "Error."
+msgstr "Σφάλμα:"
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "Υπογράμμιση"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Ψευδώνυμο"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Γραμματοσειρά:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Αποστολή αρχείου"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
@@ -3658,66 +3436,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3725,240 +3503,605 @@ 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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Μεταφορές αρχείων"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Mέγεθος: "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Αποδοχή"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Πρόσκληση ομαδικής κουβέντας"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Η μεταφορά αρχείου διακόπηκε"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Άνοιγμα αρχείου μενού"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "μη υπαρκτό %s"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Απομακρυσμένος"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Μη διαθέσιμος"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr ""
+"Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "To Session bus δεν είναι διαθέσιμο"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "To Session bus δεν είναι διαθέσιμο"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Αλλαγή _ψευδώνυμου"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
+"συγκεκριμένο χρήστη."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
+"συγκεκριμένο χρήστη."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Αποστολή %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Ο/Η %s μπήκε στο δωμάτιο"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Συσχέτιση: "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Λείπει το όρισμα \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, fuzzy, 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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Αλλαγή πληροφοριών κατάστασης"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Αλλαγή κατάστασης"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Ελεύθερος για κουβέντα"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Μην ενοχλείτε"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Περιγραφή παρουσίας:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Η κατάσταση άλλαξε."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 #, fuzzy
 msgid "Groupchats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d μη αναγνωσμένο μήνυμα"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "%d μη αναγνωσμένο μήνυμα"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
 "απομακρυσμένος."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
 "διαθέσιμος."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Προβολή τίτλου στο κουμπί"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Προβολή τίτλου στο κουμπί"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Αίτηση μεταφοράς αρχείου"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Άνοιγμα αρχείου μενού"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Πρόσκληση ομαδικής κουβέντας"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 #, fuzzy
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
@@ -3967,113 +4110,129 @@ msgstr ""
 "συμπτυχθεί"
 
 #. sorted alphanum
-#: ../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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 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
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4081,11 +4240,11 @@ msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4094,13 +4253,13 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4108,52 +4267,52 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4162,28 +4321,34 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4191,19 +4356,19 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4213,13 +4378,13 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4228,7 +4393,7 @@ msgstr ""
 "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
 "κίνηση."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -4237,11 +4402,11 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4249,7 +4414,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
 "άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4259,37 +4424,41 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4298,7 +4467,7 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -4309,7 +4478,7 @@ msgstr ""
 "δωμάτιο προστατευμένο με συνθηματικό. Απενεργοποιήστε αυτή την επιλογή"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4318,7 +4487,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Καθορίζει σε ποιο παράθυρο θα εμφανίζονται τα νέα μηνύματα.\n"
@@ -4328,51 +4497,59 @@ msgstr ""
 "'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4380,227 +4557,254 @@ msgid ""
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 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
+#: ../src/common/config.py:287
 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
+#: ../src/common/config.py:288
 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
+#: ../src/common/config.py:289
 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
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4609,142 +4813,191 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Χρήση πιστοποίησης"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Χρήση πιστοποίησης"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'ναι', 'όχι', ή 'και τα δύο'"
-
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4753,27 +5006,184 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "θαλασσί"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Προς"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Μη έγκυρο Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Άγνωστη έκδοση του D-Bus: %s"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Νέο μονό μήνυμα"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Νέο μονό μήνυμα από %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Νέο προσωπικό μήνυμα"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Νέο μήνυμα από %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Νέο μήνυμα"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Νέο μήνυμα από %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "Ο %(nick)s άλλαξε κατάσταση"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "Ο %(nick)s είναι τώρα %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Η επαφή άλλαξε κατάσταση"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Σύνδεση %(nickname)s"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Σύνδεση επαφής"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Αποσύνδεση %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Αποσύνδεση επαφής"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr ""
@@ -4785,214 +5195,192 @@ msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Μη έγκυρο 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: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 ""
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5001,180 +5389,190 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Επανασύνδεση χειροκίνητα."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:869
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Άγνωστη έκδοση του D-Bus: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, 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:1361 ../src/common/connection.py:1439
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
+#: ../src/common/connection.py:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Επαφές"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 #, fuzzy
 msgid "Not in roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 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:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 "Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
 "λείπει"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
@@ -5192,7 +5590,7 @@ msgstr ""
 "Μη διαθέσιμη υπηρεσία: Το Gajim δεν τρέχει ή δεν είναι ενεργοποιημένο το "
 "remote_control"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
@@ -5375,268 +5773,295 @@ msgstr "Τέλος εβδομάδας"
 msgid "Weekend!"
 msgstr "Σαββατοκύριακο!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Μη διαθέσιμος"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Αφανής"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Από"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Μέλος"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Η εικόνα είναι πολύ μεγάλη"
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5648,111 +6073,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Mέγεθος: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Αρχείο: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "πράσινο"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
+msgid "Error: cannot open %s for reading"
+msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "κυανό"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
@@ -6465,97 +6904,183 @@ msgstr ""
 msgid "Writing"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Προεπιλογή"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "θαλασσί"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Διώχνοντας τον %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Χώρα:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Λογαριασμός"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Περιγραφή"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Σφάλμα:"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "ένα"
+
+#: ../src/common/pep.py:209
+#, fuzzy
+msgid "postalcode"
+msgstr "Τ.Κ.:"
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+#, fuzzy
+msgid "room"
+msgstr "Από"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+#, fuzzy
+msgid "uri"
+msgstr "Το URI \"%s\" δεν είναι έγκυρο."
+
+#: ../src/common/pep.py:349
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, fuzzy, python-format
-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 ""
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Σφάλμα avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6566,100 +7091,100 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6667,154 +7192,154 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Διαχείριση λογαριασμών"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+msgid "Your server doesn't support vCard"
 msgstr ""
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6822,11 +7347,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6834,11 +7359,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6847,11 +7372,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6859,7 +7384,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6876,118 +7401,114 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε το σελιδοδείκτη."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Μη έγκυρο όνομα χρήστη"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6998,36 +7519,36 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7037,7 +7558,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7045,83 +7566,100 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Συνέχεια"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Ενεργό"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Λήφθηκε το πρώτο μήνυμα"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7130,137 +7668,137 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Έξοδος"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Χθες"
 msgstr[1] "Χθες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα εικονιδίου"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID συστήματος:"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Ταυτότητα κλειδιού"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ορισμός MOTD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7268,109 +7806,110 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 #, fuzzy
 msgid "AIM Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 #, fuzzy
 msgid "GG Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 #, fuzzy
 msgid "ICQ Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 #, fuzzy
 msgid "MSN Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Έκδοση GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Έκδοση PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Δημιουργοί:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -7378,7 +7917,7 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7387,44 +7926,97 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Σύνδεση"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "_Do not ask me again"
+msgstr "Μη_ν με ξαναρωτήσεις"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Το URI \"%s\" δεν είναι έγκυρο."
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -7432,74 +8024,74 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
+#: ../src/dialogs.py:2623
 #, fuzzy
-msgid "The group chat Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7509,168 +8101,138 @@ msgstr ""
 "την οποία θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Δεν ήταν δυνατή η ανάγνωση του \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Σύνδεση επαφής"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Αποσύνδεση επαφής"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Νέο μήνυμα"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Νέο μονό μήνυμα"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Νέο προσωπικό μήνυμα"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Πρόσκληση ομαδικής κουβέντας"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Η επαφή άλλαξε κατάσταση"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Πάγωσε"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Αφαίρεση"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7678,195 +8240,191 @@ msgid ""
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Ομάδα"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Προσθήκη _επαφής"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Προσθήκη _επαφής"
+msgstr[1] "Προσθήκη _επαφής"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Αφαιρεί μια επαφή από τη λίστα επαφών"
+msgstr[1] "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Κατάσταση"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "όταν είμαι"
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7874,38 +8432,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7915,77 +8473,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "για το λογαριασμό %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Άλλα"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7993,447 +8589,431 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Εκτέλεση εντολής..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 #, fuzzy
 msgid "New post"
 msgstr "_Νέα λίστα..."
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Εντολές: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Γενικά"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Αρχείο"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Χρόνος"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Άνοιγμα αρχείου μενού"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Παραλήπτης: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Η μεταφορά αρχείου διακόπηκε"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Αυτό το αρχείο χρησιμοποιείται από άλλη διεργασία."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Αρχείο: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Τύπος: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Περιγραφή: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8441,33 +9021,64 @@ msgstr ""
 "Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το "
 "αντικαταστήσετε."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Αποθήκευση αρχείου ως..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Αρχείο: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Τύπος: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Περιγραφή: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Όνομα προφίλ:"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Σφάλμα μεταφοράς αρχείου"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8475,81 +9086,117 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Αρχείο:"
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "μήνυμα"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Φατσούλες:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Ρυθμίσεις δωματίου"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Το Gajim χρειάζεται την pywin32 για να εκτελεστεί"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 msgstr ""
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8557,30 +9204,30 @@ msgstr ""
 "Φαίνεται πως εκτελείται ήδη μια διεργασία του Gajim.\n"
 "Σίγουρα να εκτελεστεί;"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "εντολή"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8589,53 +9236,57 @@ 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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "λογαριασμός"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "κατάσταση"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "μήνυμα"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8644,24 +9295,52 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Π_ροτεραιότητα:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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.py:130
 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.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8673,36 +9352,31 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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.py:146 ../src/gajim-remote.py:160
 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.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8714,194 +9388,238 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "θέμα"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 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.py:176
 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.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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.py:219
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Προσθέτει μια νέα επαφή σε αυτό το λογαριασμό."
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:243
 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-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 #, fuzzy
 msgid "Opens 'Start Chat' dialog"
 msgstr "Άνοιγμα του διαλόγου 'Έναρξη κουβέντας'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Έναρξη κουβέντας με χρήση αυτού του λογαριασμού"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 #, fuzzy
 msgid "XML to send"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Αλλαγή κατάστασης"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
+
+#: ../src/gajim-remote.py:272
+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:278
 #, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
 #, fuzzy
-msgid "uri"
-msgstr "Το URI \"%s\" δεν είναι έγκυρο."
+msgid "Message content"
+msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Σύνδεση σε νέο δωμάτιο"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "room"
+msgid "?CLI:room"
 msgstr "Από"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "nick"
+msgid "Room JID"
+msgstr "Δωμάτιο:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "κωδικός πρόσβασης"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Οι κωδικοί δεν ταιριάζουν"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 #, 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
+#: ../src/gajim-remote.py:301
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8910,165 +9628,42 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Χρήση: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\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 ""
-"Το όρισμα \"%s\" δεν έχει οριστεί. \n"
-"Πληκτρολογήστε \"%s help %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 ""
-"Το όρισμα \"%s\" δεν έχει οριστεί. \n"
-"Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Το URI \"%s\" δεν είναι έγκυρο."
-
-#: ../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 ""
-"μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
-"εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
-
-#: ../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: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 "Δεν βρέθηκε το ψευδώνυμο: %s"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "περιεχόμενα μηνύματος"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Δωμάτιο:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9077,7 +9672,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9086,10 +9681,15 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Το URI \"%s\" δεν είναι έγκυρο."
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Θέμα"
@@ -9113,204 +9713,240 @@ msgid "You cannot delete your current theme"
 msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντος θέματος"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "Ο %s είναι τώρα γνωστός ως %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2126
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
+#: ../src/groupchat_control.py:2199
+#, fuzzy
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -9335,23 +9971,17 @@ msgstr "_Αναφορά σφάλματος"
 msgid "Details"
 msgstr "<b>Λεπτομέρειες</b>"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:393
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -9359,45 +9989,45 @@ msgstr ""
 "συνεδριών"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
+#: ../src/gtkgui_helpers.py:767
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Θέλετε να αντικατασταθεί;"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9407,194 +10037,180 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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:498 ../src/gui_interface.py:513
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Αίτηση εγγραφής"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Εγγραφή"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Απαιτείται φράση πρόσβασης"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9604,106 +10220,90 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Error opening file"
-msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
+msgid "File Transfer Failed"
+msgstr "Μεταφορές αρχείων"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-#, fuzzy
-msgid "Error."
-msgstr "Σφάλμα:"
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9711,15 +10311,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9730,34 +10335,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Σύνδεση"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-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:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9767,103 +10351,106 @@ msgstr ""
 "άλλες επαφές."
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 #, 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "δημιουργία φακέλου %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Επαφές"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Ημερομηνία"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Μήνυμα"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Θέμα"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9871,7 +10458,7 @@ msgstr ""
 "Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM "
 "ΤΡΕΧΕΙ)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9885,100 +10472,112 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Εξαγωγή ιστορικού..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)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] ""
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr ""
 "Θέλετε σίγουρα να διαγράψετε το αρχείο καταγραφής της επιλεγμένης επαφής;"
-msgstr[1] ""
-"Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Πληροφορίες επαφής"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό κουβέντας με τον %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 #, fuzzy
 msgid "Disk Error"
 msgstr "Σφάλμα:"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 #, fuzzy
 msgid "Error"
 msgstr "Σφάλμα:"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+msgid "Loading"
+msgstr "Σύνθεση"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Η εικόνα είναι πολύ μεγάλη"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Συζητήσεις"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Μηνύματα"
 
@@ -9990,109 +10589,120 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "Ο %(nick)s άλλαξε κατάσταση"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "εννιά"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "Σύνδεση %(nickname)s"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "Αποσύνδεση %(nickname)s"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Νέο μονό μήνυμα από %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/notify.py:268
-#, fuzzy, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Νέο μήνυμα από %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Νέο μήνυμα από %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "εννιά"
+msgid "Configuration"
+msgstr "Ρυθμίσεις δωματίου"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Διαδρομή αρχείου"
+
+#: ../src/profile_window.py:60
 #, fuzzy
 msgid "Retrieving profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 #, fuzzy
 msgid "Information received"
 msgstr "Περισσότερες πληροφορίες..."
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 #, fuzzy
 msgid "Sending profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του \"%s\""
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10100,52 +10710,53 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10153,39 +10764,39 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Ακύρωση μεταφοράς αρχείου"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10194,19 +10805,19 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -10215,12 +10826,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10229,73 +10840,73 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10304,12 +10915,12 @@ msgstr ""
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10317,17 +10928,17 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3659
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10336,42 +10947,42 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -10379,31 +10990,36 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4552
 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:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Αποστολή %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
@@ -10413,140 +11029,140 @@ msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "/Προβολή/_Διαχείριση"
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr ""
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Εύρεση _υπηρεσιών..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _ομάδων"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Αποστολή μονού μηνύματος"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Αδυναμία εκτέλεσης της εντολής:"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
@@ -10563,31 +11179,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Θέμα: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10597,150 +11203,155 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID συστήματος:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr "από τις %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Σύνδεση"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr "από τις %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Δωμάτιο:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Ενεργό"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Τύπος:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Τροποποίηση λογαριασμού"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10748,34 +11359,34 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10783,7 +11394,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10791,12 +11402,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10804,19 +11415,324 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
 #, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Ενέργειες</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Συνθήκες</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Προχωρημένες ενέργειες"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Προχωρημένος έλεγχος ειδοποιήσεων"
+
+#~ msgid "All statuses"
+#~ msgstr "Όλες οι καταστάσεις"
+
+#~ msgid "Busy "
+#~ msgstr "Απασχολημένος"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Η επαφή άλλαξε κατάσταση"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Αποσύνδεση επαφής"
+
+#~ msgid "Don't have "
+#~ msgstr "Δεν έχει"
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Η μεταφορά αρχείου διακόπηκε"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Επισήμανση "
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
+
+#~ msgid "Have "
+#~ msgstr "Έχει"
+
+#~ msgid "Launch a command"
+#~ msgstr "Εκτέλεση εντολής"
+
+#, fuzzy
+#~ msgid "One or more special statuses..."
+#~ msgstr "Ορισμένες ειδικές καταστάσεις..."
+
+#, fuzzy
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Online εγχειρίδιο για αυτήν την εφαρμογή"
+
+#~ msgid "Play a sound"
+#~ msgstr "Αναπαραγωγή ήχου"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Νέο προσωπικό μήνυμα"
+
+#~ msgid "When "
+#~ msgstr "Όταν"
+
+#, fuzzy
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
+
+#, fuzzy
+#~ msgid "_Disable existing popup window"
+#~ msgstr "Εμφάνιση ενός αναδυόμενου παραθύρου κατά την λήψη μιας κλήσης"
+
+#, fuzzy
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "Το αρχείο ήχου για το παρόν γεγονός δεν υπάρχει."
+
+#, fuzzy
+#~ msgid "_Open chat window with user"
+#~ msgstr "Χρήση ενός παραθύρου κουβέντας με _καρτέλες"
+
+#, fuzzy
+#~ msgid "_Show event in roster"
+#~ msgstr "_Προβολή τίτλου στο κουμπί"
+
+#~ msgid "and I "
+#~ msgstr "και εγώ"
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Επαφές"
+
+#~ msgid "for "
+#~ msgstr "για"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Ομάδα"
+
+#~ msgid "when I'm in"
+#~ msgstr "όταν είμαι στο"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
+
+#~ msgid "Title:"
+#~ msgstr "Τίτλος:"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Περιγραφή: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Προχωρημένοι"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+#~ "και στις ομαδικές κουβέντες"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+#~ "και στις ομαδικές κουβέντες"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Αποστολή μονού _μηνύματος"
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Επιλογή Εικόνας"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "Αγγλικά"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Βουλγαρικά"
+
+#~ msgid "Czech"
+#~ msgstr "Τσέχικα"
+
+#~ msgid "German"
+#~ msgstr "Γερμανικά"
+
+#~ msgid "Greek"
+#~ msgstr "Εληνικά"
+
+#~ msgid "British"
+#~ msgstr "Βρετανικά"
+
+#~ msgid "Esperanto"
+#~ msgstr "Εσπεράντο"
+
+#~ msgid "Spanish"
+#~ msgstr "Ισπανικά"
+
+#~ msgid "French"
+#~ msgstr "Γαλλικά"
+
+#~ msgid "Croatian"
+#~ msgstr "Κροατικά"
+
+#~ msgid "Italian"
+#~ msgstr "Ιταλικά"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Νορβηγικά (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Ολλανδικά"
+
+#~ msgid "Norwegian"
+#~ msgstr "Νορβηγικά"
+
+#~ msgid "Polish"
+#~ msgstr "Πολωνέζικα"
+
+#~ msgid "Portuguese"
+#~ msgstr "Πορτογαλικά"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Πορτογαλικά Βραζιλίας"
+
+#~ msgid "Russian"
+#~ msgstr "Ρώσικα"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Γερμανικά"
+
+#~ msgid "Slovak"
+#~ msgstr "Σλοβάκικα"
+
+#~ msgid "Swedish"
+#~ msgstr "Σουηδικά"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Κινέζικα (Ch)"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'ναι', 'όχι', ή 'και τα δύο'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'ναι', 'όχι' ή ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
+
+#, fuzzy
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
+
+#~ msgid "Condition"
+#~ msgstr "Κατάσταση"
+
+#~ msgid "when I am "
+#~ msgstr "όταν είμαι"
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
+#~ "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr ""
+#~ "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
+#~ "λογαριασμός)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Χρήση: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
+#~ "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
+#~ "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
+
+#~ msgid "Contacts"
+#~ msgstr "Επαφές"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Θέμα: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Δωμάτιο:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Ενεργό"
+
+#, fuzzy
 #~ msgid "_Show event in systray"
 #~ msgstr "_Προβολή τίτλου στο κουμπί"
 
@@ -10831,30 +11747,12 @@ 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 "Τροποποίηση λογαριασμού"
 
@@ -10922,9 +11820,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "Επαφή\n"
 #~ "Banner"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Διαχείριση λογαριασμών"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Διαγραφή"
@@ -11012,9 +11907,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 #~ "επανασυνδεθείτε."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
-
 #~ msgid "%i days ago"
 #~ msgstr "πριν από %i μέρες"
 
@@ -11027,12 +11919,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Commands: %s"
 #~ msgstr "Εντολές: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -11041,15 +11927,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 #~ "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#, fuzzy
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr ""
-#~ "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
-
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
 
@@ -11064,10 +11941,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -11078,14 +11951,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "\". Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
 #~ "υποστηρίζει κενά στο ψευδώνυμο."
 
-#, fuzzy
-#~ 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."
@@ -11130,10 +11995,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
 #, fuzzy
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
@@ -11251,9 +12112,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Συμπαγής όψη   Alt+C"
 
@@ -11266,9 +12124,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Query Builder..."
 #~ msgstr "Κατασκευή ερωτήματος..."
 
-#~ msgid "Accept"
-#~ msgstr "Αποδοχή"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Παραλήφθηκε μια πρόσκληση"
 
@@ -11347,9 +12202,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "The auto away status message"
 #~ msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
 
-#~ msgid "The auto not available status message"
-#~ 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 "
@@ -11376,9 +12228,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Company:"
 #~ msgstr "Εταιρία:"
 
-#~ msgid "Country:"
-#~ msgstr "Χώρα:"
-
 #~ msgid "Given:"
 #~ msgstr "Δοθέν όνομα:"
 
@@ -11603,9 +12452,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Αυτόματη εξουσιοδότηση επαφής"
 
-#~ msgid "Send File"
-#~ msgstr "Αποστολή αρχείου"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "Σύνδεση σε _νέο δωμάτιο..."
 
@@ -11669,20 +12515,12 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgstr "Υπηρεσία"
 
 #, fuzzy
-#~ msgid "_Title:"
-#~ msgstr "Τίτλος:"
-
-#, fuzzy
 #~ msgid "_Work:"
 #~ msgstr "Δουλειά"
 
 #~ msgid "_XML Console..."
 #~ msgstr "Κονσόλα _XML..."
 
-#, fuzzy
-#~ msgid "_Zip/Postal Code:"
-#~ msgstr "Τ.Κ.:"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr ""
 #~ "Να χρησιμοποιείται η συμπαγής όψη όταν ανοίγετε ένα παράθυρο κουβέντας"
@@ -11711,12 +12549,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgstr ""
 #~ "Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
 
-#~ msgid "Size: "
-#~ msgstr "Mέγεθος: "
-
-#~ msgid "Session bus is not available"
-#~ msgstr "To Session bus δεν είναι διαθέσιμο"
-
 #~ msgid "Sound"
 #~ msgstr "Ήχος"
 
@@ -11996,9 +12828,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Po_sition:"
 #~ msgstr "Θέση:"
 
-#~ msgid "Show roster window on Gajim startup"
-#~ msgstr "Εμφάνιση του κεντρικού παραθύρου κατά την εκκίνηση του Gajim"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "Ανακάλυψη _Υπηρεσιών"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 2e651a0b8..d6845dd5a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,15 +3,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -21,306 +17,298 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Personal Events"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Start Chat..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Join _Group Chat..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Add Contact..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Discover Services"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Execute Command..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Modify Account"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Open Gmail Inbox"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Personal Events"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Start Chat..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "_Modify Account"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Account Creation Wizard"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Please choose one of the options below:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Please fill in the data for your existing account</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Please select a server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Password:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Save pass_word"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_ymous authentication"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Connect when I press Finish"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Account Creation Wizard"
+msgid "Anon_ymous authentication"
+msgstr "Anon_ymous authentication"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Please select a server</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Manage..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Use custom hostname/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "_Hostname:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Save pass_word"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Advanced"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Finish"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Hostname:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Connect when I press Finish"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Password:"
+msgid "Set my profile when I connect"
+msgstr "Set my profile when I connect"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Finish"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Miscellaneous</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "None"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Accounts"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Personal Information</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Add"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Delete"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "A_djust to status"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Re_name"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Account"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Enable"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Accounts"
+msgid "Anonymous authentication"
+msgstr "Anonymous authentication"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administration operations"
+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 ""
+"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)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonymous authentication"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Auto-reconnect when connection is lost"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Synchronise contacts"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Browse"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Click to request authorisation to all contacts of another account"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_onnect on Gajim startup"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Chan_ge Password"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Click to change account's password"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
+msgid "Administration operations"
+msgstr "Administration operations"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Choose File to Send..."
+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 ""
+"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"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Choose _Key..."
+msgid "A_djust to status"
+msgstr "A_djust to status"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Click to change account's password"
+msgid "Priority will change automatically according to your status."
+msgstr "Priority will change automatically according to your status."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Click to request authorisation to all contacts of another account"
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Self signed certificate"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Co_nnect on Gajim startup"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Connection"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "First Name:"
+msgid "Resour_ce:"
+msgstr "Resour_ce:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Browse"
 
 #: ../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 ""
-"If ticked, Gajim will also broadcast some more IPs except from just your IP, "
-"so file transfer has higher chances of working."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certificate rejected"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "If ticked, Gajim will get the password from a GPG agent like seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Self signed certificate"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Account"
 
 #: ../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 ""
-"If ticked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onnect on Gajim startup"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -331,6 +319,18 @@ msgstr ""
 "this account"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Auto-reconnect when connection is lost"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Save conversation _logs for all contacts"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synch_ronise account status with global status"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -340,176 +340,204 @@ msgstr ""
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"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."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Use file transfer proxies"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Surname:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"If ticked, Gajim will also broadcast some more IPs except from just your IP, "
+"so file transfer has higher chances of working."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Mer_ge accounts"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "General"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "No key selected"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_use HTTP__PROXY environment variable"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Personal Information"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Manage..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_ty:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Warn before using an insecure connection"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Priority will change automatically according to your status."
+msgid "Send _keep-alive packets"
+msgstr "Send _keep-alive packets"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_name"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"If ticked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Resour_ce:"
+msgid "Use cust_om hostname/port"
+msgstr "Use cust_om hostname/port"
 
 #: ../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 ""
-"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)"
+msgid "_Hostname: "
+msgstr "_Hostname: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Save conversation _logs for all contacts"
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Miscellaneous</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Send _keep-alive packets"
+msgid "Connection"
+msgstr "Connection"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synch_ronise account status with global status"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "No key selected"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synchroni_se account status with global status"
+msgid "Choose _Key..."
+msgstr "Choose _Key..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronise contacts"
+msgid "Use G_PG Agent"
+msgstr "Use G_PG Agent"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "If ticked, Gajim will get the password from a GPG agent like seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Use G_PG Agent"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Use cust_om hostname/port"
+msgid "_Edit Personal Information..."
+msgstr "_Edit Personal Information..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Use cust_om port:"
+msgid "Information about you, as stored in the server"
+msgstr "Information about you, as stored in the server"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Use file transfer proxies"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Personal Information</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Personal Information"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Edit Personal Information..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Co_nnect on Gajim startup"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Enable"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Synchroni_se account status with global status"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Hostname: "
+msgid "Use cust_om port:"
+msgstr "Use cust_om port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Manage..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"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."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "First Name:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Surname:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Warn before using an insecure connection"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_use HTTP__PROXY environment variable"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Mer_ge accounts"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "A_ccount:"
+msgid "Add New Contact"
+msgstr "Add New Contact"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "A_llow this contact to view my status"
+msgid "A_ccount:"
+msgstr "A_ccount:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Add New Contact"
+msgid "_Protocol:"
+msgstr "_Protocol:"
 
-#: ../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 "I would like to add you to my contact list."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_User ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Nickname:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Group:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "A_llow this contact to view my status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Subscription"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -521,7 +549,11 @@ msgstr ""
 "protocol. Click on register button to\n"
 "proceed."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Register"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -529,591 +561,371 @@ msgstr ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Group:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Nickname:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Register"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Subscription"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_User ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "I would like to add you to my contact list."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>An error has occurred:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Choose command to execute:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Please wait while retrieving command list..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Choose command to execute:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Check once more"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Error description..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Please wait while the command is sending..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Finish"
+msgid "Please wait..."
+msgstr "Please wait..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Please wait while retrieving command list..."
+msgid "This jabber entity does not expose any commands."
+msgstr "This jabber entity does not expose any commands."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Please wait while the command is sending..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>An error has occurred:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Please wait..."
+msgid "Error description..."
+msgstr "Error description..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "This jabber entity does not expose any commands."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Finish"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Description</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Advanced Configuration Editor"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgid "Filter:"
+msgstr "Filter:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Advanced Configuration Editor"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Description</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Reset to Default Colours"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Delete MOTD"
+msgid "Show _XML Console"
+msgstr "Show _XML Console"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Edit _Privacy Lists..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Send Server Message..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Set MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Sets Message of the Day"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Show _XML Console"
+msgid "Set MOTD..."
+msgstr "Set MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Update MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Update MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Delete MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Send Server Message..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " a window/tab opened with that contact "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Actions</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Conditions</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sounds</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Advanced Actions"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Advanced Notifications Control"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "All statuses"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Away"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Busy "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Contact Changed Status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contact Disconnected"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Don't have "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "File Transfers"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "File Transfer Request"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "File Transfer Stopped"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Group Chat Message Highlight"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Group Chat Message Received"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Have "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Launch a command"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Not Available"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "One or more special statuses..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Online / Free For Chat"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Play a sound"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "New Private Message"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "When "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Disable auto opening chat window"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Disable existing pop-up window"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Disable existing sound for this event"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Disable showing event in roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Inform me with a pop-up window"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Open chat window with user"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Show event in roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Show event in roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "and I "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Contacts"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "for "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Groups"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "when I'm in"
+msgid "Deletes Message of the Day"
+msgstr "Deletes Message of the Day"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "None"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferences"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Auto join"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "None"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Preferences"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Auto join"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entry:"
+msgid "New entry received"
+msgstr "New entry received"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "You have received new entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed name:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Last modified:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "New entry received"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Unblock"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Message:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Set Activity"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Set an activity"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Message:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Mood:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Message:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Change Password"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Enter it again for confirmation:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Enter new password:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Enter it again for confirmation:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Type your new status message</b>"
+msgid "Save as Preset..."
+msgstr "Save as Preset..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Activity:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Mood:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Activity:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Preset messages:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Save as Preset..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Type your new status message</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Join _Group Chat"
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Add to Roster..."
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copy JID/E-mail Address"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Open E-mail Composer"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Start Chat"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Join _Group Chat"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Add to Roster..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Show a list of emoticons (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Add this contact to roster (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Invite contacts to the conversation (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Invite contacts to the conversation (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Browse the chat history (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Show a menu of advanced functions (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Send message"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Send"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "In_vite"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Invite Friends!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC server"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Please select a MUC server."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1121,119 +933,136 @@ msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "A_sk to see his/her status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Please select a MUC server."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Add Special _Notification..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC server"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Assign Open_PGP Key..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "In_vite"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "E_xecute Command..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Start _Chat"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Edit _Groups..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Send Single _Message..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Send _File..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_vite to"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Invite _Contacts"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Remo_ve"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Toggle End to End Encryption"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Send Cus_tom Status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "E_xecute Command..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Send Single _Message..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Manage Contact"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Send _File..."
+msgid "_Rename..."
+msgstr "_Rename..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Set Custom _Avatar..."
+msgid "Edit _Groups..."
+msgstr "Edit _Groups..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Start _Chat"
+msgid "Assign Open_PGP Key..."
+msgstr "Assign Open_PGP Key..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Toggle End to End Encryption"
+msgid "Set Custom _Avatar..."
+msgstr "Set Custom _Avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Toggle Open_PGP Encryption"
+msgid "Add Special _Notification..."
+msgstr "Add Special _Notification..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Subscription"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Allow him/her to see my status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "A_llow this contact to view my status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "A_sk to see his/her status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_History"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Block"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Manage Contact"
+msgid "_Unignore"
+msgstr "_Unignore"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Rename..."
+msgid "_Ignore"
+msgstr "_Ignore"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Subscription"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Remo_ve"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Unignore"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_History"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Fill in the form."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Room Configuration"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Fill in the form."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Edit Groups"
@@ -1246,55 +1075,47 @@ msgstr "(<b>ESession</b> info)"
 msgid "_Verify"
 msgstr "_Verify"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Features"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>List of possible features in Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Features"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "A list of active, completed and stopped file transfers"
+msgid "File Transfers"
+msgstr "File Transfers"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Cancel file transfer"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Shows a list of file transfers between you and others"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Cancels the selected file transfer"
+msgid "file transfers list"
+msgstr "file transfers list"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Cancels the selected file transfer and removes incomplete file"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "A list of active, completed and stopped file transfers"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Clean _up"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notify me when a file transfer is complete"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "File Transfers"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Show a pop-up notification when a file transfer is complete "
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Hides the window"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Removes completed, cancelled and failed file transfers from the list"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Remove file transfer from the list."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Removes completed, cancelled and failed file transfers from the list"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Shows a list of file transfers between you and others"
-
-#: ../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"
@@ -1302,82 +1123,108 @@ msgstr ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Clean _up"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pause"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Show a pop-up notification when a file transfer is complete "
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Cancels the selected file transfer and removes incomplete file"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continue"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Cancel file transfer"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notify me when a file transfer is complete"
+msgid "Cancels the selected file transfer"
+msgstr "Cancels the selected file transfer"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Open Containing Folder"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Hides the window"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pause"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Continue"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "file transfers list"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Open Containing Folder"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Chatstate Tab Colours</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Account"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Bold"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Group"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contact"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Composing"
+msgid "Gajim Themes Customization"
+msgstr "Gajim Themes Customisation"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contact"
+msgid "Text _color:"
+msgstr "Text _colour:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Font style:"
+msgid "_Background:"
+msgstr "_Background:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim Themes Customisation"
+msgid "Text _font:"
+msgstr "Text _font:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Gone"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Group"
+msgid "Font style:"
+msgstr "Font style:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inactive"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Bold"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Italic"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Paused"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Composing"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inactive"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Chatstate Tab Colours</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Gone"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1385,7 +1232,7 @@ msgstr ""
 "MUC\n"
 "Messages"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1393,105 +1240,98 @@ msgstr ""
 "MUC Directed\n"
 "Messages"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Paused"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Text _colour:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Text _font:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Background:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Change _Nickname..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Manage Room"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Change _Subject..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Configure _Room..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Bookmark"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Destroy Room"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Manage Room"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimise on close"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Voice"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Bookmark"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "_Send Private Message"
+msgstr "_Send Private Message"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Occupant Actions"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Send _File"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Occupant Actions"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Add to Roster"
+msgid "_Voice"
+msgstr "_Voice"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Member"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Ban"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Owner"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Kick"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Member"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Owner"
+msgid "_Ban"
+msgstr "_Ban"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Send Private Message"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voice"
+msgid "_Add to Roster"
+msgstr "_Add to Roster"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Show a list of formattings"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Change your nickname (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bookmark this room (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1503,39 +1343,19 @@ msgid "From:"
 msgstr "From:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Subject:"
 
 #: ../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."
-msgstr ""
-"<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."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim History Logs Manager"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Delete"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Export"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim History Logs Manager"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1549,172 +1369,198 @@ msgstr ""
 "Use this program to delete or export logs. You can select logs from the left "
 "and/or search database from below."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<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."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Search Database"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Old stories"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Conversation History"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Export"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Contact name"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Groupchats"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Old stories"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Conversation History"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Search:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Log status changes of contacts"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Hot"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Hot"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Room:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Recently:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Password:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recently:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Join this room automatically when I connect"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Room:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bookmark this room"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Bookmark this room"
+msgid "Bro_wse Rooms"
+msgstr "_Browse"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Join"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Auto join"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "If ticked, Gajim will join this group chat on startup"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Manage Bookmarks"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimise on Auto Join"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Title:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Print status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Auto join"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "If ticked, Gajim will join this group chat on startup"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Title:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimise on Auto Join"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1725,100 +1571,103 @@ msgid "_Configure"
 msgstr "_Configure"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Properties</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Settings</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Manage Proxy Profiles"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Type:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pass_word:"
+msgid "_Name:"
+msgstr "_Name:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxy _Host:"
+msgid "<b>Properties</b>"
+msgstr "<b>Properties</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgid "Use HTTP prox_y"
+msgstr "Use HTTP prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Use HTTP prox_y"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Use proxy auth_entication"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Username:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "Pass_word:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Name:"
+msgid "Proxy _Host:"
+msgstr "Proxy _Host:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Type:"
+msgid "Proxy _Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Username:"
+msgid "<b>Settings</b>"
+msgstr "<b>Settings</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Manage Accounts"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_thorise"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Available"
+msgid "Version:"
+msgstr "GTK+ Version:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Configure"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Description: "
+msgid "Authors:"
+msgstr "Au_thorise"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1826,39 +1675,32 @@ msgid "Homepage:"
 msgstr "<b>Homepage:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Stalled"
+msgid "Description:"
+msgstr "Description: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Configure"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Stalled"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1872,218 +1714,289 @@ msgid "Event desc"
 msgstr "Events"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Advanced Configuration Editor</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Always use OS/X default applications"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Applications</b>"
+msgid "Custom"
+msgstr "Custom"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Actions</b>"
+msgid "All chat states"
+msgstr "All statuses"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Auto Status</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Composing"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Chat Appearance</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Disabled"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Chat Line Colours</b>"
+#, fuzzy
+msgid "Never"
+msgstr "_Never"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Chat state notifications</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Never\n"
+"Only when pending events\n"
+"Always"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Conditions</b>"
+msgid "Always"
+msgstr "Away"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Pop it up"
 
-#. 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>Custom</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notify me about it"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Show only in _roster"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Options</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Preset Status Messages</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privacy</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Last status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Status Messages</b>"
+msgid "Preferences"
+msgstr "Preferences"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Themes</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Display a_vatars of contacts in roster"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Middle:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"If ticked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visual Notifications</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Display status _messages of contacts in roster"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Advanced"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Display m_ood of contacts in roster"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Advanced..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "All statuses"
+msgid "Sort contacts by status"
+msgstr "Sort contacts by status"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Allow _OS information to be sent"
+msgid "in _roster"
+msgstr "in _roster"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Allow _OS information to be sent"
+msgid "in _group chats"
+msgstr "in _group chats"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Roster Appearance</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Allow sound when I'm _busy"
+msgid "_Window behavior:"
+msgstr "_Window behaviour:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Away"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Ask status message when I:"
+msgid "_Emoticons:"
+msgstr "_Emoticons:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Ma_ke message windows compact"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Hide all buttons in chat windows"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignore rich content in incoming messages"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Chat message:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Check on startup if Gajim is the _default Jabber client"
+msgid "_Highlight misspelled words"
+msgstr "_Highlight misspelt words"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Composing"
+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 ""
+"If ticked, 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."
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Configure colour and font of the interface"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Show _roster"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Chat message:"
+msgid "Show icon when your messages are received"
+msgstr "Sound to play when any MUC message arrives."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Contact name"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Custom"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Chat Appearance</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "When new event is received:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Notify me about contacts that sign _in"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Notify me about contacts that sign _out"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Disabled"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Display _activity of contacts in roster"
+msgid "Notify on new _GMail email"
+msgstr "Notify on new _GMail email"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Display _extra e-mail details"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"If ticked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Display m_ood of contacts in roster"
+msgid "Display _extra email details"
+msgstr "Display _extra e-mail details"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Display _tunes of contacts in roster"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"If ticked, Gajim will also include information about the sender of the new e-"
+"mails"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Display a_vatars of contacts in roster"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Options</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Display m_ood of contacts in roster"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Use t_rayicon (aka. notification area icon)"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Display status _messages of contacts in roster"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Visual Notifications</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Play _sounds"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Ma_nage..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Allow sound when I'm _busy"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sounds</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../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 "
@@ -2093,7 +2006,11 @@ 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:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Display chat state notifications:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2103,689 +2020,630 @@ 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: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 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:58
-msgid "Hide all buttons in chat windows"
-msgstr "Hide all buttons in chat windows"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"If ticked, Gajim will allow others to detect the operation system you are "
-"using"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"If ticked, Gajim will also include information about the sender of the new e-"
-"mails"
-
-#: ../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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"If ticked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
+msgid "_Send chat state notifications:"
+msgstr "_Send chat state notifications:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"If ticked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Chat state notifications</b>"
 
 #: ../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 ""
-"If ticked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+msgid "Personal Events"
+msgstr "Personal Events"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Away after:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"If ticked, Gajim will display the mood of contacts in the roster window"
+"If ticked, Gajim will change status to Away when the computer is unused."
 
 #: ../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"
+msgid "_Not available after:"
+msgstr "_Not available after:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"If ticked, Gajim will display the tunes of contacts in the roster window"
+"If ticked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 
 #: ../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 ""
-"If ticked, 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."
+msgid "minutes"
+msgstr "minutes"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"If ticked, Gajim will ignore incoming events from unauthorised contacts. Use "
-"with caution, because it blocks all messages from any contact that is not in "
-"the roster"
-
-#: ../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 ""
-"If ticked, 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."
-
-#: ../data/gui/preferences_window.ui.h:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"If ticked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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"
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"If ticked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent MSN icon for status online, away, busy, "
-"etc...)"
-
-#: ../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 ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-
-#: ../data/gui/preferences_window.ui.h:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Log _encrypted chat session"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Auto Status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Ma_ke message windows compact"
+msgid "Ask status message when I:"
+msgstr "Ask status message when I:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Ma_nage..."
+msgid "Sign _in"
+msgstr "Sign _in"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Never"
+msgid "Sign _out"
+msgstr "Sign _out"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Notifications"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Notify me about contacts that sign _in"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Status Messages</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Notify me about contacts that sign _out"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Preset Status Messages</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notify me about it"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notify on new _GMail email"
+msgid "Use system _default"
+msgstr "Use system _default"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Never\n"
-"Only when pending events\n"
-"Always"
+msgid "Chat message:"
+msgstr "Chat message:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Personal Events"
+msgid "<b>Font</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Play _sounds"
+msgid "Use _transports icons"
+msgstr "Use _transports icons"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Pop it up"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"If ticked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent MSN icon for status online, away, busy, "
+"etc...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Preferences"
+msgid "Status _iconset:"
+msgstr "Status _iconset:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Configure colour and font of the interface"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_heme:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Themes</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Use t_rayicon (aka. notification area icon)"
+msgid "Contact's nickname:"
+msgstr "Contact name"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Show only in _roster"
+msgid "Your nickname:"
+msgstr "B_efore nickname:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Sign _in"
+msgid "_Status message:"
+msgstr "_Status message:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Sign _out"
+msgid "_URL highlight:"
+msgstr "_URL highlight:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Reset to Default Colours"
 
 #: ../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 ""
-"Some messages may include rich content (formatting, colours etc). If ticked, "
-"Gajim will just display the raw message text."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Chat message:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sort contacts by status"
+#, fuzzy
+msgid "Your message:"
+msgstr "Error message: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Group Chat Message Highlight"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Status _iconset:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Chat Line Colours</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Style"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_heme:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Actions</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"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"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"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"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Use _transports icons"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Always use OS/X default applications"
+msgid "<b>Video</b>"
+msgstr "<b>Middle:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Use system _default"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Conditions</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Error message: %s"
+msgid "_File manager:"
+msgstr "_File manager:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "B_efore nickname:"
+msgid "_Mail client:"
+msgstr "_Mail client:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Away after:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Display chat state notifications:"
+msgid "<b>Custom</b>"
+msgstr "<b>Custom</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emoticons:"
+msgid "<b>Applications</b>"
+msgstr "<b>Applications</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_File manager:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignore events from contacts not in the roster"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Highlight misspelt words"
+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 ""
+"If ticked, Gajim will ignore incoming events from unauthorised contacts. Use "
+"with caution, because it blocks all messages from any contact that is not in "
+"the roster"
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Allow _OS information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignore rich content in incoming messages"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Log status changes of contacts"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Allow _OS information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Mail client:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Not available after:"
+msgid "Log _encrypted chat session"
+msgstr "Log _encrypted chat session"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Open..."
+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 ""
+"If ticked, 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."
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "_Reset to Default Colours"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Allow _OS information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "_Send chat state notifications:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Status message:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "_URL highlight:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Privacy</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Window behaviour:"
+msgid "_Log status changes of contacts"
+msgstr "_Log status changes of contacts"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "in _group chats"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "in _roster"
+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:139
-msgid "minutes"
-msgstr "minutes"
+msgid "_Open..."
+msgstr "_Open..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Advanced Configuration Editor</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Advanced"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privacy Lists:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Add / Edit a rule</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Privacy List"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>List of rules</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privacy List</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Active for this session"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Active on each startup"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>List of rules</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "All"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Add / Edit a rule</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "All (including subscription)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Allow"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Deny"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "all in the group"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Order:"
+msgid "all by subscription"
+msgstr "all by subscription"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Privacy List"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "All"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "all by subscription"
+msgid "to send me messages"
+msgstr "to send me messages"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "all in the group"
+msgid "to send me queries"
+msgstr "to send me queries"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Both"
+msgid "to view my status"
+msgstr "to view my status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "From"
+msgid "to send me status"
+msgstr "to send me status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "one"
+msgid "All (including subscription)"
+msgstr "All (including subscription)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "two"
+msgid "Order:"
+msgstr "Order:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "to send me messages"
+#, fuzzy
+msgid "none"
+msgstr "one"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "to send me queries"
+#, fuzzy
+msgid "both"
+msgstr "Both"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "to send me status"
+#, fuzzy
+msgid "from"
+msgstr "From"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "to view my status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Address</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "two"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Birthday:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>City:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Family:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Company:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Country:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Middle:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Department:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefix:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Extra Address:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Given:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Family:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suffix:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Full Name</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Street:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Given:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>City:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Homepage:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>State:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Extra Address:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Middle:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Postal Code:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Name:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Country:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Nickname:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Address</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Phone No.:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Homepage:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Position:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Name:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Postal Code:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Nickname:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Phone No.:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Role:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Birthday:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>State:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Street:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Click to set your avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Suffix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Personal Info"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Company:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "About"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Position:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Click to set your avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Department:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Role:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Personal Info"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Work"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>What do you want to do?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "About"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Remove account _only from Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Remove account from Gajim and from _server"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>What do you want to do?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Remove"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Roster Item Exchange"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2793,115 +2651,112 @@ msgstr ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Message Body <currently unused, so it's hidden by default>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Roster Item Exchange"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Add _Contact..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Message Body <currently unused, so it's hidden by default>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "Fea_tures"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Actions"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "File _Transfers"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Add _Contact..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Frequently Asked Questions (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Edit"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Help online"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Accounts"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profile, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_View"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Show _Offline Contacts"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Show Only _Active Contacts"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Show Trans_ports"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Show _Offline Contacts"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Show _Roster"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "File _Transfers"
 
-#. 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 "_Actions"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Help"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Edit"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Help online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Help"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "_Send Single Message..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Frequently Asked Questions (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_View"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Please wait while retrieving search form..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fea_tures"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Search"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Please wait while retrieving search form..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Search"
 
@@ -2921,41 +2776,37 @@ msgstr "Register to"
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Reply to this message"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "To:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Send message"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Send message and close window"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Reply"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "To:"
+msgid "Reply to this message"
+msgstr "Reply to this message"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Reply"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Close"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Send message and close window"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_thorise"
+msgid "Subscription Request"
+msgstr "Subscription Request"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Authorise contact so he or she can know when you're connected"
+msgid "_Deny"
+msgstr "_Deny"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2965,263 +2816,275 @@ msgstr ""
 "Deny authorisation from contact so he or she cannot know when you're "
 "connected"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Subscription Request"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_thorise"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Deny"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Authorise contact so he or she can know when you're connected"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Synchronise contacts"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Select the account with which you want to synchronise"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Select the contacts you want to synchronise"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronise : select contacts"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Mute Sounds"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Send Single _Message"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Show All Pending _Events"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Select the contacts you want to synchronise"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Group Chat"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Ask:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Send Single _Message"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Client:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Show All Pending _Events"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Contact time:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Mute Sounds"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Personal Information"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Resource:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Subscription:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Client:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Comments"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Contact time:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Configured avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Contact"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Subscription:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Personal Information"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Ask:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "More"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "User avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Contact"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Font</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Comments"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Input</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Query"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Query"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presence"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Message"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presence"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Input</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Modify Account..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Local jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Personal"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Resource:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "A GTK+ Jabber client"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Personal"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Client"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "A GTK+ Jabber client"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Cancel confirmation"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Invalid room"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Service sent malformed data"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Service changed the session identifier."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Service returned an error."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(None)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -3232,241 +3095,184 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "You have received new entries (and %(count)d not displayed):"
 msgstr[1] "You have received new entries (and %(count)d not displayed):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "English"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Belarusian"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgarian"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Breton"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Czech"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "German"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Greek"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "British"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Spanish"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Basque"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "French"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Croatian"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italian"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norwegian (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Dutch"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norwegian"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polish"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portuguese"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazilian Portuguese"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Russian"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Serbian"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovak"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Swedish"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Chinese (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Spelling language"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Error."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Underline"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Strike"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Clear formating"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Really send file?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG encryption enabled"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "This contact does not support file transfer."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Feature not available under Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Send _File"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "This contact does not support file transfer."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "No GPG key assigned"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Session WILL NOT be logged"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3475,32 +3281,32 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Session WILL NOT be logged"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3508,25 +3314,25 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "The following message was NOT encrypted"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3534,13 +3340,14 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Database Error"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3549,228 +3356,590 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "File Transfers"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Size: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Accept"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "File transfer completed"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Groupchat Invitation"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Remote contact stopped transfer"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Error opening file"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "File transfer stopped"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "File transfer cancelled"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Connection with peer cannot be established."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Usage: /%s, hide the chat buttons."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Usage: /%s, send the message to the contact"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s not found"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Away"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Available"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Usage: /%s, clears the text window."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Toggle Open_PGP Encryption"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Usage: /%s, sends a ping to the contact"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Command not supported for zeroconf account."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Click to see past conversations with this contact"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s is not a valid loglevel"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "A connection is not available"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Connection not available"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Change your nickname (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Invalid nickname"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+msgid "Nickname not found"
+msgstr "Nickname not found"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Ask before closing a group chat tab/window."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Send %s to %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "You are invited to a groupchat"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Invalid server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "affiliation changed"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Usage: /%s , display the names of group chat occupants."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Missing argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "creating logs database"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Change status information"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Change status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "You left the following groupchats:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Forward unread messages"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "All unread messages have been forwarded."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Forward unread messages"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Play sound when user is busy"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Show only online and free for chat contacts in roster."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Away as a result of being idle more than $T min)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S will be replaced by current status message, $T by autoaway time."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Time in minutes, after which your status changes to not available."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Not available as a result of being idle more than $T min)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S will be replaced by current status message, $T by autoxa time."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, 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
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Incoming nickname colour."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Outgoing nickname colour."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Incoming text colour."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Outgoing text colour."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Status message text colour."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Show event in roster"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Show event in roster"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Preview new messages in notification popup?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "File Transfer Request"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "File transfer cancelled"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Show a pop-up notification when a file transfer is complete "
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Groupchat Invitation"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Incoming nickname font."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Outgoing nickname font."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Incoming text font."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Outgoing text font."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Status message text font."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "default"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3780,7 +3949,7 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3790,17 +3959,17 @@ msgstr ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3810,7 +3979,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3818,7 +3987,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3826,7 +3995,13 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3836,44 +4011,51 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "How many lines to request to server when entering a groupchat."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3881,7 +4063,12 @@ msgstr ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3889,11 +4076,11 @@ msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3902,11 +4089,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3918,13 +4105,13 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3932,7 +4119,7 @@ msgstr ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3940,35 +4127,38 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimised)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3976,28 +4166,34 @@ msgstr ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4009,17 +4205,17 @@ msgstr ""
 "numbers are more secure, but take longer to calculate when you start a "
 "session."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4028,13 +4224,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4042,7 +4238,7 @@ msgstr ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4050,11 +4246,11 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define the position of the avatar in roster. Can be left or right"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4062,7 +4258,7 @@ msgstr ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4070,9 +4266,10 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4084,29 +4281,33 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4116,7 +4317,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4127,7 +4328,8 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4135,7 +4337,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Controls the window where new messages are placed.\n"
@@ -4147,31 +4349,39 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Hides the buttons in chat windows."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4179,15 +4389,15 @@ msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Smooth scroll message in conversation window"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4195,11 +4405,11 @@ msgstr ""
 "List of colours, separated by \":\", that will be used to colour nicknames "
 "in group chats."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4207,7 +4417,7 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4215,7 +4425,7 @@ msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4223,7 +4433,7 @@ msgstr ""
 "Should we show the confirm custom status dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4233,7 +4443,7 @@ msgstr ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4241,7 +4451,7 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4249,7 +4459,7 @@ msgstr ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4257,7 +4467,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4265,7 +4475,7 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4273,19 +4483,11 @@ msgstr ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4293,7 +4495,7 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4302,19 +4504,11 @@ msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Change the value to change the size of latex formulae displayed. The higher "
-"is larger."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4322,19 +4516,20 @@ msgstr ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Ask offline status message to all offline contacts when connection to an "
 "account is established. WARNING: This causes a lot of requests to be sent!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "If True, completion in groupchats will be like a shell auto-completion"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4342,31 +4537,60 @@ msgstr ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4374,7 +4598,7 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4382,37 +4606,37 @@ msgstr ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "If enabled, restore the last status that was used."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "If True, Contacts requesting authorisation will be automatically accepted."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "If False, this account will be disabled and will not appear in roster window."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Enable ESessions encryption for this account."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4420,49 +4644,64 @@ msgstr ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace sent after inactivity"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sent after inactivity"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4470,15 +4709,34 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s wants to send you a file."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4486,20 +4744,52 @@ msgstr ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonymous authentication"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_ymous authentication"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4507,108 +4797,108 @@ msgstr ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all or space separated status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', or 'both'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "How many lines to request to server when entering a groupchat."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4616,27 +4906,184 @@ 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "To"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "unsubscribe request from %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Disk Write Error"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"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)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Room has been destroyed"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "You can join this room instead: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Invalid Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+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."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "error while sending %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Unknown SSL error: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "New Single Message"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "New Single Message from %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "New Private Message"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "New Private Message from group chat %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Messaged by %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "New Message"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "New Message from %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Changed Status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is now %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Contact Changed Status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Signed In"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contact Signed In"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Signed Out"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contact Signed Out"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
@@ -4646,212 +5093,188 @@ msgstr "Unable to load idle module"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registration succeeded"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registration with agent %s succeeded"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registration failed"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, 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: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:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Invisibility not supported"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../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: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: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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "I would like to add you to my roster."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4860,76 +5283,77 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Unknown SSL error: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server replied: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, 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:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4938,7 +5362,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4947,24 +5371,33 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "The authenticity of the %s certificate could be invalid."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4973,66 +5406,66 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sent contact: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Sent contacts:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Unregister failed"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus does not run correctly on this machine"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus does not run correctly on this machine"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus does not run correctly on this machine"
@@ -5046,7 +5479,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Service not available: Gajim is not running, or remote_control is False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus is not present on this machine or python module is missing"
 
@@ -5231,267 +5664,294 @@ msgstr "End of week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Server address required."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Busy"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Not Available"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paused"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paused"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "A_way"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "From"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message pending"
 msgstr[1] "%d messages pending"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " from room %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " from user %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " from %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d event pending"
 msgstr[1] "%d events pending"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Timeout loading image"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Image is too big"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL is not yet valid"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Timeout loading image"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Room Configuration"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5503,111 +5963,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Error message: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Error executing \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s is not a valid loglevel"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Default Message"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Size: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "File: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "green"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "error: cannot open %s for reading"
+msgid "Error: cannot open %s for reading"
+msgstr "Error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -6244,19 +6718,115 @@ msgstr "Studying"
 msgid "Writing"
 msgstr "Writing"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "default"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Hiding"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Country:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Account"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Description"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Error"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "one"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "room"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6265,22 +6835,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6288,11 +6844,11 @@ msgstr ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6301,44 +6857,43 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Your message could not be sent."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6350,24 +6905,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Default Message"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6376,68 +6931,68 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is not usable on this computer"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6445,143 +7000,144 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "There is no OpenPGP secret key available."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "To disable the account, you must be disconnected."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6589,11 +7145,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6601,11 +7157,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6613,11 +7169,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6625,7 +7181,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6641,110 +7197,107 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "What do you want to do?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remove account _only from Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 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:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Invalid nickname"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Character not allowed"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Invalid server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Invalid room"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6754,32 +7307,32 @@ msgstr ""
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 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:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6794,7 +7347,7 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6805,72 +7358,89 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Configure"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "First Message Received"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Next Message Received Focused"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received Unfocused"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6880,7 +7450,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:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6888,236 +7458,237 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Yesterday"
 msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Unable to load idle module"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibility not supported"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID already in list"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "A GTK+ Jabber client"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7130,101 +7701,155 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Insecure connection"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+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/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Yes, I really want to connect insecurely"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Do _not ask me again"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Wrong uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "This is not a group chat"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Invalid Account"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, 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:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7233,168 +7858,138 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contact Signed In"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "New Message"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "New Private Message"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Groupchat Invitation"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Contact Changed Status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Sad"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "Remo_ve"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7402,188 +7997,184 @@ 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:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Add"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Groups"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Add contact"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Add contact"
+msgstr[1] "_Add contact"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Removes contact from roster"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Removes contact from roster"
+msgstr[1] "Removes contact from roster"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Invalid Server Name"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Service returned an error."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "All files"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condition"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "when I am "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7594,19 +8185,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Verify again..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7616,19 +8207,19 @@ msgstr ""
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Verify..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the contact's identity?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7643,83 +8234,124 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 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:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 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:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "for account %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Self signed certificate"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7727,230 +8359,245 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Execute Command"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "SSL certificate validation"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "A library used to validate server certificates to ensure a secure connection."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Requires python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Serverless chatting with autodetected clients in a local network."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Requires python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Command line"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "A script to control Gajim via commandline."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Requires 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Feature not available under Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenGPG message encryption"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Encrypting chat messages with gpg keys."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Autodetection of network status."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requires gnome-network-manager and python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Session Management"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim session is stored on logout and restored on login."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Requires python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Password encryption"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passwords can be stored securely and not just in plaintext."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Ability to connect to servers which are using SRV records."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Requires dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Requires nslookup to use SRV records."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Spell Checker"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Spellchecking of composed messages."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Requires libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Requires libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Notification"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Passive popups notifying for new events."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7958,65 +8605,39 @@ msgstr ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatic status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Ability to measure idle time, in order to set auto status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Requires libxss library."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Requires python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Transform LaTeX expressions between $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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 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."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "End to End message encryption"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Encrypting chat messages."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Requires python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8024,140 +8645,137 @@ msgstr ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Requires python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Requires python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Requires python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Requires python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Available"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Feature"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Time"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "File transfer completed"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "File transfer cancelled"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Connection with peer cannot be established."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "File transfer stopped"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Description: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "File: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Description: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-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:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8165,33 +8783,64 @@ 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Save File as..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "File: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Description: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s wants to send you a file:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Sending profile..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "File Transfer Error"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8199,69 +8848,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "message"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Emoticons:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Show only in _roster"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Advanced Configuration Editor"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Room Configuration"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importing PyGTK failed: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim needs PyGTK 2.12 or above"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim needs GTK 2.12 or above"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim needs GTK 2.12 or above to run. Quiting..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8270,12 +8956,11 @@ msgstr ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8283,28 +8968,28 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8312,51 +8997,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "account"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8364,20 +9053,44 @@ 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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Changes the priority of account or accounts"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priority"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "priority you want to give to the account"
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "message content. The account must be specified or \"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8387,34 +9100,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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,133 +9132,130 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 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-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8558,44 +9263,93 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Change status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Nickname to use"
+
+#: ../src/gajim-remote.py:272
+#, 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:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI to handle"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Account in which you want to handle it"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Message content"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "room"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Room JID"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nick"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Nickname to use"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "password"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Password to enter the room"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Account from which you want to enter the room"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8604,157 +9358,44 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Wrong 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 "one of: offline, online, chat, away, xa, dnd, invisible "
-
-#: ../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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "message content. The account must be specified or \"\""
-
-#: ../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
-#, fuzzy
-msgid "Picture to use"
-msgstr "Nickname to use"
-
-#: ../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 "URI to handle"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Account in which you want to handle it"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Message content"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Room JID"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Nickname to use"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Password to enter the room"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Account from which you want to enter the room"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8763,7 +9404,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8772,10 +9413,14 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Wrong uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Theme"
@@ -8798,180 +9443,216 @@ msgid "You cannot delete your current theme"
 msgstr "You cannot delete your current theme"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s has set the subject to %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Room now shows unavailable member"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "room now does not show unavailable members"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Room logging is now enabled"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Room logging is now disabled"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Room is now non-anonymous"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Room is now semi-anonymous"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Room is now fully-anonymous"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s has been removed from the room (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "The group chat Jabber ID has invalid characters."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8979,22 +9660,22 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -9019,63 +9700,57 @@ msgstr "_Report Bug"
 msgid "Details"
 msgstr "Details"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim is not the default Jabber client"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 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:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9086,92 +9761,86 @@ msgstr ""
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Always use this nickname when there is a conflict"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> 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."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "You are banned from group chat %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Group chat %s does not exist."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Your registered nickname must be used in group chat %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Subscription request"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9179,107 +9848,103 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Room now shows unavailable member"
-
-#: ../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: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:934
-msgid "Room logging is now enabled"
-msgstr "Room logging is now enabled"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Room logging is now disabled"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Room is now non-anonymous"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Room is now semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG Passphrase Incorrect"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Certificate has expired"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG key not trusted"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9294,80 +9959,65 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "Remote contact stopped transfer"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Error opening file"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "File Transfers"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "File transfer of %(filename)s from %(name)s stopped."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Error."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9376,21 +10026,21 @@ msgstr ""
 "type a new one"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9401,15 +10051,20 @@ msgstr ""
 "%(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL certificate error"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL certificate error"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9426,27 +10081,7 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"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: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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9454,7 +10089,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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9464,11 +10099,11 @@ msgstr ""
 "sure you want to do that?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9476,7 +10111,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9486,83 +10121,86 @@ msgstr ""
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG key expired"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_New Group Chat"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "I would like to add you to my roster"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "creating %s directory"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Contacts"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Message"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Subject"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9570,7 +10208,7 @@ msgstr ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9584,93 +10222,108 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Database Error"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exporting History Logs..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Do you really want to delete the logs of the selected contact?"
-msgstr[1] "Do you really want to delete the logs of the selected contacts?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Do you really want to delete the selected message?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Do you really want to delete the logs of the selected contact?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Cancel confirmation"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Error"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Timeout loading image"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Coding"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "You are going to close several tabs"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to close them all?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Messages"
 
@@ -9682,100 +10335,112 @@ msgstr "- messages will be logged"
 msgid "- messages will not be logged"
 msgstr "- messages will not be logged"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Changed Status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignore"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Signed In"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Signed Out"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Banning %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "New Single Message from %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registration failed"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "New Private Message from group chat %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Service sent malformed data"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Messaged by %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "This file already exists"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "New Message from %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignore"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Room Configuration"
 
-#: ../src/profile_window.py:58
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "File is empty"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Personal Information"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9783,51 +10448,52 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9835,38 +10501,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Really quit Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancel file transfer"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9874,16 +10540,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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9891,11 +10557,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9904,11 +10570,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 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:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9917,56 +10583,56 @@ msgstr ""
 "send you."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9975,11 +10641,11 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9987,16 +10653,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10005,14 +10671,14 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10021,33 +10687,34 @@ 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10057,23 +10724,28 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s to %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Make %s and %s metacontacts"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
@@ -10083,130 +10755,130 @@ msgstr "Make %s and %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "To all online users"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Edit _Groups"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Rename"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -10223,24 +10895,14 @@ msgstr "Error in received dataform"
 msgid "No result"
 msgstr "No result"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Disk WriteError"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Subject: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10252,7 +10914,7 @@ msgstr ""
 "\n"
 "\tAre these options acceptable?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10267,147 +10929,152 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Is OpenPGP enabled for this contact?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "in _roster"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Resource: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blocked]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimised]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Subscription: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Console for %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Mood:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Activity:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Tune:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Notification"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed information"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10415,32 +11082,32 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10448,7 +11115,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10456,13 +11123,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10470,18 +11137,400 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Choose File to Send..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " a window/tab opened with that contact "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Actions</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Conditions</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Advanced Actions"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Advanced Notifications Control"
+
+#~ msgid "All statuses"
+#~ msgstr "All statuses"
+
+#~ msgid "Busy "
+#~ msgstr "Busy "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Contact Changed Status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contact Disconnected"
+
+#~ msgid "Don't have "
+#~ msgstr "Don't have "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "File Transfer Stopped"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Group Chat Message Highlight"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Group Chat Message Received"
+
+#~ msgid "Have "
+#~ msgstr "Have "
+
+#~ msgid "Launch a command"
+#~ msgstr "Launch a command"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "One or more special statuses..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Online / Free For Chat"
+
+#~ msgid "Play a sound"
+#~ msgstr "Play a sound"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "New Private Message"
+
+#~ msgid "When "
+#~ msgstr "When "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Disable auto opening chat window"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Disable existing pop-up window"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Disable existing sound for this event"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Disable showing event in roster"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Disable showing event in roster"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Inform me with a pop-up window"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Open chat window with user"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Show event in roster"
+
+#~ msgid "and I "
+#~ msgstr "and I "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contacts"
+
+#~ msgid "for "
+#~ msgstr "for "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Groups"
+
+#~ msgid "when I'm in"
+#~ msgstr "when I'm in"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Show the contact's profile (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Allow him/her to see my status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Description: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Advanced..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Display _activity of contacts in roster"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Display _tunes of contacts in roster"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Display m_ood of contacts in roster"
+
+#~ 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"
+
+#, 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"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Send Single Message..."
+
+#~ msgid "User avatar:"
+#~ msgstr "User avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "English"
+
+#~ msgid "Belarusian"
+#~ msgstr "Belarusian"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarian"
+
+#~ msgid "Breton"
+#~ msgstr "Breton"
+
+#~ msgid "Czech"
+#~ msgstr "Czech"
+
+#~ msgid "German"
+#~ msgstr "German"
+
+#~ msgid "Greek"
+#~ msgstr "Greek"
+
+#~ msgid "British"
+#~ msgstr "British"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spanish"
+
+#~ msgid "Basque"
+#~ msgstr "Basque"
+
+#~ msgid "French"
+#~ msgstr "French"
+
+#~ msgid "Croatian"
+#~ msgstr "Croatian"
+
+#~ msgid "Italian"
+#~ msgstr "Italian"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norwegian (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Dutch"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norwegian"
+
+#~ msgid "Polish"
+#~ msgstr "Polish"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portuguese"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazilian Portuguese"
+
+#~ msgid "Russian"
+#~ msgstr "Russian"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbian"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovak"
+
+#~ msgid "Swedish"
+#~ msgstr "Swedish"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chinese (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Spelling language"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Change the value to change the size of latex formulae displayed. The "
+#~ "higher is larger."
+
+#~ msgid "all or space separated status"
+#~ msgstr "all or space separated status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', or 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' or ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Check your connection or try again later"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Error executing \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "error: cannot open %s for reading"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Unable to bind to port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "A GTK+ jabber client"
+
+#~ msgid "Condition"
+#~ msgstr "Condition"
+
+#~ msgid "when I am "
+#~ msgstr "when I am "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Requires gpg and python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transform LaTeX expressions between $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to "
+#~ "set 'use_latex' to True in the Advanced Configuration Editor."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Requires python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Contacts"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Disk WriteError"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Subject: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Mood:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Activity:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10509,31 +11558,12 @@ msgstr " resource with priority "
 #~ 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"
 
@@ -10636,9 +11666,6 @@ msgstr " resource with priority "
 #~ "Groupchat Histories\n"
 #~ "All Chat Histories"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Manage Accounts"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10805,18 +11832,9 @@ msgstr " resource with priority "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Assign Open_PGP Key"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Command not supported for zeroconf account."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Commands: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Usage: /%s, clears the text window."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Usage: /%s, hide the chat buttons."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10824,12 +11842,6 @@ msgstr " resource with priority "
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Usage: /%s, sends a ping to the contact"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Usage: /%s, send the message to the contact"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "No help info for /%s"
 
@@ -10852,9 +11864,6 @@ msgstr " resource with priority "
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface "
 
-#~ msgid "Nickname not found"
-#~ msgstr "Nickname not found"
-
 #~ msgid ""
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface"
@@ -10872,13 +11881,6 @@ msgstr " resource with priority "
 #~ "If the JID is currently in the group chat, he/she/it will also be kicked."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10916,9 +11918,6 @@ msgstr " resource with priority "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Usage: /%s , display the names of group chat occupants."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -10958,9 +11957,6 @@ msgstr " resource with priority "
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Show _roster"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Select the account with which to synchronise"
 
@@ -11112,9 +12108,6 @@ msgstr " resource with priority "
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquy"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Click to see past conversations with this contact"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Compact View    Alt+C"
 
@@ -11127,9 +12120,6 @@ msgstr " resource with priority "
 #~ msgid "Query Builder..."
 #~ msgstr "Query Builder..."
 
-#~ msgid "Accept"
-#~ msgstr "Accept"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Invitation Received"
 
@@ -11258,9 +12248,6 @@ msgstr " resource with priority "
 #~ msgid "Company:"
 #~ msgstr "Company:"
 
-#~ msgid "Country:"
-#~ msgstr "Country:"
-
 #~ msgid "Given:"
 #~ msgstr "Given:"
 
diff --git a/po/eo.po b/po/eo.po
index d00a5a221..e4e486239 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,15 +4,11 @@
 #
 #
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -22,318 +18,309 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Stato"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Persona detalaĵoj"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Ekparoli"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Eniri en babilejon"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Aldoni kontakton..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Serĉi servojn"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Plenumi komandon..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Korekti konton"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Malfermi poŝtkeston de Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Persona detalaĵoj"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Ekparoli"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Stato"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Korekti konton"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Kontkreilo"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Konto estas kreata</b>\n"
-"\n"
-"Bonvolu atendi..."
+"Vi bezonas havi konton por ke konekti\n"
+"al la jaber-reto."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+msgid "I want to _register for a new account"
+msgstr "Mi volas registri novan konton"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Bonvolu elekti unu el sekvaj opcioj:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Bonvolu plenigi datumon por via nova konto</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Pasvorto:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Konservi pasvorton"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Uzi aŭtentokontrolon"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Konekti kiam vi premos Finigi"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber-ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Kontkreilo"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Uzi aŭtentokontrolon"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Servilo:"
 
 #: ../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"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Prokura servilo:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Administri..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Uzi propran servilnomon/pordon"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Prokura servilo:"
+msgid "_Hostname:"
+msgstr "Servilnomo: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Konservi pasvorton"
+msgid "_Port:"
+msgstr "_Pordo:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Krome"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Vi bezonas havi konton por ke konekti\n"
-"al la jaber-reto."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Finigi"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Servilnomo: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Konto estas kreata</b>\n"
+"\n"
+"Bonvolu atendi..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+msgid "Connect when I press Finish"
+msgstr "Konekti kiam vi premos Finigi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Pasvorto:"
+msgid "Set my profile when I connect"
+msgstr "Korekti vian personan informon kiam vi konektitos"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Pordo:"
+msgid "_Finish"
+msgstr "_Finigi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servilo:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Cetero</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Neniu"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Persona informo</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Agordo</b>"
+msgid "Accounts"
+msgstr "Kontoj"
 
-#: ../data/gui/accounts_window.ui.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Alĝustigi laŭ stato"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Aldoni"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Konto"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Forigi"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Kontoj"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Re_nomigi"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "Estra listo"
+msgid "_Enable"
+msgstr "Ebligi"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Uzi aŭtentokontrolon"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"Risurcnomo estas sendata al jabber-servilo por ke distingi klientojn kun "
+"samaj JID. Do vi povas samtempe konekti per la sama konto kun risurcnomoj "
+"\"Hejmo\" kaj \"Laborejo\". La kliento, kiu havas la plej altan prioritaton, "
+"ricevos la eventojn."
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Aŭtomate rekonekti kiam konekto rompiĝas"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Montri _senkonektajn kontaktojn"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Rigardi"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "K_onekti dum lanĉo de Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Ŝanĝi _pasvorton"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klaku por ŝanĝi konta pasvorton"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "Estra listo"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Elektu dosieron por sendi..."
+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 ""
+"Prioritato uzatas en Jabber por determini, kiu ricevos eventojn de jabber-"
+"servilo, kiam kelkaj klientoj estas konekta per sama konto. La kliento kun "
+"la plej granda prioritato ricevas eventojn"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Elekti _ŝlosilon..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Alĝustigi laŭ stato"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klaku por ŝanĝi konta pasvorton"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritato ŝanĝiĝos aŭtomate laŭ via stato."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "Priori_tato:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Malkorekta salutnomo"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "K_onekti dum lanĉo de Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Konekto"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Retpoŝtadreso:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Nomo:"
+msgid "Resour_ce:"
+msgstr "Risur_cnomo:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Rigardi"
 
 #: ../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 ""
-"Se markitas, Gajim anoncos krom vian IP ankoraŭ kelkajn IP, do "
-"dosiertransmeto havos pli ŝancojn funkcii."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
+msgid "Client certificate"
+msgstr "Malkorekta salutnomo"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Konto"
 
 #: ../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 ""
-"se markitas, Gajim sendados vivkontrolajn (keep-alive) pakaĵojn, tio "
-"preventas diskonekton pro longa neaktiva tempo"
+msgid "C_onnect on Gajim startup"
+msgstr "K_onekti dum lanĉo de Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -342,6 +329,18 @@ msgid ""
 msgstr "Se markitas, Gajim aŭtomate konektos per tiu konto dum lanĉo"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Aŭtomate rekonekti kiam konekto rompiĝas"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sink_ronigi kontan staton kun komuna stato"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -350,185 +349,213 @@ msgstr ""
 "Se markitas, ĉiu ŝanĝo de komuna stato (manipulata per listbutono maldekstre "
 "en la kontaktlista fenestro) samtempe ŝanĝos la staton de tiu ĉi konto."
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se la defaŭlta pordo, kiu uzatas por venantaj mesaĝoj, ne taŭgas por via "
-"agordo, vi povas elekti alian ĉi tie.\n"
-"Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+msgid "Use file transfer proxies"
+msgstr "Uzi dosiertransmetan prokuran servilon"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Familia nomo:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Se markitas, Gajim anoncos krom vian IP ankoraŭ kelkajn IP, do "
+"dosiertransmeto havos pli ŝancojn funkcii."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Unuigi kontojn"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Ĝenerala"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Neniu ŝlosilo elektita"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Persona informo"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Administri..."
+
+#: ../data/gui/accounts_window.ui.h:40
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tato:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritato uzatas en Jabber por determini, kiu ricevos eventojn de jabber-"
-"servilo, kiam kelkaj klientoj estas konekta per sama konto. La kliento kun "
-"la plej granda prioritato ricevas eventojn"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritato ŝanĝiĝos aŭtomate laŭ via stato."
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Sendi vivkontrolajn pakaĵojn"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_nomigi"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"se markitas, Gajim sendados vivkontrolajn (keep-alive) pakaĵojn, tio "
+"preventas diskonekton pro longa neaktiva tempo"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Risur_cnomo:"
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Uzi propran servilnomon/pordon"
 
 #: ../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 ""
-"Risurcnomo estas sendata al jabber-servilo por ke distingi klientojn kun "
-"samaj JID. Do vi povas samtempe konekti per la sama konto kun risurcnomoj "
-"\"Hejmo\" kaj \"Laborejo\". La kliento, kiu havas la plej altan prioritaton, "
-"ricevos la eventojn."
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Servilnomo: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Pordo:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Cetero</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Sendi vivkontrolajn pakaĵojn"
+msgid "Connection"
+msgstr "Konekto"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sink_ronigi kontan staton kun komuna stato"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Neniu ŝlosilo elektita"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Sink_ronigi kontan staton kun komuna stato"
+msgid "Choose _Key..."
+msgstr "Elekti _ŝlosilon..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Montri _senkonektajn kontaktojn"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Uzi propran servilnomon/pordon"
+msgid "_Edit Personal Information..."
+msgstr "Korekti personan informon..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Uzi propran pordon:"
+msgid "Information about you, as stored in the server"
+msgstr "Informo pri vi, kiel estas en la servilo"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Uzi dosiertransmetan prokuran servilon"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Persona informo</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Persona informo"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Korekti personan informon..."
+msgid "Co_nnect on Gajim startup"
+msgstr "K_onekti dum lanĉo de Gajim"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Ebligi"
+msgid "Synchroni_ze account status with global status"
+msgstr "Sink_ronigi kontan staton kun komuna stato"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Servilnomo: "
+msgid "Use cust_om port:"
+msgstr "Uzi propran pordon:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Administri..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Se la defaŭlta pordo, kiu uzatas por venantaj mesaĝoj, ne taŭgas por via "
+"agordo, vi povas elekti alian ĉi tie.\n"
+"Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Nomo:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "_Pordo:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Familia nomo:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Retpoŝtadreso:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber-ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Unuigi kontojn"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "K_onto:"
+msgid "Add New Contact"
+msgstr "Aldoni novan kontakton"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "_Permesi al tiu kontakto vidi mian staton"
+msgid "A_ccount:"
+msgstr "K_onto:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Aldoni novan kontakton"
+msgid "_Protocol:"
+msgstr "_Protokolo:"
 
-#: ../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 "Mi petas vin permesi aldoni vin en mian kontaktliston."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Uzula ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "Kaŝ_nomo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "_Permesi al tiu kontakto vidi mian staton"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Abono"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -540,7 +567,11 @@ msgstr ""
 "protokolo. Klaku la butonon \"Registri\"\n"
 "por fari tion."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "Re_gistri"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -548,41 +579,21 @@ msgstr ""
 "Vi devas konekti al la transportilo por ebligi aldonon\n"
 "de kontakto per tiu protokolo."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "Kaŝ_nomo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokolo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "Re_gistri"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Abono"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Uzula ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
+msgid "Please wait while retrieving command list..."
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
@@ -590,351 +601,172 @@ msgid "Check once more"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-#, fuzzy
-msgid "Error description..."
-msgstr "Priskribo"
+msgid "Please wait while the command is being sent..."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Finigi"
+msgid "Please wait..."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
+msgid "This jabber entity does not expose any commands."
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
+msgid "<b>An error has occurred:</b>"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr ""
+#, fuzzy
+msgid "Error description..."
+msgstr "Priskribo"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr ""
+#, fuzzy
+msgid "F_inish"
+msgstr "_Finigi"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Detala agorda administrilo"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtrilo:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Priskribo</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>RIMARKU:</b> Vi devas relanĉi gajim por efektigi kelkajn parametrojn"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Detala agorda administrilo"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtrilo:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Reŝargi kolorojn per defaŭlto"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Forigi tagmesaĝon"
+msgid "Show _XML Console"
+msgstr "Montri _XML-konzolon"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Privataj listoj"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administristo"
+
 #: ../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"
+#, fuzzy
+msgid "_Send Server Message..."
+msgstr "_Sendi servilan mesaĝon"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-#, fuzzy
-msgid "Set MOTD..."
-msgstr "Enigi tagmesaĝon"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Instalas mesaĝon de la tago"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Montri _XML-konzolon"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Enigi tagmesaĝon"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Renovigas mesaĝon de la tago"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Renovigi tagmesaĝon"
 
-#: ../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:11
-msgid "_Administrator"
-msgstr "_Administristo"
+msgid "Delete MOTD"
+msgstr "Forigi tagmesaĝon"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Sendi servilan mesaĝon"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " iun fenestron/slipon malfermitan kun tiu kontakto "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Agoj</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Kondiĉoj</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sonoj</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Kromaj agoj"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Kroma agordo de avizado"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Fora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Okupata "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakto ŝanĝis sian staton"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakto malkonektita"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Ne havas "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Dosieraj transmetoj"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Mendo de dosiera transmeto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Dosiera transmeto haltitas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Emfazado de mesaĝoj en babilejo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Ricevitas mesaĝo en babilejo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Havas "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Nevidebla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Lanĉi komandon"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nedisponebla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "kelka(j) speciala(j) stato(j)..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Enrete / Babilema"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Ludi sonon"
+msgid "Deletes Message of the Day"
+msgstr "Forigas mesaĝon de la tago"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "Receive a Message"
-msgstr "Nova privata mesaĝo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kiam "
+msgid "No"
+msgstr "Neniu"
 
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
 msgstr ""
-"_Aktivigi fenestragordilan urgkonsileton \"UrgencyHint\" por briligi "
-"interparolan fenestron en taskostrio"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Malŝaltas aŭtomatan malfermadon de interparola fenestro"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Malŝalti ekzistan ŝprucfenestron"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Malŝalti ekzistan sonon por tiu ĉi evento"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Malŝalti eventmontron en kontaktlisto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informi min per ŝprucfenestro"
 
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "Malfermi interparolan _fenestron por uzulo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Montri eventon en _kontaktlisto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Montri eventon en _kontaktlisto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "kaj mi "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "contact(s)"
-msgstr "Kontaktoj"
+msgid "Prefer"
+msgstr "Agordo"
 
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "por "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "dum mi estas je"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
+msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:2
+#: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Local</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:4
+#: ../data/gui/archiving_preferences_window.ui.h:9
 #, fuzzy
 msgid "Auto"
 msgstr "Aŭtomate aliĝi"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
-msgstr ""
+#: ../data/gui/atom_entry_window.ui.h:1
+#, fuzzy
+msgid "New entry received"
+msgstr "Kiam ricevas novan eventon"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Neniu"
-
-#: ../data/gui/archiving_preferences_window.ui.h:8
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
-msgid "Prefer"
-msgstr "Agordo"
-
-#: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+msgid "Feed name:"
+msgstr "Etosa nomo"
 
-#: ../data/gui/atom_entry_window.ui.h:1
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "Entry:"
 msgstr "Lando:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
-#, fuzzy
-msgid "Feed name:"
-msgstr "Etosa nomo"
-
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:5
 #, fuzzy
 msgid "Last modified:"
 msgstr "Familia nomo:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-#, fuzzy
-msgid "New entry received"
-msgstr "Kiam ricevas novan eventon"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
 msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
@@ -943,28 +775,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -972,322 +799,318 @@ msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 msgid "<b>Mood:</b>"
 msgstr "<b>Sonoj</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Ŝanĝi pasvorton"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Enigi ĝin denove por konfirmi:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Enigu novan pasvorton:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Enigi ĝin denove por konfirmi:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Tajpu vian novan statmesaĝon</b>"
+msgid "Save as Preset..."
+msgstr "Konservi kiel antaŭpreparitaj..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Ŝaltita"
+msgid "Mood:"
+msgstr "Babilejo:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Babilejo:"
+msgid "Activity:"
+msgstr "Ŝaltita"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Antaŭpreparitaj mesaĝoj:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Konservi kiel antaŭpreparitaj..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Tajpu vian novan statmesaĝon</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Eniri en babilejon"
+msgid "_Copy Link Location"
+msgstr "_Kopii ligilan lokon"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Aldoni al kontaktlisto"
+msgid "_Open Link in Browser"
+msgstr "_Malfermi ligilon per retrigardilo"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopii JID/retpoŝtan adreson"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopii ligilan lokon"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Malfermi retpoŝtredaktilon"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Malfermi ligilon per retrigardilo"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Ekparoli"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "n°"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Eniri en babilejon"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Aldoni al kontaktlisto"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klaku por enigi mienon (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Aligas kontakton en kontaktliston"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "atentas al la komunikado"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "atentas al la komunikado"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Klaku por enigi mienon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "n°"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Sendi mesaĝon"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Sendi"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "In_viti al"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Rigardiloj"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr ""
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Peti por vidi lian/ŝian staton"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:5
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Aligi specialan _avizon"
+msgid "MUC server"
+msgstr "Rigardiloj"
 
-#: ../data/gui/contact_context_menu.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Enigi Open_PGP-ŝlosilon"
+msgid "In_vite"
+msgstr "In_viti al"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Plenumi komandon..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Ekparoli"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Sendi unuopan _mesaĝon..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Aranĝi _Grupojn"
+msgid "Send _File..."
+msgstr "Sendi _dosieron"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_viti al"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kontaktoj"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Baskuli Open_PGP-ĉifradon"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Forigi"
+msgid "Toggle End to End Encryption"
+msgstr "Baskuli Open_PGP-ĉifradon"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sendi propran XML"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Plenumi komandon..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Sendi unuopan _mesaĝon..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Renomigado de kontakto"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Sendi _dosieron"
+msgid "_Rename..."
+msgstr "_Renomigi"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Aranĝi _Grupojn"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Ekparoli"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Enigi Open_PGP-ŝlosilon"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Baskuli Open_PGP-ĉifradon"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Baskuli Open_PGP-ĉifradon"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Aligi specialan _avizon"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Abono"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Permesi al li/ŝi vidi vian staton"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "_Permesi al tiu kontakto vidi mian staton"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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 ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Peti por vidi lian/ŝian staton"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historio"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Renomigado de kontakto"
+msgid "_Unignore"
+msgstr "naŭ"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Renomigi"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Abono"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Forigi"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "naŭ"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historio"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Plenigu la formon."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Agordo de babilejo"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Plenigu la formon."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Aranĝi grupojn"
@@ -1301,58 +1124,50 @@ msgstr "<b>Priskribo</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Servilaj trajtoj"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
+msgid "File Transfers"
+msgstr "Dosieraj transmetoj"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Nuligi dosiertransmeton"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Montras liston de dosiertransmetojn inter vi kaj aliaj"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Nuligas la indikitan dosiertransmeton"
+msgid "file transfers list"
+msgstr "dosiertransdonada listo"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Nuligas la indikitan dosiertransmeton kaj forigas neplenan dosieron"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Malplenigi"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Avizi min kiam dosiero estas transdonita"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Dosieraj transmetoj"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Kaŝas la fenestron"
-
-#: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Forigi dosiertransmeton el la listo."
-
-#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Forigas plenumitajn, nuligitajn kaj malsukcesajn dosiertransmetojn el la "
 "listo"
 
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Montras liston de dosiertransmetojn inter vi kaj aliaj"
+#: ../data/gui/filetransfers.ui.h:8
+msgid "Remove file transfer from the list."
+msgstr "Forigi dosiertransmeton el la listo."
 
-#: ../data/gui/filetransfers.ui.h:11
+#: ../data/gui/filetransfers.ui.h:9
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1360,82 +1175,108 @@ msgstr ""
 "Tiu ĉi ago forigas unu dosiertransmeton de la listo. Se la transmeto estas "
 "aktiva, ĝin unue haltitas kaj poste forigitos."
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Malplenigi"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Paŭzi"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Nuligas la indikitan dosiertransmeton kaj forigas neplenan dosieron"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Daŭrigi"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Nuligi dosiertransmeton"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Avizi min kiam dosiero estas transdonita"
+msgid "Cancels the selected file transfer"
+msgstr "Nuligas la indikitan dosiertransmeton"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Malfermi enhavantan dosierujon"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Kaŝas la fenestron"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Paŭzi"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Daŭrigi"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "dosiertransdonada listo"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Malfermi enhavantan dosierujon"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Koloroj de babilstataj langetoj</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Dika"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakto"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Tajpas mesaĝon"
+msgid "Gajim Themes Customization"
+msgstr "Etosa administrado de Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakto"
+msgid "Text _color:"
+msgstr "Teksta _koloro:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Tipara fasono:"
+msgid "_Background:"
+msgstr "_Fono:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Etosa administrado de Gajim"
+msgid "Text _font:"
+msgstr "Teksta _tiparo:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Foriris"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+msgid "Font style:"
+msgstr "Tipara fasono:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktiva"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Dika"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kursiva"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Paŭzas"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Tajpas mesaĝon"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Neaktiva"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Koloroj de babilstataj langetoj</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Foriris"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1443,7 +1284,7 @@ msgstr ""
 "Babilejaj\n"
 "Mesaĝoj"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1451,22 +1292,6 @@ msgstr ""
 "Babilejaj\n"
 "mesaĝoj al vi"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Paŭzas"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Teksta _koloro:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Teksta _tiparo:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Fono:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1474,91 +1299,101 @@ msgstr "Ŝanĝi kaŝ_nomon"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Aranĝi legosignojn"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Ŝanĝi _temon"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Administri _babilejon"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Starigi legosignon por tiu babilejo"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Priskribo: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Aranĝi legosignojn"
+msgid "_Request Voice"
+msgstr "_Voĉo"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Starigi legosignon por tiu babilejo"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derigisto"
+msgid "_Send Private Message"
+msgstr "_Sendi privatan mesaĝon"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Sendi _dosieron"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Agoj por babilanto"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Sendi _dosieron"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Aldoni al kontaktlisto"
+msgid "_Voice"
+msgstr "_Voĉo"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derigisto"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Estro"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Malpermesi"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Mastro"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Elpeli"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Membro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Mastro"
+msgid "_Ban"
+msgstr "_Malpermesi"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Sendi privatan mesaĝon"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voĉo"
+msgid "_Add to Roster"
+msgstr "_Aldoni al kontaktlisto"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Starigi legosignon por tiu babilejo"
+msgid "Show a list of formattings"
+msgstr "Klaku por enigi mienon (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Ŝanĝi kaŝ_nomon"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Ŝanĝi kaŝ_nomon"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Starigi legosignon por tiu babilejo"
 
 #: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
@@ -1571,11 +1406,29 @@ msgid "From:"
 msgstr "De:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Temo:"
 
 #: ../data/gui/history_manager.ui.h:1
+msgid "Gajim History Logs Manager"
+msgstr "Gajim administrilo de protokoloj"
+
+#: ../data/gui/history_manager.ui.h:2
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim administrilo de protokoloj"
+
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:6
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1591,201 +1444,188 @@ msgstr ""
 "Ĝenerale evitu forigojn rilatajn al kontaktoj kun kiu vi interparolas "
 "nuntempe."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Forigi"
+#: ../data/gui/history_manager.ui.h:8
+msgid "_Search Database"
+msgstr "_Serĉi datumbaze"
 
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:9
 msgid "Export"
 msgstr "Eksportado"
 
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim administrilo de protokoloj"
-
-#: ../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"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
-msgid "_Search Database"
-msgstr "_Serĉi datumbaze"
-
 #: ../data/gui/history_window.ui.h:1
 #, fuzzy
-msgid "All Chat Histories"
-msgstr "ia ajn stato"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Historio de interparoloj"
-
-#: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Kontaktnomo"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Babilejoj"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "ia ajn stato"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Historio de interparoloj"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Serĉi"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Protokoli statŝanĝojn de kontaktoj"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Retnodo:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "JID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Retnodo:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Aŭtomate aliĝi al ĉi tiu babilejo kiam vi konektitos"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Babilejo:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Kaŝnomo:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Antaŭ nelonge:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Antaŭ nelonge:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Aŭtomate aliĝi al ĉi tiu babilejo kiam vi konektitos"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Babilejo:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Starigi legosignon por tiu babilejo"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Servilo:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Starigi legosignon por tiu babilejo"
+msgid "Bro_wse Rooms"
+msgstr "_Rigardi"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Aliĝi"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Aŭtomate aliĝi"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Aranĝi legosignojn"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titolo:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Eligi statojn:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Aŭtomate aliĝi"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titolo:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1798,105 +1638,108 @@ msgid "_Configure"
 msgstr "_Daŭrigi"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Agordo</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Agordo</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Administri prokurservilajn agordojn"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pas_vorto:"
+msgid "_Name:"
+msgstr "_Nomo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Prokura servilo:"
+msgid "<b>Properties</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Pordo:"
+msgid "Use HTTP prox_y"
+msgstr "_Uzi prokuran servilon"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Uzi prokuran servilon"
+msgid "_BOSH URL:"
+msgstr "_URL:"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Uzi aŭtentokontrolon"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Salutnomo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL:"
+msgid "Pass_word:"
+msgstr "Pas_vorto:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Nomo:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Prokura servilo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
+msgid "Proxy _Port:"
+msgstr "_Pordo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Salutnomo:"
+msgid "<b>Settings</b>"
+msgstr "<b>Agordo</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Administri kontojn"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Pasfrazo"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Permesi"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Enrete"
+msgid "Version:"
+msgstr "Versio de GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Daŭrigi"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Priskribo: %s"
+msgid "Authors:"
+msgstr "_Permesi"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1904,39 +1747,32 @@ msgid "Homepage:"
 msgstr "Hejmpaĝo:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Malrapidas"
+msgid "Description:"
+msgstr "Priskribo: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Daŭrigi"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Malrapidas"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1950,511 +1786,498 @@ msgid "Event desc"
 msgstr "Eventoj"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Detala agorda administrilo</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Programoj</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Agoj</b>"
+msgid "All chat states"
+msgstr "ia ajn stato"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Agoj</b>"
+msgid "Composing only"
+msgstr "Tajpas mesaĝon"
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Redakti regulon</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "malŝaltitaj"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Koloroj de babilstataj langetoj</b>"
+msgid "Never"
+msgstr "_Neniam"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Bildavizoj</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Kondiĉoj</b>"
+msgid "Always"
+msgstr "Fora"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Antaŭigi la fenestron"
 
-#. 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>Propraj</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Avizi min pri tio"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Sonoj</b>"
+msgid "Show only in roster"
+msgstr "Montri nur en _kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Agordo por GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Privataj listoj</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+msgid "Last state"
+msgstr "Lasta stato: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Agordo"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Agordo</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Aldoni regulon</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+"fenestro kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Bildavizoj</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
+"la kontaktlisto kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Krome"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Krome"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+"fenestro kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "ia ajn stato"
+msgid "Sort contacts by status"
+msgstr "_Ordigi kontaktojn per stato"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Ebligi sendi informon pri _OS"
+#, fuzzy
+msgid "in _roster"
+msgstr "Mankas en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Ebligi sendi informon pri _OS"
+msgid "in _group chats"
+msgstr "Eniri en babilejon"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
+msgid "<b>Roster Appearance</b>"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Fora"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
+"ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Demandi statmesaĝon kiam mi:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Mienoj:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Unu mesaĝfenestro:"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Kaŝas la butonojn en babileja fenestro."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignori formatadon en venantaj mesaĝoj"
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "_Statmesaĝo:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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: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"
+msgid "_Highlight misspelled words"
+msgstr "_Emfazi misskribajn vortojn"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Tajpas mesaĝon"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Agordo de koloro kaj tiparo de la fasado"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Montri _kontaktliston"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "_Statmesaĝo:"
+msgid "Show icon when your messages are received"
+msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Kontaktnomo"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Propraj</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Redakti regulon</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Kiam ricevas novan eventon"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Avizi min pri kontaktoj kiuj: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Avizi min pri kontaktoj kiuj: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "malŝaltitaj"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "Notify on new _GMail email"
+msgstr "Avizi pri novaj _Gmail-leteroj"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Montri _kromajn detalojn pri retleteroj"
+#, 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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "Display _extra email details"
+msgstr "Montri _kromajn detalojn pri retleteroj"
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Agordo por GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "Show notification area icon:"
+msgstr "Uzi pletpiktogramon"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Bildavizoj</b>"
 
 #: ../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 povas sendi kaj ricevi meta-informon rilatan al konversacio, kiun vi "
-"povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
-"montri en interparolaj fenestroj."
+msgid "Play _sounds"
+msgstr "Ludi _sonojn"
 
 #: ../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 povas sendi kaj ricevi informon rilatan al interparolado kun kontakto. "
-"Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
-"interparolanto."
+msgid "Ma_nage..."
+msgstr "Admi_nistri..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 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:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "Kaŝas la butonojn en babileja fenestro."
+msgid "Notifications"
+msgstr "Konta korektado"
 
 #: ../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"
+"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 povas sendi kaj ricevi meta-informon rilatan al konversacio, kiun vi "
+"povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
+"montri en interparolaj fenestroj."
 
 #: ../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"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Montrataj babilstataj _avizoj:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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 povas sendi kaj ricevi informon rilatan al interparolado kun kontakto. "
+"Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
+"interparolanto."
 
 #: ../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 ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Montrataj babilstataj _avizoj:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Bildavizoj</b>"
 
 #: ../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 ""
-"Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
-"la kontaktlisto kaj en babilejoj"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Persona detalaĵoj"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
+msgid "_Away after:"
+msgstr "Aŭtomate _fora post:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
+msgid "_Not available after:"
+msgstr "Aŭtomate nedisponebla post:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
 
 #: ../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 ""
+msgid "minutes"
+msgstr "minutoj"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Marku tiun opcion, nur se iu ne el via kontaktlisto spamas/ĉagrenas vin. Uzu "
-"singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
-"kontaktlisto"
-
-#: ../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."
+"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 ""
 
-#: ../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: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, "
-"etc...)"
-msgstr ""
-"Se markitas, Gajim uzos protokolo-specifajn statpiktogramojn. (ekzemple "
-"kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
-"fora, okupata ktp...)"
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
-"ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Agoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "_Unu mesaĝfenestro:"
+msgid "Ask status message when I:"
+msgstr "Demandi statmesaĝon kiam mi:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Admi_nistri..."
+msgid "Sign _in"
+msgstr "E_nsalutas"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Neniam"
+msgid "Sign _out"
+msgstr "E_lsalutas"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Konta korektado"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Avizi min pri kontaktoj kiuj: "
+msgid "<b>Status Messages</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Avizi min pri kontaktoj kiuj: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Avizi min pri tio"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Stato"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Avizi pri novaj _Gmail-leteroj"
+msgid "Use system _default"
+msgstr "Uzi sisteman defaŭlton"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Statmesaĝo:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Persona detalaĵoj"
+msgid "<b>Font</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Ludi _sonojn"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Uzi _transportilajn piktogramarojn"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Antaŭigi la fenestron"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se markitas, Gajim uzos protokolo-specifajn statpiktogramojn. (ekzemple "
+"kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
+"fora, okupata ktp...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Agordo"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Defaŭlta stata p_iktogramaro:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Agordo de koloro kaj tiparo de la fasado"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Etoso:"
 
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Servilo:"
+msgid "<b>Themes</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Uzi pletpiktogramon"
+msgid "Contact's nickname:"
+msgstr "Kontaktnomo"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Montri nur en _kontaktlisto"
+msgid "Your nickname:"
+msgstr "Antaŭ kaŝnomo:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "E_nsalutas"
+msgid "_Status message:"
+msgstr "_Statmesaĝo:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "E_lsalutas"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Reŝargi kolorojn per defaŭlto"
 
 #: ../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 ""
-"Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
-"markitas, Gajim simple montros krudan mesaĝan tekston."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "_Statmesaĝo:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "_Ordigi kontaktojn per stato"
+msgid "Your message:"
+msgstr "Erara mesaĝo: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Stato"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Emfazado de mesaĝoj en babilejo"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Defaŭlta stata p_iktogramaro:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Koloroj de babilstataj langetoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2462,568 +2285,582 @@ msgid "Style"
 msgstr "Malrapidas"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Etoso:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Agoj</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Uzi _transportilajn piktogramarojn"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Aldoni regulon</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Uzi sisteman defaŭlton"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servilo:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Kiam ricevas novan eventon"
+msgid "<b>Connection</b>"
+msgstr "<b>Kondiĉoj</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Erara mesaĝo: %s"
+msgid "_File manager:"
+msgstr "_Dosieradministrilo:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Antaŭ kaŝnomo:"
+msgid "_Mail client:"
+msgstr "Ret_poŝtkliento:"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Aŭtomate _fora post:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Rigardilo:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Montrataj babilstataj _avizoj:"
+msgid "<b>Custom</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Mienoj:"
+msgid "<b>Applications</b>"
+msgstr "<b>Programoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Dosieradministrilo:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Emfazi misskribajn vortojn"
+#, fuzzy
+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 ""
+"Marku tiun opcion, nur se iu ne el via kontaktlisto spamas/ĉagrenas vin. Uzu "
+"singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
+"kontaktlisto"
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Ebligi sendi informon pri _OS"
 
 #: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ignori formatadon en venantaj mesaĝoj"
+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:128
-msgid "_Log status changes of contacts"
-msgstr "_Protokoli statŝanĝojn de kontaktoj"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Ebligi sendi informon pri _OS"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "Ret_poŝtkliento:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Aŭtomate nedisponebla post:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Malfermi..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Reŝargi kolorojn per defaŭlto"
-
-#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Montrataj babilstataj _avizoj:"
+msgid "Allow my _idle time to be sent"
+msgstr "Ebligi sendi informon pri _OS"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Statmesaĝo:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Privataj listoj</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
 #: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
-msgid "in _group chats"
-msgstr "Eniri en babilejon"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Mankas en kontaktlisto"
+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:139
-msgid "minutes"
-msgstr "minutoj"
+msgid "_Open..."
+msgstr "_Malfermi..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Detala agorda administrilo</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Krome"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privataj listoj:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Aldoni / Redakti regulon</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Privata listo"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Listo de reguloj</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privataj listoj</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktiva dum la kuranta seanco"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktiva dum ĉiu lanĉo"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Listo de reguloj</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Ĉiuj"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Aldoni / Redakti regulon</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "ĉiuj laŭ abonado"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permesi"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Jabber-ID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "ĉiuj en la grupo"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ordnumero:"
+msgid "all by subscription"
+msgstr "ĉiuj laŭ abonado"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Privata listo"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Ĉiuj"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "ĉiuj laŭ abonado"
+msgid "to send me messages"
+msgstr "sendi mesaĝojn al mi"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "ĉiuj en la grupo"
+msgid "to send me queries"
+msgstr "sendi informmendojn al mi"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Ambaŭ"
+msgid "to view my status"
+msgstr "vidi mian staton"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "De"
+msgid "to send me status"
+msgstr "sendi staton al mi"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "unu"
+msgid "All (including subscription)"
+msgstr "ĉiuj laŭ abonado"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "du"
+msgid "Order:"
+msgstr "Ordnumero:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "sendi mesaĝojn al mi"
+#, fuzzy
+msgid "none"
+msgstr "unu"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "sendi informmendojn al mi"
+#, fuzzy
+msgid "both"
+msgstr "Ambaŭ"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "sendi staton al mi"
-
-#: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "vidi mian staton"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Aldoni regulon</b>"
+msgid "from"
+msgstr "De"
 
-#: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Kaŝbildeto:"
+msgid "to"
+msgstr "du"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Naskiĝtago:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Propraj</b>"
+msgid "<b>Family:</b>"
+msgstr "Familia nomo:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Propraj</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Sonoj</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Aldoni regulon</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Fako:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "Retpoŝtadreso:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Agordo</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Kroma adreso:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familia nomo:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Propraj</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Agordo</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Hejmpaĝo:"
+msgid "<b>State:</b>"
+msgstr "<b>Agordo</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Kroma adreso:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Aldoni regulon</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Poŝtkodo:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Propraj</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Kaŝnomo:"
+msgid "<b>Address</b>"
+msgstr "<b>Aldoni regulon</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Telefono:"
+msgid "<b>Homepage:</b>"
+msgstr "Hejmpaĝo:"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Kondiĉoj</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Poŝtkodo:"
+msgid "<b>Nickname:</b>"
+msgstr "Kaŝnomo:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Agordo</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Telefono:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: JJJJ-MM-TT"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Sonoj</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Naskiĝtago:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Agordo</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "Retpoŝtadreso:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Agordo</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Kaŝbildeto:"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Klaku por starigi vian kaŝbildon"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Persona informo"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sonoj</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Propraj</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Pri si"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Kondiĉoj</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Klaku por starigi vian kaŝbildon"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Fako:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: JJJJ-MM-TT"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Persona informo"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Laboro"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Kion vi volas fari?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Pri si"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Forigi konton _nur el Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Forigi konton el Gajim kaj el _servilo"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Kion vi volas fari?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Forigi"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_O kej"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Aldoni kontakton..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Agoj"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Servilaj trajtoj"
+msgid "Add _Contact..."
+msgstr "_Aldoni kontakton..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Dosieraj _transmetoj"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "A_dministri"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Oftaj demandoj (rete)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoj"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Helpo reta"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "_Vizitkarto"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "_Vizitkarto"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Vido"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Montri Trans_portilojn"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Montri _senkonektajn kontaktojn"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Kontoj"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Dosieraj _transmetoj"
 
-#. 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 "_Agoj"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Helpo"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Enhavo"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "A_dministri"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Helpo reta"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_Respondaro"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Helpo"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Sendi unuopan _mesaĝon..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Oftaj demandoj (rete)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Vido"
-
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/roster_window.ui.h:26
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Servilaj trajtoj"
+
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Serĉi"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr ""
+
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Aldoni _kontakton"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Serĉi"
 
@@ -3043,41 +2880,37 @@ msgstr "Registri ĉe"
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Respondi al tiu mesaĝo"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Al:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Sen_di"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Sendi mesaĝon"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Sendi mesaĝon kaj fermi fenestron"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Respondi"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Al:"
+msgid "Reply to this message"
+msgstr "Respondi al tiu mesaĝo"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Respondi"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Sendi kaj fermi"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Sendi mesaĝon kaj fermi fenestron"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Permesi"
+msgid "Subscription Request"
+msgstr "Mendo de abono"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Permesi al kontakto koni kiam vi konektas"
+msgid "_Deny"
+msgstr "_Rifuzi"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -3086,274 +2919,285 @@ msgid ""
 msgstr ""
 "Rifuzi abonon de kontakto, do li aŭ ŝi ne povos scii kiam vi estas konektita"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Mendo de abono"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Permesi"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Rifuzi"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Permesi al kontakto koni kiam vi konektas"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Silentigi sonojn"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Sendi unuopan _mesaĝon"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Montri ĉiujn nelegitajn _eventojn"
-
-#: ../data/gui/systray_context_menu.ui.h:4
 msgid "Sta_tus"
 msgstr "Sta_to"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Babilejo"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Agoj</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Sendi unuopan _mesaĝon"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Propraj</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Agordo</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Silentigi sonojn"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontakta informo"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber-ID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Risurco:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Agordo</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Priskribo</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Propraj</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentoj"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Agordo</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>User avatar:</b>"
+msgstr "Kaŝbildeto:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Administri _babilejon"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakto"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Priskribo</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kontakta informo"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Agoj</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Plu"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Kaŝbildeto:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakto"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Sonoj</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentoj"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber-trafiko</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML enigo</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Informo/Peto (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sonoj</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Informo/Peto (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Ĉeesto"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mesaĝo"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Ĉeesto"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML enigo</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Korekti konton..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Loka JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Persona"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Risurco:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+bazita jabber-kliento"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Persona"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim tujmesaĝilo"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+bazita jabber-kliento"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontakta informo"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Malkorekta rikordo"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr ""
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Ŝaltita"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Malŝaltita"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Bulea"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Entjera"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Koloro"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Parametra nomo"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Valoro"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Datumtipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Mankas)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Kaŝita"
 
@@ -3364,240 +3208,178 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] ""
 msgstr[1] ""
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Angla"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Belorusa"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgara"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretona"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Ĉeĥa"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Germana"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Greka"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Brita"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Hispana"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Eŭska"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Franca"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Kroata"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Itala"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norvega (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Nederlanda"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norvega"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Pola"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugala"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazila Portugala"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Rusa"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Serbian"
-msgstr "Germana"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovaka"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Sveda"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Ĉina (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Lingvo de literumado"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Konekto mankas"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "Substreko"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Kaŝnomo"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Tiparo:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontakta informo"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Ĉifrado ebligata"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "La aŭtomate nedisponebla statmesaĝo"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Sendi dosieron"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
@@ -3605,66 +3387,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3672,258 +3454,620 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Dosieraj transmetoj"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Longo: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Akcepti"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Dosiertransmeto plenumitas"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Babileja invitilo"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Forigas kontakton el kontaktlisto"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Eraro dum legado de dosiero:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Dosiera transmeto haltitas"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Dosiera transmeto nuligitas"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Konekto kun punkto neestableblas."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s ne trovitas"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Fora"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Enrete"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Baskuli Open_PGP-ĉifradon"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Sendi dosieron al kontakto"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s ne estas valida protokola detalnivelo"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Konekto mankas"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Konekto mankas"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Ŝanĝi kaŝ_nomon"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
+"specifita persono."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Kaŝnomo ne trovitas: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
+"specifita persono."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Sendi %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Al vi oni malpermesis esti en la babilejo."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Malkorekta salutnomo"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Aparteneco:"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Mankas argumento \"kontakt-jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "kreas dosierujon %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontakta informo"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Babilema"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "naŭ"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ne malhelpu."
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Priskribo"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Nova babilejo"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr " %d nelegita mesaĝo"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr " %d nelegita mesaĝo"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Uzi D-Bus kaj avizadan demonon por montri avizojn"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al fora."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Aŭtomate fora"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al nedisponebla."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Nedisponebla pro longa senfarado"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "statmesaĝa teksto"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Montri eventon en _kontaktlisto"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Montri eventon en _kontaktlisto"
+
+#. red
+#: ../src/common/config.py:104
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Mendo de dosiera transmeto"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Dosiera transmeto nuligitas"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Babileja invitilo"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "statmesaĝa teksto"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Lingvo uzata de literumilo"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3933,7 +4077,7 @@ msgstr ""
 "'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
 "'never' - neniam eligi tempon."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3944,18 +4088,18 @@ msgstr ""
 "preciza, 4 por la malplej preciza. Ĉi tio uzatas nur kiam print_time estas "
 "'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Trakti parojn * / _ kiel stiligajn signojn."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
 "* *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3965,7 +4109,7 @@ msgstr ""
 "elektitas. Pri sintakso vidu http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (Se vi volas uzi tion, instalu docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3973,7 +4117,7 @@ msgstr ""
 "Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
 "babilejo."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3981,7 +4125,13 @@ msgstr ""
 "Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupis "
 "tiun kaŝnomon."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3992,50 +4142,60 @@ msgstr ""
 "vidu pitonan dokumentaron pri la funkcio \"strftime\": http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
 "malfermas denove."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kiom da minutoj devas resti lastaj lineoj de antaŭa komunikado."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4043,11 +4203,11 @@ msgstr ""
 "Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
 "kondutmaniero de Mirabilis ICQ Kliento)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kiom lineojn memori por Ctrl+Supren."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4056,11 +4216,11 @@ msgstr ""
 "Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
 "\" kio signifas uzi wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4072,14 +4232,14 @@ msgstr ""
 "listen_to_network_manager=False kaj sync_with_global_status=True) surbaze de "
 "la stato de la retkonekto."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4087,7 +4247,7 @@ msgstr ""
 "Montrataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4095,33 +4255,35 @@ msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
 "listo de babilejaj JID."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
 "babilejaj JID separataj per spacetoj."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4130,28 +4292,34 @@ msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Avizi eventojn en la sistema taskopleta bildeto."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4159,17 +4327,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4178,14 +4346,14 @@ msgstr ""
 "Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
 "Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "se \"True\", Gajim kontrolos ĉu ĝi estas defaŭlta jabber-kliento dum ĉiu "
 "lanĉo."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4193,7 +4361,7 @@ msgstr ""
 "Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
 "nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4201,11 +4369,11 @@ msgstr ""
 "Se estas \"True\", Gajim montros statmesaĝojn, se ĝi ne estas malplena, por "
 "ĉiu kontakto sub la kontaktnomo en la kontaktlisto."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4213,7 +4381,7 @@ msgstr ""
 "Se \"True\", Gajim demandos pri kaŝbildeto ĉiun kontakton, kiu ne havis ĝin "
 "lastatempe aŭ kies kaŝbildeto estis konservita tro antaŭlonge."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4221,9 +4389,10 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4234,29 +4403,33 @@ msgstr ""
 "statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
 "Gajim eligos nur pri eniroj/eliroj."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Fona koloro de kontaktoj kiam ili jus elsalutis."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se \"True\", rememoritaj mesaĝoj uzos pli malgrandan tiparon ol defaŭltaj."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4266,7 +4439,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4277,7 +4450,7 @@ msgstr ""
 "informon en babilejo."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4286,7 +4459,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Administras fenestron kien novaj mesaĝoj metitas:\n"
@@ -4297,32 +4470,40 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Kaŝas rubandon en dupersona interparola fenestro"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4330,27 +4511,27 @@ msgstr ""
 "En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
 "sama persono dirinta ĉi-antaŭan mesaĝon."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Sendi mesaĝon kaj fermi fenestron"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Listo de koloroj kiuj estos uzata por kolorigi kaŝnomojn en babilejoj."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab iras al sekva konversacian langeton se ĉiuj legitas."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4358,7 +4539,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4367,7 +4548,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4376,7 +4557,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4386,7 +4567,7 @@ msgstr ""
 "nombroj en la konta korekdada fenestro. GARDU VIN, se vi ensalutis kun "
 "negativa prioritato, vi ricevos neniujn mesaĝojn de via servilo."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4394,7 +4575,7 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4403,7 +4584,7 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4411,7 +4592,7 @@ msgstr ""
 "Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
 "kontaj kaj grupaj linioj."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4419,91 +4600,105 @@ msgstr ""
 "Povas esti malplena, 'chat' aŭ 'normal'. Se ne malplena, rigardi ĉiujn "
 "venantajn mesaĝojn kiel ili estas de ĉi tiu tipo"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4511,84 +4706,97 @@ msgstr ""
 "Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
 "agorderoj \"autopriority_*\"."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4596,141 +4804,188 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s volas sendi dosieron al vi."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "'all' aŭ spacetseparitaj statoj"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', aŭ 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4738,27 +4993,183 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Al"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "ordono pri abona fino de %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Permeso estas forigita"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Malkorekta jabber-ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "eraro dum sendado %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Nekonata versio de D-BUS: %s"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nova unuobla mesaĝo"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova unuopa mesaĝo de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nova privata mesaĝo"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova privata mesaĝo de babilejo %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova mesaĝo de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nova mesaĝo"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova mesaĝo de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s ŝanĝis staton"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s nun estas %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakto ŝanĝis sian staton"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s ensalutis"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakto ensalutis"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s elsalutis"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakto elsalutis"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Neeblas ŝargi senfaran modulon"
@@ -4768,216 +5179,194 @@ msgstr "Neeblas ŝargi senfaran modulon"
 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:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Vizitkarto estas sukcese publicita"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Malkorekta 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: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 ""
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4986,108 +5375,118 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../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:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Ne povas konekti al \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Ne povas konekti al \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Eraro dum forigado de privata listo"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5096,68 +5495,68 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Mankas en kontaktlisto"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Pitona bindmodulo por D-BUS mankas cxe tiu cxi komputilo"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-BUS kunigeblo de Gajim ne uzeblas"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-BUS aŭ konforma pitona modulo mankas ĉe tiu ĉi komputilo."
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-BUS aŭ konforma pitona modulo mankas ĉe tiu ĉi komputilo."
@@ -5172,7 +5571,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servo nedisponeblas: Gajim ne aktivas, aŭ opcio remote_control estas False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-BUS aŭ konforma pitona modulo mankas ĉe tiu ĉi komputilo."
 
@@ -5357,267 +5756,295 @@ msgstr "Fino de semajno"
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Necesas adreso de servilo."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Nedisponebla"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paŭzas"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paŭzas"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Konektas"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Fora"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Nevidebla"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Mastro"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administristo"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Sendi mesaĝon"
 msgstr[1] "Sendi mesaĝon"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Ne povas alŝuti bildon"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "%s ne estas valida protokola detalnivelo"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Ne povas alŝuti bildon"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Agordo de babilejo"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5629,111 +6056,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Defaŭlta statmesaĝo"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Longo: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Dosiero: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "verda"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "eraro: %s nedisponeblas por legi"
+msgid "Error: cannot open %s for reading"
+msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
@@ -6439,51 +6880,133 @@ msgstr ""
 msgid "Writing"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Defaŭlte"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "mara"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Elpelatas %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Konto"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Konto"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Priskribo"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Eraro de Avahi"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "unu"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "babilejo"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Neeblas aliĝi al pordo %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Eble vi havas alian ekzempleron kiu estas plenumata nun. Dosiertransmeto "
-"estos nuligita."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Eraro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6492,46 +7015,45 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
@@ -6542,26 +7064,26 @@ msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
 msgid "Error while adding service. %s"
 msgstr "eraro dum aldonado de servo %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Defaŭlta statmesaĝo"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Ebligi"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6570,214 +7092,215 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "Por ŝanĝi la nomon de konto, vi devas legi atendantajn eventojn."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Administri kontojn"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6785,11 +7308,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6797,11 +7320,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6809,11 +7332,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6821,7 +7344,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6838,115 +7361,111 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Forigi konton _nur el Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ forigi "
 "tiun ĉi legosignon."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Malkorekta salutnomo"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6956,34 +7475,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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, 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:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6993,7 +7512,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7001,81 +7520,98 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Daŭrigi"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Unua mesaĝo ricevita"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7084,242 +7620,243 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Eliri"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Hieraŭ"
 msgstr[1] "Hieraŭ"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "En la grupo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Ŝlosil-ID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Kontaktnomo"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Enigi tagmesaĝon"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 #, 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ jabber-kliento"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+bazita jabber-kliento"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7330,107 +7867,159 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "Insecure connection"
+msgstr "Konekto"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Ne plu demandi"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Malprava uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Tio ne estas babilejo"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7439,168 +8028,138 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakto ensalutis"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Kontakto elsalutis"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nova mesaĝo"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nova privata mesaĝo"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Babileja invitilo"
-
-#: ../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:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML-konzolo"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Malrapidas"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Forigi"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7608,192 +8167,188 @@ 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:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Aldoni"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber-ID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Aldoni _kontakton"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Aldoni _kontakton"
+msgstr[1] "Aldoni _kontakton"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Forigas kontakton el kontaktlisto"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Forigas kontakton el kontaktlisto"
+msgstr[1] "Forigas kontakton el kontaktlisto"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Kondiĉo"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "dum mi estas "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7801,38 +8356,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7842,77 +8397,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "por konto %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Aliaj"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7920,476 +8513,492 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Plenumi komandon..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Komandoj: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Ve_nanta mesaĝo:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Historia administrilo"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Mesaĝo sendita"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Pasvortoj diversas"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Konta korektado"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Ve_nanta mesaĝo:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Ĝenerala"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Enrete"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Servilaj trajtoj"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Dosiero"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosiernomo: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Longo: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Dosiertransmeto plenumitas"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Dosiera transmeto nuligitas"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Konekto kun punkto neestableblas."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ricevanto: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Dosiera transmeto haltitas"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Elektu dosieron por sendi..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Priskribo: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne povas atingi tiun dosieron"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Tiu ĉi dosiero estas uzata de alia procezo."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Dosiero: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Priskribo: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s volas sendi al vi dosieron:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Konservi dosieron kiel..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Dosiero: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Priskribo: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s volas sendi al vi dosieron:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Publicas vizitkarton..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Dosiertransmeta eraro"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8397,69 +9006,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Malkorekta dosiero"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Dosiero: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "mesaĝo"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Mienoj:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Montri nur en _kontaktlisto"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Detala agorda administrilo"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Agordo de babilejo"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim bezonas X-servilon. Finas..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim bezonas pywin32 por funkcii"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8468,12 +9114,11 @@ msgstr ""
 "Bonvolu certiĝi ke Pywin32 estas instalita en via operaciuma sistemo. Vi "
 "povas preni ĝin ĉe %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim jam estas lanĉita"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8481,28 +9126,28 @@ msgstr ""
 "Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
 "Ĉu lanĉu malgraŭ tio?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Montri helpon pri specifita komando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "komando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8510,52 +9155,56 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "konto"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "stato"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mesaĝo"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8564,20 +9213,48 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ŝanĝas staton de konto aŭ kontoj"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_tato:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Mi volas registri novan konton"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8587,34 +9264,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8624,133 +9296,130 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Malfermi \"Ekparoli\" dialogfenestron"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Babili per tiu ĉi konto"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8758,46 +9427,99 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Kontakto ŝanĝis sian staton"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Kaŝnomo ne trovitas: %s"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
+"kontoj"
+
+#: ../src/gajim-remote.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Aliĝi al MUC-babilejo"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "babilejo"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "Room JID"
+msgstr "Babilejo:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "kaŝnomo"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Kaŝnomo ne trovitas: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "pasvorto:"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Pasvortoj diversas"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 #, 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
+#: ../src/gajim-remote.py:301
 #, 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8806,164 +9528,42 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Uzado: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../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-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Malprava 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 ""
-"unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
-
-#: ../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: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
-msgid "Change the avatar"
-msgstr "Kontakto ŝanĝis sian staton"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Kaŝnomo ne trovitas: %s"
-
-#: ../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 kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
-"kontoj"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "mesaĝenhavo"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Babilejo:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Kaŝnomo ne trovitas: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "Pasvortoj diversas"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8972,7 +9572,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8981,10 +9581,14 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Malprava uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Etoso"
@@ -9008,203 +9612,237 @@ msgid "You cannot delete your current theme"
 msgstr "Vi ne povas forigi aktivan etoson"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s nomiĝas %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s estas elpelita: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, 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:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -9227,64 +9865,58 @@ msgstr "_Raporti pri eraro"
 msgid "Details"
 msgstr "Detalaĵoj"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ne estas defaŭlta jabber-kliento"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 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:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9294,197 +9926,183 @@ msgstr ""
 "Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
 "Bonvolu specifi alian kaŝnomon jene:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Pasfrazo necesas"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
 "(medivariablo eble ne korekte valorizitas)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9494,103 +10112,88 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../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:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Error opening file"
-msgstr "Eraro dum legado de dosiero:"
+msgid "File Transfer Failed"
+msgstr "Dosieraj transmetoj"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En ĉ_iu mesaĝo"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9598,15 +10201,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Aligado de speciala avizo por %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9617,32 +10225,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9650,109 +10239,112 @@ msgid ""
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Mi volus aldoni vin en mian kontaktliston"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "kreas dosierujon %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontaktoj"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Temo"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Ĉu vi volas malplenigi la datumbazon? (EGE MALREKOMENDITA SE GAJIM AKTIVAS)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9766,96 +10358,109 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Eksportas protokolojn..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s je %(time)s diris: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Ĉu vi vere volas forigi protokolojn de la elektita kontakto?"
-msgstr[1] "Ĉu vi vere volas forigi protokolojn de la elektitaj kontaktoj?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Ĉu vi vere volas forigi protokolojn de la elektita kontakto?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Tio ĉi estas neinversigebla ago."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Kontakta informo"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitajn mesaĝojn?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historio de interparolo kun %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s nun estas %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Ne povas alŝuti bildon"
+msgid "Loading"
+msgstr "Tajpas mesaĝon"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Mesaĝoj"
 
@@ -9867,153 +10472,165 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s ŝanĝis staton"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "naŭ"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s ensalutis"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s elsalutis"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Malpermesas %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nova unuopa mesaĝo de %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Konektado malsukcesis"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova privata mesaĝo de babilejo %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nova mesaĝo de %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nova mesaĝo de %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "naŭ"
+msgid "Configuration"
+msgstr "Agordo de babilejo"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Dosierindiko"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontakta informo"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: JJJJ-MM-TT"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Publicas vizitkarton..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 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:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10021,55 +10638,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Nuligi dosiertransmeton"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, 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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10077,11 +10694,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10090,69 +10707,69 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 #, 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10161,12 +10778,12 @@ msgstr ""
 "vidos vin kiel senkonekta."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10174,16 +10791,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10192,46 +10809,46 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10241,24 +10858,29 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Sendi %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Igi %s kaj %s metakontaktoj"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
@@ -10268,138 +10890,138 @@ msgstr "Igi %s kaj %s metakontaktoj"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Serĉi servojn..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Aranĝi _Grupojn"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Sendi unuopan mesaĝon"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Plenumi komandon..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Renomigi"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontakto malkonektita"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
@@ -10416,31 +11038,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Temo: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10450,149 +11062,154 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Risurco: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de tiu ĉi babilejo"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Konekto"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontakto malkonektita"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Abono: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " ekde %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Babilejo:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Ŝaltita"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Konta korektado"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Plenumita"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Paŭzas"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10600,34 +11217,34 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10635,36 +11252,377 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 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:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Elektu dosieron por sendi..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " iun fenestron/slipon malfermitan kun tiu kontakto "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Agoj</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Kondiĉoj</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Kromaj agoj"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Kroma agordo de avizado"
+
+#~ msgid "All statuses"
+#~ msgstr "ia ajn stato"
+
+#~ msgid "Busy "
+#~ msgstr "Okupata "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakto ŝanĝis sian staton"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakto malkonektita"
+
+#~ msgid "Don't have "
+#~ msgstr "Ne havas "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Dosiera transmeto haltitas"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Emfazado de mesaĝoj en babilejo"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Ricevitas mesaĝo en babilejo"
+
+#~ msgid "Have "
+#~ msgstr "Havas "
+
+#~ msgid "Launch a command"
+#~ msgstr "Lanĉi komandon"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "kelka(j) speciala(j) stato(j)..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Enrete / Babilema"
+
+#~ msgid "Play a sound"
+#~ msgstr "Ludi sonon"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nova privata mesaĝo"
+
+#~ msgid "When "
+#~ msgstr "Kiam "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktivigi fenestragordilan urgkonsileton \"UrgencyHint\" por briligi "
+#~ "interparolan fenestron en taskostrio"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Malŝaltas aŭtomatan malfermadon de interparola fenestro"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Malŝalti ekzistan ŝprucfenestron"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Malŝalti ekzistan sonon por tiu ĉi evento"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Malŝalti eventmontron en kontaktlisto"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Malŝalti eventmontron en kontaktlisto"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informi min per ŝprucfenestro"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "Malfermi interparolan _fenestron por uzulo"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Montri eventon en _kontaktlisto"
+
+#~ msgid "and I "
+#~ msgstr "kaj mi "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontaktoj"
+
+#~ msgid "for "
+#~ msgstr "por "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupo"
+
+#~ msgid "when I'm in"
+#~ msgstr "dum mi estas je"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Aligas kontakton en kontaktliston"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Permesi al li/ŝi vidi vian staton"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Priskribo: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Krome"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+#~ "fenestro kaj en babilejoj"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+#~ "fenestro kaj en babilejoj"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+#~ "fenestro kaj en babilejoj"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Sendi unuopan _mesaĝon..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Kaŝbildeto:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim tujmesaĝilo"
+
+#~ msgid "English"
+#~ msgstr "Angla"
+
+#~ msgid "Belarusian"
+#~ msgstr "Belorusa"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgara"
+
+#~ msgid "Breton"
+#~ msgstr "Bretona"
+
+#~ msgid "Czech"
+#~ msgstr "Ĉeĥa"
+
+#~ msgid "German"
+#~ msgstr "Germana"
+
+#~ msgid "Greek"
+#~ msgstr "Greka"
+
+#~ msgid "British"
+#~ msgstr "Brita"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Hispana"
+
+#~ msgid "Basque"
+#~ msgstr "Eŭska"
+
+#~ msgid "French"
+#~ msgstr "Franca"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroata"
+
+#~ msgid "Italian"
+#~ msgstr "Itala"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norvega (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederlanda"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norvega"
+
+#~ msgid "Polish"
+#~ msgstr "Pola"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugala"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazila Portugala"
+
+#~ msgid "Russian"
+#~ msgstr "Rusa"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Germana"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovaka"
+
+#~ msgid "Swedish"
+#~ msgstr "Sveda"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Ĉina (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Lingvo de literumado"
+
+#~ msgid "all or space separated status"
+#~ msgstr "'all' aŭ spacetseparitaj statoj"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', aŭ 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' aŭ ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Kontrolu vian konekton aŭ provu denove poste"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "eraro: %s nedisponeblas por legi"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Neeblas aliĝi al pordo %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Eble vi havas alian ekzempleron kiu estas plenumata nun. Dosiertransmeto "
+#~ "estos nuligita."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ jabber-kliento"
+
+#~ msgid "Condition"
+#~ msgstr "Kondiĉo"
+
+#~ msgid "when I am "
+#~ msgstr "dum mi estas "
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, "
+#~ "nevidebla "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Uzado: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontaktoj"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Temo: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Babilejo:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Ŝaltita"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Malŝalti montron de evento en taskopleto"
 
@@ -10682,30 +11640,12 @@ msgstr " risurco kun prioritato "
 #~ 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"
 
@@ -10789,9 +11729,6 @@ msgstr " risurco kun prioritato "
 #~ "Kontakta linio\n"
 #~ "Rubando"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Administri kontojn"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Forigi"
@@ -10896,9 +11833,6 @@ msgstr " risurco kun prioritato "
 #~ msgstr ""
 #~ "Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
-
 #~ msgid "%i days ago"
 #~ msgstr "Antaŭ %i tagoj"
 
@@ -10911,12 +11845,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Commands: %s"
 #~ msgstr "Komandoj: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10925,10 +11853,6 @@ msgstr " risurco kun prioritato "
 #~ "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s "
 #~ "eksplodas)."
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "helpinformo mankas por /%s"
 
@@ -10945,10 +11869,6 @@ msgstr " risurco kun prioritato "
 #~ msgstr "%(contact_jid)s invititas al %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Kaŝnomo ne trovitas: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10959,13 +11879,6 @@ msgstr " risurco kun prioritato "
 #~ "spaceton. Se la JID ĉeestas en la babilejo, tiu estos ankaŭ elpelita."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
-#~ "specifita persono."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -11005,9 +11918,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11040,10 +11950,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Host:"
 #~ msgstr "_Retnodo:"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Montri _kontaktliston"
-
 #~ msgid "Modify Account"
 #~ msgstr "Korekti konton"
 
@@ -11128,9 +12034,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "Ebligi _lig-lokan komunikadon"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Kompakta vido    Alt+C"
 
@@ -11143,9 +12046,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Query Builder..."
 #~ msgstr "Konstruilo de petoj..."
 
-#~ msgid "Accept"
-#~ msgstr "Akcepti"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Invito estas ricevita"
 
@@ -11241,9 +12141,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "The auto away status message"
 #~ msgstr "La aŭtomate fora statmesaĝo"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "La aŭtomate nedisponebla statmesaĝo"
-
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Rigardi ĉiujn venantajn mesaĝojn kiel:"
 
@@ -11542,6 +12439,3 @@ msgstr " risurco kun prioritato "
 
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Aŭtomate permesi kontakton"
-
-#~ msgid "Send File"
-#~ msgstr "Sendi dosieron"
diff --git a/po/es.po b/po/es.po
index 4f3320069..fad23c059 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,15 +4,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
 "Language-Team: none <>\n"
@@ -22,307 +18,299 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Estado"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Eventos _personales"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "Iniciar conver_sación"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Entrar a un grupo de charla"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Añadir contacto..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Ejecutar comando..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Modificar cuenta"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir bandeja de entrada de GMail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Eventos _personales"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "Iniciar conver_sación"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Estado"
+msgid "_Modify Account"
+msgstr "_Modificar cuenta"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Asistente para crear una cuenta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
-msgstr ""
-"<b>Conectando al servidor</b>\n"
-"\n"
-"Por favor espera..."
+"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:4
+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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor, elige una de las siguientes opciones:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "Por favor, introduce los datos de tu cuenta actual"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Por favor, selecciona un servidor</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "C_ontraseña:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "_Guardar contraseña"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Autentificación a_nónima"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Conectar cuando presione Finalizar"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "ID de _Jabber: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Asistente para crear una cuenta"
+msgid "Anon_ymous authentication"
+msgstr "Autentificación a_nónima"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Por favor, selecciona un servidor</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Pro_xy"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gestionar..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Usar nombre de host y puerto personalizados"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Pro_xy"
+msgid "_Hostname:"
+msgstr "Nombre del host:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "_Guardar contraseña"
+msgid "_Port:"
+msgstr "_Puerto:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avanzado"
 
 #: ../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: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"
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+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:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Avanzado"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Finalizar"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Nombre del host:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Conectando al servidor</b>\n"
+"\n"
+"Por favor espera..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "ID de _Jabber: "
+msgid "Connect when I press Finish"
+msgstr "Conectar cuando presione Finalizar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "C_ontraseña:"
+msgid "Set my profile when I connect"
+msgstr "Definir mi perfil cuando me conecte"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Puerto:"
+msgid "_Finish"
+msgstr "_Finalizar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Miscelánea</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ninguno"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Cuentas"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Información personal</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Dirección"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Eliminar"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Ajustar al esta_do"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Re_nombrar"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Cuenta"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Ha_bilitar"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Cuentas"
+msgid "Anonymous authentication"
+msgstr "Autentificación anónima"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Operaciones de administración"
+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 ""
+"El recurso es enviado al servidor de Jabber para 'separar' el mismo "
+"identificador en dos o más partes dependiendo del número de clientes "
+"conectados en el mismo servidor con la misma cuenta. Así puedes estar "
+"conectado usando la misma cuenta con el recurso 'Casa' o 'Trabajo' al mismo "
+"tiempo. El recurso que tenga la prioridad más alta será el que reciba los "
+"eventos (mira más abajo)."
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Autentificación anónima"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Autoreconectar si se pierde la conexión"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Sincronizar contactos"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Navegar"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Haz click para solicitar una autorización a todos los contactos para una "
+"nueva cuenta"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_onectar al inicio de Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Cam_biar contraseña"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Click para cambiar la contraseña de la cuenta"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Marca esto para que Gajim te pregunte antes de enviar tu contraseña a través "
-"de una conexión no segura."
+msgid "Administration operations"
+msgstr "Operaciones de administración"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Elige archivo a enviar..."
+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 ""
+"La prioridad es usada por Jabber para determinar quién obtiene los eventos "
+"del servidor cuando dos o más clientes están conectados usando la misma "
+"cuenta. El cliente con mayor prioridad recibe los eventos."
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Elegir _clave..."
+msgid "A_djust to status"
+msgstr "Ajustar al esta_do"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Click para cambiar la contraseña de la cuenta"
+msgid "Priority will change automatically according to your status."
+msgstr "La prioridad cambiará automáticamente acorde a tu estado."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Haz click para solicitar una autorización a todos los contactos para una "
-"nueva cuenta"
+msgid "Priori_ty:"
+msgstr "Pr_ioridad:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Certificado autofirmado"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Co_nectar al inicio de Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Conexión"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Correo-e:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Nombre:"
+msgid "Resour_ce:"
+msgstr "Re_curso: "
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Navegar"
 
 #: ../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 ""
-"Si está marcado, Gajim también emitirá algunas IPs más excepto desde tu IP, "
-"para que tu transferencia tengas más posibilidades de funcionar."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certificado rechazado"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Si está marcado, Gajim obtendrá la contraseña de un agente GPG como seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Certificado autofirmado"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Cuenta"
 
 #: ../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 ""
-"Si está marcado, Gajim enviará paquetes de mantenimiento de actividad para "
-"prevenir desconexiones por expiración"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onectar al inicio de Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -333,6 +321,18 @@ msgstr ""
 "usando esta cuenta."
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Autoreconectar si se pierde la conexión"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Grabar conversaciones para todos los contactos"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -342,178 +342,206 @@ msgstr ""
 "desplegable de la parte inferior de la lista de contactos) cambiará el "
 "estado de esta cuenta de forma acorde"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Si el puerto por defecto para mensajes entrantes no es válido para tí, "
-"puedes seleccionar otro aquí.\n"
-"Podrías considerar cambiar aspectos posibles de la configuración del "
-"firewall."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
+msgid "Use file transfer proxies"
+msgstr "Usar proxies para las transferencias de archivo"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Apellido(s):"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Si está marcado, Gajim también emitirá algunas IPs más excepto desde tu IP, "
+"para que tu transferencia tengas más posibilidades de funcionar."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Combinar las cuentas"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "General"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Ninguna clave seleccionada"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_usar variable de entorno HTTP__PROXY"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Información personal"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Gestionar..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Pr_ioridad:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Advertir antes de usar una conexión no segura"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"La prioridad es usada por Jabber para determinar quién obtiene los eventos "
-"del servidor cuando dos o más clientes están conectados usando la misma "
-"cuenta. El cliente con mayor prioridad recibe los eventos."
+"Marca esto para que Gajim te pregunte antes de enviar tu contraseña a través "
+"de una conexión no segura."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "La prioridad cambiará automáticamente acorde a tu estado."
+msgid "Send _keep-alive packets"
+msgstr "Enviar pa_quetes de mantenimiento de actividad"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_nombrar"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Si está marcado, Gajim enviará paquetes de mantenimiento de actividad para "
+"prevenir desconexiones por expiración"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Re_curso: "
+msgid "Use cust_om hostname/port"
+msgstr "Usar nombre de h_ost y puerto personalizados"
 
 #: ../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 ""
-"El recurso es enviado al servidor de Jabber para 'separar' el mismo "
-"identificador en dos o más partes dependiendo del número de clientes "
-"conectados en el mismo servidor con la misma cuenta. Así puedes estar "
-"conectado usando la misma cuenta con el recurso 'Casa' o 'Trabajo' al mismo "
-"tiempo. El recurso que tenga la prioridad más alta será el que reciba los "
-"eventos (mira más abajo)."
+msgid "_Hostname: "
+msgstr "Nombre del _host:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Grabar conversaciones para todos los contactos"
+msgid "_Port: "
+msgstr "_Puerto:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Miscelánea</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Enviar pa_quetes de mantenimiento de actividad"
+msgid "Connection"
+msgstr "Conexión"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Ninguna clave seleccionada"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Sincroni_zar el estado de la cuenta con el estado global"
+msgid "Choose _Key..."
+msgstr "Elegir _clave..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Sincronizar contactos"
+msgid "Use G_PG Agent"
+msgstr "Usar agente G_PG"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
+"Si está marcado, Gajim obtendrá la contraseña de un agente GPG como seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Usar agente G_PG"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Usar nombre de h_ost y puerto personalizados"
+msgid "_Edit Personal Information..."
+msgstr "_Editar información personal..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Usar puert_o personalizado:"
+msgid "Information about you, as stored in the server"
+msgstr "Información acerca de tí a guardar en el servidor"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Usar proxies para las transferencias de archivo"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Información personal</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Información personal"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Editar información personal..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Co_nectar al inicio de Gajim"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Ha_bilitar"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Sincroni_zar el estado de la cuenta con el estado global"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "Nombre del _host:"
+msgid "Use cust_om port:"
+msgstr "Usar puert_o personalizado:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Gestionar..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Si el puerto por defecto para mensajes entrantes no es válido para tí, "
+"puedes seleccionar otro aquí.\n"
+"Podrías considerar cambiar aspectos posibles de la configuración del "
+"firewall."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Nombre:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Puerto:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Apellido(s):"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Advertir antes de usar una conexión no segura"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Correo-e:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_usar variable de entorno HTTP__PROXY"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "ID de Jabber:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Combinar las cuentas"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Cuenta:"
+msgid "Add New Contact"
+msgstr "Añadir un contacto"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Permitirle a este contacto ver mi estado"
+msgid "A_ccount:"
+msgstr "_Cuenta:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Añadir un contacto"
+msgid "_Protocol:"
+msgstr "_Protocolo:"
 
-#: ../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 "Me gustaría añadirte a mi lista de contactos."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "ID de _usuario:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Alias:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Permitirle a este contacto ver mi estado"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Subscripción"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -525,7 +553,11 @@ msgstr ""
 "protocolo. Pulsa el botón Registrar\n"
 "para proceder."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registrar"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -533,594 +565,373 @@ msgstr ""
 "Debes estar conectado al transporte para poder\n"
 "añadir un contacto de este protocolo."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Alias:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocolo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registrar"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Subscripción"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "ID de _usuario:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Me gustaría añadirte a mi lista de contactos."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Ha ocurrido un error:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Comandos Ad hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Elige el comando a ejecutar:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Por favor, espera mientras se solicita la lista de comandos..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Comandos Ad hoc - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Elige el comando a ejecutar:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Comprobar de nuevo"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Descripción del error..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Por favor, espera mientras se envía el comando..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Finalizar"
+msgid "Please wait..."
+msgstr "Por favor, espera..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Por favor, espera mientras se solicita la lista de comandos..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Esta entidad de jabber no expone comandos."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Por favor, espera mientras se envía el comando..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Ha ocurrido un error:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Por favor, espera..."
+msgid "Error description..."
+msgstr "Descripción del error..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Esta entidad de jabber no expone comandos."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Finalizar"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Editor avanzado de configurción"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Descripción</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTA:</b> Debes reiniciar Gajim para que algunos cambios tengan efecto"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor avanzado de configurción"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtro:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Restablecer colores por defecto"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Eliminar MOTD"
+msgid "Show _XML Console"
+msgstr "Mostrar consola _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Listas de _privacidad"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrador"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Enviar mensaje de servidor"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Definir MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Define el mensaje del día"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Mostrar consola _XML"
+msgid "Set MOTD..."
+msgstr "Definir MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Actualizar MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Actualizar MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrador"
+msgid "Delete MOTD"
+msgstr "Eliminar MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Enviar mensaje de servidor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " una ventana/pestaña abierta con ese contacto "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Acciones</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Condiciones</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sonidos</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Acciones A_vanzadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Control de Notificaciones Avanzadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Ausente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Ocupado "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Contacto cambió su estado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contacto desconectado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "No tiene "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Transferencias"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Petición de transferencia de archivo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Transferencia del archivo detenida"
+msgid "Deletes Message of the Day"
+msgstr "Elimiina mensaje del día"
 
-#: ../data/gui/advanced_notifications_window.ui.h:16
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Resaltado de mensaje de grupo de charla"
+msgid "No"
+msgstr "Ninguno"
 
-#: ../data/gui/advanced_notifications_window.ui.h:17
+#: ../data/gui/archiving_preferences_window.ui.h:2
 #, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Mensaje de grupo de charla recibido"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Tiene "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Lanzar un comando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "No disponible"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Uno o más estados especiales..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "En línea / Libre para hablar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Reproducir un _sonido"
+msgid "Yes"
+msgstr "español"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "Receive a Message"
-msgstr "Nuevo mensaje privado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Cuando"
+msgid "Prefer"
+msgstr "Preferencias"
 
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
 msgstr ""
-"_Activar el índice de urgencia del gestor de ventanas en la barra de tareas "
-"para resaltar la ventana de conversación"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Deshabilitar apertura automática de ventanas de conversación"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Deshabilitar ventanas emergentes existentes"
 
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Deshabilitar sonidos existentes para este evento"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Deshabilitar mostar eventos en el roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informarme con una ventana emergente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Abrir ventana de conversación con este usuario"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Mostrar evento en roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Mostrar evento en roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "y yo "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Contactos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "para "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "cuando esté en"
-
-#: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:2
+#: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Local</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:4
+#: ../data/gui/archiving_preferences_window.ui.h:9
 #, 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/atom_entry_window.ui.h:1
+msgid "New entry received"
+msgstr "Nueva entrada recibida"
 
-#: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Preferencias"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Has recibido una nueva entrada:"
 
-#: ../data/gui/archiving_preferences_window.ui.h:9
-#, fuzzy
-msgid "Yes"
-msgstr "español"
+#: ../data/gui/atom_entry_window.ui.h:3
+msgid "Feed name:"
+msgstr "Nombre del feed:"
 
-#: ../data/gui/atom_entry_window.ui.h:1
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "Entry:"
 msgstr "Entrada:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
-msgid "Feed name:"
-msgstr "Nombre del feed:"
-
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Última modificación:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Nueva entrada recibida"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Has recibido una nueva entrada:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Mensaje:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Definir Actividad"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Define una actividad"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Mensaje:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Estado de ánimo</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Mensaje:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Introdúcela de nuevo para confirmar:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Introduce nueva contraseña:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Introdúcela de nuevo para confirmar:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Escribe tu nuevo mensaje de estado</b>"
+msgid "Save as Preset..."
+msgstr "Guardar como predefinido..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Actividad:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Estado de ánimo:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Actividad:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Mensajes predefinidos:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Guardar como predefinido..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Escribe tu nuevo mensaje de estado</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Entrar a un grupo de charla"
+msgid "_Copy Link Location"
+msgstr "_Copiar la dirección del enlace"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Añadir al roster"
+msgid "_Open Link in Browser"
+msgstr "_Abrir enlace en navegador"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar la dirección de correo/ID de Jabber"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar la dirección del enlace"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Abrir el compositor de correo"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Abrir enlace en navegador"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr ""
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Entrar a un grupo de charla"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Añadir al roster"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Mostrar una lista de emoticonos (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Añade éste contacto al roster (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Invitar contactos a esta conversación (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Invitar contactos a esta conversación (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+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:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Muestra un menú de funciones avanzadas (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Enviar mensaje"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "In_vitar"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "¡Invitar amigos!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Servidor MUC"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Por favor selecciona un servidor MUC."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1128,120 +939,137 @@ msgstr ""
 "Vas a comenzar una conversación multiusuario.\n"
 "Selecciona los contactos a invitar"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Pregunta para ver _su estado"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Por favor selecciona un servidor MUC."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Añadir _notificación especial..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Servidor MUC"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Asignar clave Open_PGP..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "In_vitar"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Ejecutar comando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Iniciar conversación"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Editar _grupos..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Enviar mensaje..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Enviar _archivo"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_vitar a"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Invitar _Contactos"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "_Eliminar"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Alternar cifrado OpenPGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Alternar cifrado End to End"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Envía estado personalizado"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Ejecutar comando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Enviar mensaje..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Gestionar contacto"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Enviar _archivo"
+msgid "_Rename..."
+msgstr "_Renombrar..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Definir _Avatar personalizado..."
+msgid "Edit _Groups..."
+msgstr "Editar _grupos..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Iniciar conversación"
+msgid "Assign Open_PGP Key..."
+msgstr "Asignar clave Open_PGP..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Alternar cifrado End to End"
+msgid "Set Custom _Avatar..."
+msgstr "Definir _Avatar personalizado..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Alternar cifrado OpenPGP"
+msgid "Add Special _Notification..."
+msgstr "Añadir _notificación especial..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Subscripción"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Permitirle ver mi estado"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Permitirle a este contacto ver mi estado"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Pregunta para ver _su estado"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Histórico"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorar"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Bloquear"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Gestionar contacto"
+msgid "_Unignore"
+msgstr "_No ignorar"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Renombrar..."
+msgid "_Ignore"
+msgstr "_Ignorar"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Subscripción"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "_Eliminar"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_No ignorar"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Histórico"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Rellenar el formulario."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuración del salón"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Rellenar el formulario."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar grupos"
@@ -1254,58 +1082,49 @@ msgstr "Información <b>ESession</b>"
 msgid "_Verify"
 msgstr "_Verificar"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Características"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Lista de posibles características en Gajim</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Características"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Una lista de transferencias activas, finalizadas y detenidas"
+msgid "File Transfers"
+msgstr "Transferencias"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Cancela la transferencia"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Muestra una lista de transferencias entre tú y otros"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Cancela la transferencia de archivo seleccionada"
+msgid "file transfers list"
+msgstr "lista de transferencias"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Cancela la transferencia de archivo seleccionada y elimina el archivo "
-"incompleto"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Una lista de transferencias activas, finalizadas y detenidas"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Limpiar"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notificarme cuando una transferencia finalice"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Transferencias"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+"Cuando una transferencia se completa, muestra una notificación emergente"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Oculta la ventana"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr ""
+"Elimina de la lista las transferencias finalizadas, canceladas y fallidas"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias de la lista"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr ""
-"Elimina de la lista las transferencias finalizadas, canceladas y fallidas"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Muestra una lista de transferencias entre tú y otros"
-
-#: ../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"
@@ -1313,83 +1132,110 @@ msgstr ""
 "Esta acción elimina transferencias de la lista. Si la transferencia está "
 "activa, es primero detenida y luego eliminada"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Limpiar"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pausa"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
-"Cuando una transferencia se completa, muestra una notificación emergente"
+"Cancela la transferencia de archivo seleccionada y elimina el archivo "
+"incompleto"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continuar"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Cancela la transferencia"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notificarme cuando una transferencia finalice"
+msgid "Cancels the selected file transfer"
+msgstr "Cancela la transferencia de archivo seleccionada"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Abrir carpeta contenedora"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Oculta la ventana"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pausa"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Continuar"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista de transferencias"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Abrir carpeta contenedora"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Colores de la pestaña para los estados de conversación</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Cuenta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Negrita"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contacto"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Componiendo"
+msgid "Gajim Themes Customization"
+msgstr "Personalización de temas de Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contacto"
+msgid "Text _color:"
+msgstr "_Color del texto:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Estilo:"
+msgid "_Background:"
+msgstr "_Fondo"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalización de temas de Gajim"
+msgid "Text _font:"
+msgstr "_Fuente del texto:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Me fui"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+msgid "Font style:"
+msgstr "Estilo:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inactivo"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Negrita"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Cursiva"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pausado"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Componiendo"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inactivo"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Colores de la pestaña para los estados de conversación</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Me fui"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1397,7 +1243,7 @@ msgstr ""
 "MUC\n"
 "Messages"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1405,105 +1251,98 @@ msgstr ""
 "Mensajes dirigidos\n"
 "a los salones"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pausado"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Color del texto:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Fuente del texto:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Fondo"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Cambiar _Alias"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Gestionar salón"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Cambiar el _tema"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Configurar el salón"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Marcador"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Desmantelar salón"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Gestionar salón"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimizar al cerrar"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Voz"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Marcador"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derador"
+msgid "_Send Private Message"
+msgstr "_Enviar mensaje privado"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Acciones de ocupante"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Enviar archivo"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Acciones de ocupante"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Añadir a la lista de contactos"
+msgid "_Voice"
+msgstr "_Voz"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derador"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Miembro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Banear"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Propietario"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Miembro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Propietario"
+msgid "_Ban"
+msgstr "_Banear"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Enviar mensaje privado"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voz"
+msgid "_Add to Roster"
+msgstr "_Añadir a la lista de contactos"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Mostrar una lista de formateos"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cambiar tu _alias (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Añadir este salón a marcadores (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1515,40 +1354,19 @@ msgid "From:"
 msgstr "De:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../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."
-msgstr ""
-"<b>ADVERTENCIA:</b>\n"
-"Si tienes previsto hacer eliminaciones masivas, asegúrate de que Gajim\n"
-"no se encuentre en ejecución. Generalmente evita eliminaciones relativas a "
-"contactos con los que te encuentres hablando en este momento."
+msgid "Gajim History Logs Manager"
+msgstr "Gestor de Histórico de Gajim"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Exportar"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gestor de Histórico de Gajim"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1562,172 +1380,199 @@ msgstr ""
 "Usa este programa para eliminar o exportar registros. Puedes seleccionar "
 "registros de la parte izquierda y/o buscar en la base de datos abajo."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>ADVERTENCIA:</b>\n"
+"Si tienes previsto hacer eliminaciones masivas, asegúrate de que Gajim\n"
+"no se encuentre en ejecución. Generalmente evita eliminaciones relativas a "
+"contactos con los que te encuentres hablando en este momento."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Buscar en la base de datos"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Historias viejas"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Histórico de conversaciones"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Exportar"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Nombre de contacto"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Grupos de charla"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Historias viejas"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Histórico de conversaciones"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Buscar"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Registrar cambios de estado de los contactos"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Caliente"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Caliente"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Entrar en este salón automáticamente al conectarme"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Salón:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Alias:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Recientemente:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recientemente:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Entrar en este salón automáticamente al conectarme"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Salón:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Añadir este salón a marcadores (Ctrl+B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Servidor:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Añadir este salón a marcadores (Ctrl+B)"
+msgid "Bro_wse Rooms"
+msgstr "_Navegar"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Entrar"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Auto conectar"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Si está marcado, Gajim entrará a este salón al inicio"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gestionar marcadores"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimizar al ingresar automáticamente"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Título:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Mostrar estado:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Auto conectar"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Si está marcado, Gajim entrará a este salón al inicio"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Título:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimizar al ingresar automáticamente"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1738,100 +1583,103 @@ msgid "_Configure"
 msgstr "_Configurar"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Propiedades</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"Conexión HTTP\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Configuración</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"Conexión HTTP\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Tipo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Contraseña: "
+msgid "_Name:"
+msgstr "_Nombre: "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "_Host del Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Propiedades</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "_Puerto del Proxy:"
+msgid "Use HTTP prox_y"
+msgstr "Usar prox_y HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "URL _BOSH:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Usar prox_y HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Usar aut_entificación del proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Nombre"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "URL _BOSH:"
+msgid "Pass_word:"
+msgstr "_Contraseña: "
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Nombre: "
+msgid "Proxy _Host:"
+msgstr "_Host del Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Tipo:"
+msgid "Proxy _Port:"
+msgstr "_Puerto del Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Nombre"
+msgid "<b>Settings</b>"
+msgstr "<b>Configuración</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Gestionar cuentas"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Contraseña"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torizar"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "En líne_a"
+msgid "Version:"
+msgstr "Versión de GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Configurar"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Descripción: "
+msgid "Authors:"
+msgstr "Au_torizar"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1839,39 +1687,32 @@ msgid "Homepage:"
 msgstr "<b>Página web:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Atascado"
+msgid "Description:"
+msgstr "Descripción: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Configurar"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Atascado"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1885,220 +1726,292 @@ msgid "Event desc"
 msgstr "Eventos"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor de configuración avanzada</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Programas</b>"
+msgid "Custom"
+msgstr "Personalizado"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Acciones</b>"
+msgid "All chat states"
+msgstr "Todos los estados"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Estado automático</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Componiendo"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Apariencia de la conversación</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Deshabilitado"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Color de las líneas de la conversación</b>"
+#, fuzzy
+msgid "Never"
+msgstr "_Nunca"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notificación del estado de la conversación</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nunca\n"
+"Sólamente cuando haya eventos pendientes\n"
+"Siempre"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Condiciones</b>"
+msgid "Always"
+msgstr "Ausente"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Emerger"
 
-#. 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>Personalizado</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificarme"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Fuente</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Sólo mostrar en la _lista de contactos"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opciones de GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Mensajes de estado predefinidos</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<i>Privacidad</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Último estado: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Mensajes de estado</b>"
+msgid "Preferences"
+msgstr "Preferencias"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Temas</b>"
+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:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Medio:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+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:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notificationes Visuales</b>"
+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:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Avanzado"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Avanzado..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Todos los estados"
+msgid "Sort contacts by status"
+msgstr "Ordenar contactos por estado"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Permitir envío de información sobre el sistema operativo"
+msgid "in _roster"
+msgstr "en _roster"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Permitir envío de información sobre el sistema operativo"
+msgid "in _group chats"
+msgstr "en _grupos de charla"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Permitir notificaciones emergentes cuando estoy _ausente, no disponible, "
-"ocupado o invisible."
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Roster Appearance</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Permitir sonido cuando estoy ocupado"
+msgid "_Window behavior:"
+msgstr "_Comportamiento de la ventana:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Ausente"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Preguntar mensaje de estado cuando esté: "
+msgid "_Emoticons:"
+msgstr "_Emoticonos:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Hacer compacta la ventana de mensajes"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Oculta los botones en las ventanas de conversación."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorar contenido enriquecido en mensajes entrantes"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Mensaje de conversación:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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: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"
+msgid "_Highlight misspelled words"
+msgstr "_Resaltar errores ortográficos"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Componiendo"
+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 ""
+"Si está marcado, Gajim resaltará errores de escritura en la entrada de las "
+"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:38
-msgid "Configure color and font of the interface"
-msgstr "Configurar colores y fuentes de la interfaz"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Mostrar la lista de contactos al inicio de Gajim"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Mensaje de conversación:"
+msgid "Show icon when your messages are received"
+msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Nombre de contacto"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Personalizado"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Apariencia de la conversación</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Cuando se recibe un nuevo evento:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Notif_icarme de los contactos que se conecten"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar cuand un contacto: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Deshabilitado"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Permitir notificaciones emergentes cuando estoy _ausente, no disponible, "
+"ocupado o invisible."
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Mostrar la _actividad de los contactos en el roster"
+msgid "Notify on new _GMail email"
+msgstr "Notificar de nuevos correos de _GMail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Mostrar detalles _extra en los correos electrónicos"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Si está marcado, Gajim mostrará una notificación cuando se reciba un nuevo "
+"correo vía GMail"
 
 #: ../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"
+msgid "Display _extra email details"
+msgstr "Mostrar detalles _extra en los correos electrónicos"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Mostrar _ajustes de los contactos en el roster"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+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:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Mostrar en el roster los a_vatares de los contactos"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opciones de GMail</b>"
 
 #: ../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"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Usar icono en el á_rea de notificación"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notificationes Visuales</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Reproducir _sonidos"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Gestio_nar..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Permitir sonido cuando estoy ocupado"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sonidos</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: ../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 "
@@ -2108,7 +2021,11 @@ 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:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Mostrar notificaciones de estado de la conversación:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2118,693 +2035,632 @@ 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: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 notificará con un mensaje emergente en la parte inferior derecha de la "
-"pantalla cuando un contacto se desconecte"
-
-#: ../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:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
-"estás usando"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-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: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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Si está marcado, Gajim cambiará el estado a no disponible cuando el "
-"ordenador ya no se use"
+msgid "_Send chat state notifications:"
+msgstr "Enviar notificaciones del estado de la conversación:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
-"grupos de conversación"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificación del estado de la conversación</b>"
 
 #: ../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 ""
-"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"
+msgid "Personal Events"
+msgstr "Eventos personales"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Ausente tras:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
-"roster"
+"Si está marcado, Gajim cambiará el estado a Ausente cuando el ordenador no "
+"esté en uso"
 
 #: ../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"
+msgid "_Not available after:"
+msgstr "_No disponible tras:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Si está marcado, Gajim mostrará los ajustes de los contactos en el roster"
+"Si está marcado, Gajim cambiará el estado a no disponible cuando el "
+"ordenador ya no se use"
 
 #: ../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 ""
-"Si está marcado, Gajim resaltará errores de escritura en la entrada de las "
-"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."
+msgid "minutes"
+msgstr "minutos"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Si está marcado, Gajim ignorará eventos entrantes de contactos no "
-"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: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 ""
-"Si está marcado, Gajim guardará los registros de mensajes cifrados. Ten en "
-"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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Si está marcado, Gajim mostrará una notificación cuando se reciba un nuevo "
-"correo vía GMail"
+"El mensje de estado de auto-ausencia. Si está vacío, Gajim no cambiará el "
+"mensaje de estado actual\n"
+"$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: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, "
-"etc...)"
-msgstr ""
-"Si está marcado, Gajim usará iconos específicos para el protocolo- (p. ej. "
-"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:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
-"mensaje por defecto especificado."
-
-#: ../data/gui/preferences_window.ui.h:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Si no está deshabilitado, Gajim reemplazará emoticonos ascii ':)' por su "
-"equivalente en iconos gráficos estáticos o animados"
+"El mensaje de estado de auto-no disponbile. Si está vacío, Gajim no cambiará "
+"el mensaje de estado actual\n"
+"$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:76
-msgid "Log _encrypted chat session"
-msgstr "R_egistrar conversación cifrada"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Estado automático</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Hacer compacta la ventana de mensajes"
+msgid "Ask status message when I:"
+msgstr "Preguntar mensaje de estado cuando esté: "
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Gestio_nar..."
+msgid "Sign _in"
+msgstr "Cone_ctar"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Nunca"
+msgid "Sign _out"
+msgstr "_Desconectar"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Notificaciones"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
+"mensaje por defecto especificado."
 
 #: ../data/gui/preferences_window.ui.h:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Notif_icarme de los contactos que se conecten"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Mensajes de estado</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Notificar cuand un contacto: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notificarme"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Estado"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notificar de nuevos correos de _GMail"
+msgid "Use system _default"
+msgstr "Usar pre_definido del sistema"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Nunca\n"
-"Sólamente cuando haya eventos pendientes\n"
-"Siempre"
+msgid "Chat message:"
+msgstr "Mensaje de conversación:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Eventos personales"
+msgid "<b>Font</b>"
+msgstr "<b>Fuente</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Reproducir _sonidos"
+msgid "Use _transports icons"
+msgstr "Usar iconos de _transporte"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Emerger"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Si está marcado, Gajim usará iconos específicos para el protocolo- (p. ej. "
+"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:89
-msgid "Preferences"
-msgstr "Preferencias"
+msgid "Status _iconset:"
+msgstr "Set de _iconos de estado:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Configurar colores y fuentes de la interfaz"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "Te_ma:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Servidor:"
+msgid "<b>Themes</b>"
+msgstr "<b>Temas</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Usar icono en el á_rea de notificación"
+msgid "Contact's nickname:"
+msgstr "Nombre de contacto"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Sólo mostrar en la _lista de contactos"
+msgid "Your nickname:"
+msgstr "Ant_es del alias:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Cone_ctar"
+msgid "_Status message:"
+msgstr "Men_saje de estado:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Desconectar"
+msgid "_URL highlight:"
+msgstr "Resaltado de _URL:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Restablecer colores por defecto"
 
 #: ../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 ""
-"Algunos mensajes pueden incluir contenido enriquecido (formato, colores "
-"etc). Si está marcado, Gajim mostrará el mensaje en bruto."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Mensaje de conversación:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Ordenar contactos por estado"
+#, fuzzy
+msgid "Your message:"
+msgstr "Mensaje de error: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Estado"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Resaltado de mensaje de grupo de charla"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Set de _iconos de estado:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Color de las líneas de la conversación</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Estilo"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "Te_ma:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Acciones</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"El mensje de estado de auto-ausencia. Si está vacío, Gajim no cambiará el "
-"mensaje de estado actual\n"
-"$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:107
-msgid ""
-"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"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"El mensaje de estado de auto-no disponbile. Si está vacío, Gajim no cambiará "
-"el mensaje de estado actual\n"
-"$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:110
-msgid "Use _transports icons"
-msgstr "Usar iconos de _transporte"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+msgid "<b>Video</b>"
+msgstr "<b>Medio:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Usar pre_definido del sistema"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Condiciones</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Mensaje de error: %s"
+msgid "_File manager:"
+msgstr "A_dministrador de archivos:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Ant_es del alias:"
+msgid "_Mail client:"
+msgstr "_Cliente de correo:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Ausente tras:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegador:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Mostrar notificaciones de estado de la conversación:"
+msgid "<b>Custom</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emoticonos:"
+msgid "<b>Applications</b>"
+msgstr "<b>Programas</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "A_dministrador de archivos:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Resaltar errores ortográficos"
+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 ""
+"Si está marcado, Gajim ignorará eventos entrantes de contactos no "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Permitir envío de información sobre el sistema operativo"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorar contenido enriquecido en mensajes entrantes"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
+"estás usando"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Registrar cambios de estado de los contactos"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Permitir envío de información sobre el sistema operativo"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Cliente de correo:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
+"estás usando"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_No disponible tras:"
+msgid "Log _encrypted chat session"
+msgstr "R_egistrar conversación cifrada"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Abrir..."
+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 ""
+"Si está marcado, Gajim guardará los registros de mensajes cifrados. Ten en "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "_Restablecer colores por defecto"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Permitir envío de información sobre el sistema operativo"
 
 #: ../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:134
-msgid "_Status message:"
-msgstr "Men_saje de estado:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "Resaltado de _URL:"
+msgid "<b>Privacy</b>"
+msgstr "<i>Privacidad</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Comportamiento de la ventana:"
+msgid "_Log status changes of contacts"
+msgstr "_Registrar cambios de estado de los contactos"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "en _grupos de charla"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "en _roster"
+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:139
-msgid "minutes"
-msgstr "minutos"
+msgid "_Open..."
+msgstr "_Abrir..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor de configuración avanzada</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listas de privacidad:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Añadir / Editar una regla</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Lista de privacidad"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista de reglas</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista de privacidad</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Activo para esta sesión"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Activo en cada inicio"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista de reglas</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Todos"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Añadir / Editar una regla</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "todos por suscripción"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "todos en el grupo"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Orden:"
+msgid "all by subscription"
+msgstr "todos por suscripción"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Lista de privacidad"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Todos"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "todos por suscripción"
+msgid "to send me messages"
+msgstr "para enviarme mensajes"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "todos en el grupo"
+msgid "to send me queries"
+msgstr "para enviarme consultas"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Ambos"
+msgid "to view my status"
+msgstr "para ver mi estado"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "De"
+msgid "to send me status"
+msgstr "para enviarme el estado"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "uno"
+msgid "All (including subscription)"
+msgstr "todos por suscripción"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dos"
+msgid "Order:"
+msgstr "Orden:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "para enviarme mensajes"
+#, fuzzy
+msgid "none"
+msgstr "uno"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "para enviarme consultas"
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "para enviarme el estado"
+#, fuzzy
+msgid "from"
+msgstr "De"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "para ver mi estado"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Dirección</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "dos"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Cumpleaños:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Ciudad:Personalizado</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Familia:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Compañía:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>País:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Medio:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Departamento:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>Correo-e:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefijo:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Segunda dirección:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Apodo:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Familia:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sufijo:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Nombre completo</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Calle:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Apodo:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Ciudad:Personalizado</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Página web:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Estado:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Segunda dirección:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Medio:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Código postal:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Nombre:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>País:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Alias:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Dirección</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Número de teléfono:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Página web:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Posición:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Nombre:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Código postal:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Alias:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Número de teléfono:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefijo:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Rol:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Cumpleaños:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Estado:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>Correo-e:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Calle:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Click para definir tu avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sufijo:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Información personal"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Compañía:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Acerca de"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Posición:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Click para definir tu avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Departamento:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Rol:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Información personal"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>¿Qué quieres hacer?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Acerca de"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Eliminar la _cuenta únicamente de Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>¿Qué quieres hacer?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Eliminar"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Intercambio de elementos del roster"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2812,115 +2668,112 @@ msgstr ""
 "<b>alguien@algunsitio.com</b> quiere <b>añadir</b> algunos contactos a tu "
 "roster."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Cuerpo del mensaje <actualmente sin uso, estará escondido por defecto>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Intercambio de elementos del roster"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Añadir contacto..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Cuerpo del mensaje <actualmente sin uso, estará escondido por defecto>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "Carac_terísticas"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Acciones"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Transferencias"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Añadir contacto..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Preguntas frecuentes (en línea)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Ayuda online"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Cuentas"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Perfil, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Ver"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Mostrar contactos desconectados"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Mostrar sólo contactos _activos"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Mostrar Trans_portes"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Mostrar contactos desconectados"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Cuentas"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Transferencias"
 
-#. 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 "_Acciones"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Ayuda"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Editar"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Ayuda online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "E_nviar mensaje..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Preguntas frecuentes (en línea)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Por favor, espera mientras se solicita el formulario de búsqueda..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Carac_terísticas"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Buscar"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Por favor, espera mientras se solicita el formulario de búsqueda..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Añadir un _Contacto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Información"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2940,41 +2793,37 @@ msgstr "Registrar en"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Responder a este mensaje:"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "A:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Enviar"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Enviar mensaje"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Enviar mensaje y cerrar ventana"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Responder"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "A:"
+msgid "Reply to this message"
+msgstr "Responder a este mensaje:"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Responder"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Enviar y Cerrar"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Enviar mensaje y cerrar ventana"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torizar"
+msgid "Subscription Request"
+msgstr "Petición de adición"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autorizar contacto para que pueda saber cuándo estás conectado"
+msgid "_Deny"
+msgstr "_Denegar"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2984,262 +2833,274 @@ msgstr ""
 "Denegar autorización al contacto para que no pueda saber cuándo estás "
 "conectado"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Petición de adición"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torizar"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Denegar"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizar contacto para que pueda saber cuándo estás conectado"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Sincronizar contactos"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Selecciona la cuenta con la que quieres sincronizar"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Selecciona los contactos que quieres sincronizar"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sincronizar: seleccionar contactos"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Silenciar sonidos"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Enviar mensaje"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Mostrar todos los _eventos pendientes"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Selecciona los contactos que quieres sincronizar"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Grupos de charla"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Pregunta:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Enviar mensaje"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Cliente:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Mostrar todos los _eventos pendientes"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Hora del contacto:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Silenciar sonidos"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Información"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>ID de Jabber:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Recurso:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Estado:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Suscripción:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Cliente:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Sistema:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Comentarios"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Hora del contacto:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Avatar configurado:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Contacto"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Suscripción:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Información"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Pregunta:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Más"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Avatar del usuario:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Contacto"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Fuente</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Comentarios"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfico de Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Entrada de XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Consulta"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Fuente</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IC"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Consulta"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presencia"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presencia"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Entrada de XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Modificar cuenta..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "JID local"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Personal"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un cliente de Jabber en GTK"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Personal"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Mensajero Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Un cliente de Jabber en GTK"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Cancelar información"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Salón no válido"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "El servicio envió información malformada"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "El servicio cambió el identificador de la sesión"
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Comandos Ad hoc - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "El servicio devolvió un error"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Activado"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Desactivado"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Entero"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Color"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Nombre de la opción"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Oculta"
 
@@ -3250,240 +3111,183 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Has recibido nuevas entradas (y %(count)d no mostradas):"
 msgstr[1] "Has recibido nuevas entradas (y %(count)d no mostradas):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Inglés"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Bieloruso"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretón"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Checo"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Alemán"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Griego"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Británico"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Español"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Euskera"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francés"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Croata"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiano"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Noruego (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandés"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Noruego"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polaco"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Portugués de Brasil"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruso"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Serbio"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Eslovaco"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Sueco"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Chino (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Lenguaje del corrector"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Error."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Fuente"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Limpiar formato"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "¿Enviar fichero?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "Cifrado GPG habilitado"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Este contacto no soporta transferencia de archivos"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Característica no disponible en Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Enviar archivo"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Este contacto no soporta transferencia de archivos"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Ninguna clave GPG asignada"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "No se ha asignado ninguna clave GPG a este contacto. Por tanto no podrás "
 "cifrar mensajes con GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "Cifrado GPG deshabilitado"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "La sesión SERÁ registrada"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "La NO SERÁ registrada"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "es"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NO es"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "no será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "y autentificado"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3492,32 +3296,32 @@ msgstr ""
 "%(type)s cifrado %(status)s activo %(authenticated)s.\n"
 "Tu sesión %(logged)s guardada."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "La negociación de la sesión ha sido cancelada"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "La NO SERÁ registrada"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Esta sesión está cifrada"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " y SERÁ registrada"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " y NO SERÁ registrada"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3525,25 +3329,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:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "Cifrado E2E desactivado"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "El siguiente mensaje NO fue cifrado"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3551,13 +3355,14 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3566,240 +3371,603 @@ 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"No se puede descifrar el mensaje de %s\n"
+"Es posible que haya sido manipulado."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s está ahora %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Transferencias"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Tamaño: "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Aceptar"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Transferencia de archivo finalizada"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Invitación a grupo de charla"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "El contacto remoto detuvo la transferencia"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Error abriendo el archivo:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Transferencia del archivo detenida"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Transferencia de archivo cancelada"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "La conexión con el cliente no se pudo establecer."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uso: /%s, oculta los botones de conversación."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uso: /%s, envía el mensaje al contacto"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s no encontrado"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Ausente"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "En líne_a"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uso: /%s, limpia de texto la ventana."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Alternar cifrado OpenPGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Uso: /%s, envía un ping al contacto"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Comando no soportado por la cuenta zeroconf."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Click para ver anteriores conversaciones con este contacto"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s no es un nivel de registro válido"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "El bus de la sesión no está disponible"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "El bus de la sesión no está disponible"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Cambiar tu _alias (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Alias no válido"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
+"especificado."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+msgid "Nickname not found"
+msgstr "Alias no encontrado"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
+"especificado."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Enviar %s a %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Has sido invitado a un grupo de charla"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Servidor no válido"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "cambió la afiliación"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uso: /%s , muestra los nombres de los ocupantes del grupo de charla."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "No se encuentra el argumento \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "creando base de datos de registros"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Cambiar información de estado"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Cambiar estado"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Definir la presencia y una descripción"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "En línea"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "No molestar."
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Descripción de la presencia:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Se ha cambiado el estado."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Abandonar grupos de charla"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s en %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "No has entrado al grupo de charla"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Elige los grupos de conversación que quieres abandonar"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Abandonaste los siguientes grupos de charla:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Reenviar mensajes sin leer"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Todos los mensajes sin leer han sido reenviados"
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Reenviar mensajes sin leer"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Reproducir sonido cuando el usuario esté ocupado"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus y el demonio notificador para mostrar notificaciones"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Mostrar en el roster sólamente los contactos en línea o libres para hablar"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tiempo en minutos, después de haber cambiado a ausente"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Ausente por estar inactivo más de $T minutos)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S será reemplazado por el mensaje de estado actual, $T por tiempo de auto-"
 "ausencia"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (No disponible por estar inactivo más de $T minutos)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S será reemplazado por el actual mensaje de estado, $T por tiempo de auto-"
 "ausencia extendida"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, 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'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Alias no válido"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "texto del mensaje de estado"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Mostrar evento en roster"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Mostrar evento en roster"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "¿Previsualizar nuevos mensajes en un mensaje emergente?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Petición de transferencia de archivo"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Transferencia de archivo cancelada"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr ""
+"Cuando una transferencia se completa, muestra una notificación emergente"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Invitación a grupo de charla"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Alias no válido"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Cambiando alias"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "texto del mensaje de estado"
 
 # duda sobre collapsed
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "por defecto"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Lenguaje usado por el corrector"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3809,7 +3977,7 @@ msgstr ""
 "'a veces' - muestra la hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca muestra la hora."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3819,18 +3987,18 @@ msgstr ""
 "a 4, o 0 para deshabilitar el reloj hablado. 1 es el reloj más preciso, 4 el "
 "menos. Sólo se usa si print_time está definido como 'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar los pares de * / _ como posibles caracteres de formateo."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
 "* *"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3841,7 +4009,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (If you want to use this, install "
 "docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3849,7 +4017,7 @@ msgstr ""
 "Carácter a añadir tras el alias cuando se usa completado de alias (tab) en "
 "los grupos de charla."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3857,7 +4025,13 @@ msgstr ""
 "Carácter a proponer para añadir tras el alias deseado cuando el alias "
 "deseado está siendo usado por alguien en el grupo de charla."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3868,51 +4042,61 @@ msgstr ""
 "de Python acerca de strftime y para más detalles: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Los caracteres que se imprimen antes del alias en las conversaciones"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Los caracteres que se imprimen después del alias en las conversaciones"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "¿Añadir * y [n] en el título del roster?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
 "una pestaña/ventana de conversación"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Cuántos minutos debe durar la última línea de la conversación anterior."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3920,11 +4104,11 @@ msgstr ""
 "Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
 "del cliente Mirabilis ICQ)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3933,12 +4117,12 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3950,13 +4134,13 @@ msgstr ""
 "puesto en False y sincronicen con el estado global) basados en el estado de "
 "la conexión de la red."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3964,7 +4148,7 @@ msgstr ""
 "Las notificaciones de estado mostradas en las ventanas de conversación. "
 "Pueden ser all, composing_only o disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3972,37 +4156,40 @@ msgstr ""
 "Cuando no se muestra la hora en cada mensaje (print_time==sometimes), la "
 "muestra cada x minutos."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Preguntar siempre antes de cerrar la ventana/pestaña de un grupo de charla "
 "en esta lista (separada por espacios) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nunca preguntar antes de cerrar la ventana/pestaña de un grupo de "
 "conversación en esta lista (separada por espacios) de ID de Jabber de grupos "
 "de charla."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Preguntar antes de cerrar una ventana de conversación con pestañas si hay un "
 "control que pueda perder datos (conversaciones, grupos de conversación que "
 "no están minimizados)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4011,28 +4198,34 @@ msgstr ""
 "locales, para las transferencias de archivos en caso redirección de puerto o "
 "interpretación de la dirección."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica eventos en el área de notificación."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "¿Mostrar borde solapado de archivador en las ventanas de conversación?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4044,18 +4237,18 @@ msgstr ""
 "válidos. Los números más altos son los más seguros pero demoran más tiempo "
 "en el cálculo cuando inicias una sesión."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "¿Previsualizar nuevos mensajes en un mensaje emergente?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en los grupos "
 "de charla."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4065,14 +4258,14 @@ msgstr ""
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
 "notificación. "
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Si es True, Gajim comprueba si es el cliente Jabber por defecto en cada "
 "inicio."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4080,7 +4273,7 @@ msgstr ""
 "Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
 "sin leer. Dependiendo del tema, este icono puede ser animado."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4088,12 +4281,12 @@ msgstr ""
 "Si es True, Gajim mostrará el mensaje de estado, si no está vacío, para cada "
 "contacto bajo su nombre de contacto en ela ventana del roster."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definir la posición del avatar en el roster. Puede ser izquierda o derecha"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4101,7 +4294,7 @@ msgstr ""
 "Si es True, Gajim pedirá un avatar a cada contacto que no tuvo un avatar la "
 "última vez o se tiene guardado uno demasiado antiguo."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4109,9 +4302,10 @@ msgstr ""
 "Si es False, Gajim nunca más mostrará la línea de estado cuando un contacto "
 "cambie su estado o su mensaje de estado"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4123,30 +4317,34 @@ msgstr ""
 "mensajes de estado. Si es \"in_and_out\", Gajim sólo mostrará las entradas y "
 "salidas en el grupo de conversación."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Color de fondo para los contactos que acaban de conectar."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Color de fondo para los contactos que acaban de desconectar."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Si es True, los mensajes restaurados usarán una fuente más pequeña que la "
 "predefinida."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "No mostrar avatar para el transporte en sí mismo"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "No mostrar roster en la barra de tareas."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4155,7 +4353,7 @@ msgstr ""
 "Si es True y las versiones instaladas de GTK+ y PyGTK son al menos 2.8, hace "
 "a la ventana resaltarse cuando se tienen eventos pendientes."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4166,7 +4364,8 @@ msgstr ""
 "detener el envío de información sha en el grupo de conversación."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4174,7 +4373,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Controla la ventana donde se depositan los nuevos mensajes.\n"
@@ -4186,31 +4385,39 @@ msgstr ""
 "'pertype' - Cada tipo de mensaje (p.ej. conversaciones vs. grupos de charla) "
 "se envian a una ventana específica."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Si es False, no verás más el avatar en la ventana de conversación."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Si es True, presionar la tecla escape cierra una ventana/pestaña."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Esconde los botones en las ventanas de conversación"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta el banner en una ventana de grupo de charla"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta el banner en una ventana de conversación de dos personas."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta los ocupantes en las ventans de grupo de charla."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4218,15 +4425,15 @@ msgstr ""
 "En una conversación, muestra el alias al principio de una línea sólo cuando "
 "no es la misma persona que envió el último mensaje."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentar cuando se use una combinación de alias consecutivos."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Desplazamiento suave del mensaje en las ventanas de conversación"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4234,13 +4441,13 @@ msgstr ""
 "Lista de colores, separados por \":\", que serán usados para colorear alias "
 "en los grupos de charla."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab conduce a la próxima pestaña de composición cuando ninguno está sin "
 "leer."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4248,7 +4455,7 @@ msgstr ""
 "¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
 "secuencia vacía significa que nunca se mostrará."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4257,7 +4464,7 @@ msgstr ""
 "¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
 "secuencia vacía significa que nunca se mostrará."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4266,7 +4473,7 @@ msgstr ""
 "¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
 "secuencia vacía significa que nunca se mostrará."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4276,7 +4483,7 @@ msgstr ""
 "ventana de modificación de cuenta. TEN CUIDADO, cuando estás conectado con "
 "una prioridad negativa, NO recibirás ningún mensaje de tu servidor."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4284,7 +4491,7 @@ msgstr ""
 "Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
 "las contraseñas de la cuenta."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4292,7 +4499,7 @@ msgstr ""
 "Si es True, Gajim usará KDE Wallet (si está disponible kwalletcli) para "
 "almacenar las contraseñas de la cuenta."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4300,7 +4507,7 @@ msgstr ""
 "Si es True, Gajim mostrará el número de contactos totales y en línea en los "
 "títulos de la cuenta y los grupos."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4308,7 +4515,7 @@ msgstr ""
 "Puede estar vacío, 'chat' o 'normal. Si no está vacío, tratará todos los "
 "mensajes entrantes como si fueran de este tipo"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4316,19 +4523,11 @@ msgstr ""
 "Si es True, Gajim mostrará y seleccionará el contacto que te envió el último "
 "mensaje, si la ventana de conversación no ha sido abierta aún."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Si es True, Gajim convertirá la cadena entre $$ y $$ a una imagen usando "
-"dvips y convert antes de insertarla en una ventana de conversación."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tiempo de inactividad necesario antes de cerrar la ventana de estado."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4336,7 +4535,7 @@ msgstr ""
 "Número máximo de líneas mostradas en las conversaciones. Las más antiguas "
 "serán limpiadas."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4345,19 +4544,11 @@ msgstr ""
 "Si es True, las ventanas de notificación del deminio notificador serán "
 "adjuntadas al área de notificación."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Elige intervalo entre 2 comprobaciones de inactividad."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Cambiar el valor para cambiar el tamaño de las fórmulas latex visualizadas. "
-"El mayor es el más grande."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4365,50 +4556,80 @@ msgstr ""
 "Combinaciones de uri válidas. Sólo las combinaciones de esta lista serán "
 "aceptadas como uri \"real\"."
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Preguntar mensaje de estado desconectado a todos los contactos desconectados "
 "cuando se establezca conexión con una cuenta. ADVERTENCIA: ¡Ésto puede "
 "causar el envío de muchas peticiones!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
+"mensaje por defecto especificado."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4416,7 +4637,7 @@ msgstr ""
 "La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
 "están definidas en las opciones de autoprioridad_*"
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4425,38 +4646,38 @@ msgstr ""
 "invisible. NOTA: esta opción se usa sólo si restore_last_status está "
 "desactivado"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Si está activado, restaurar el último estado que fue usado"
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Si es False, no verás más el avatar en la ventana de conversación."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Si está desactivado, no firmar presencias con la clave GPG, incluso si GPG "
 "está configurado."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Activar cifrado ESessions para esta cuenta."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "¿Gajim debería iniciar automáticamente una sesión cifrada cuando sea posible?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4464,51 +4685,66 @@ msgstr ""
 "Lista ordenada (separada por espacios) de tipos de conexión para probar. "
 "Puede contener tls, ssl o plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Muestra un aviso antes de usar la librería SSL estándar"
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espacios de errores ssl a ignorar."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Espacio en blanco enviado tras inactividad"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado tras inactividad"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Cuántos segundos esperar una respuesta de paquetes de mantenimiento de "
 "actividad antes de  intentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4516,15 +4752,34 @@ msgstr ""
 "Si está marcado, Gajim usará tu IP y proxies definidos en la opción "
 "file_transfer_proxies para tu transferencia."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Contestar peticiones recibidas"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Enviar peticiones recibidas"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
+"estás usando"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s quiere enviarte un archivo."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4532,20 +4787,52 @@ msgstr ""
 "Cuando se negocie una sesión cifrada, ¿Gajim debería asumir que quieres que "
 "tus mensajes sean registrados?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Autentificación anónima"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Autentificación a_nónima"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "¿Está OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4553,108 +4840,106 @@ msgstr ""
 "¿Debería Gajim iniciar automáticamente una sesión cifrada con este contacto "
 "cuando sea posible?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "estado separado por espacios o all"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' o 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4663,27 +4948,186 @@ msgstr ""
 "palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
 "contiene tu alias."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "A"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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 ""
+"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"
+
+#: ../src/common/connection_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "petición de eliminación de suscripción de %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Error de escritura en disco"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "El salón ha sido destruido"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Puedes unirte a este salón en su lugar: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "ID de Jabber no válida"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+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."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "error mientras se enviaba %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Error SSL desconocido: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nuevo mensaje"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nuevo mensaje de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nuevo mensaje privado"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nuevo mensaje privado desde el grupo de charla %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Enviado por %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nuevo mensaje"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nuevo mensaje de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s cambió su estado"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está ahora %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Contacto cambió su estado"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s se ha conectado"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contacto conectado"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s se ha desconectado"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contacto desconectado"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "No se puede cargar el módulo idle"
@@ -4693,20 +5137,20 @@ msgstr "No se puede cargar el módulo idle"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registro realizado con éxito"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registro con el agente %s realizado con éxito"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Falló el registro"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4714,193 +5158,168 @@ msgstr ""
 "El registro con el agente %(agent)s falló con el error %(error)s: "
 "%(error_msg)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 "Error de escritura en disco"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Invisibilidad no soportada"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "La cuenta %s no soporta invisibilidad."
 
-#: ../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: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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "No se puede obtener el certificado del emisor"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "No se puede obtener el certificado CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "No se puede descifrar la firma del certificado"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "No se puede descifrar la firma del CRL"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "No se puede decodificar la clave pública del emisor"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Fallo en la firma del certificado"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Fallo en la firma CRL"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "El certificado todavía no es válido"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "El certificado ha expirado"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "El CRL todavía no es válido"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "El CRL ha expirado"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Error de formato en el campo notBefore del certificado"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Error de formato en el campo notAfter del certificado"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Error de formato en el campo lastUpdate del CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Error de formato en el campo nextUpdate del CRL"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Memoria llena"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Certificado autofirmado"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado autofirmado en la cadena del certificado"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "No se puede obtener el certificado del emisor local"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "No se puede verificar el primer certificado"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "La cadena del certificado es demasiado larga"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Certificado CA no válido"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "La longitud de la ruta excedió el límite"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Propósito de certificado no soportado"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "El certificado no es de confianza"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certificado rechazado"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "El emisor del asunto no coincide"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "La autoridad y el asunto de la clave identificadora no coinciden"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "La autoridad y el número de serie del emisor no coinciden"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "El uso de la clave no incluye la firma de certificados"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Este mensaje está *cifrado* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4909,80 +5328,81 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, 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:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "El servidor %s provee un formulario de registro diferente"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Error SSL desconocido: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Respuesta no válida"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "No se puede conectar a \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "El servidor respondió: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "No se puede conectar a la cuenta %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, 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:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4991,7 +5411,7 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -5000,25 +5420,34 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "La autenticidad del certificado %s podría no ser válida."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 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:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Error eliminando la lista de privacidad"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5027,69 +5456,69 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Contacto enviado: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Contactos enviados:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Falló el registro"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "El registro con el agente %(agent)s falló con el error %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "No está en el roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
@@ -5104,7 +5533,7 @@ msgstr ""
 "Servicio no disponible: Gajim no está ejecutándose, o remote_control está en "
 "False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
 
@@ -5285,267 +5714,294 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "No disponible"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Miembro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensaje pendiente"
 msgstr[1] "%d mensajes pendientes"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " del salón %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " del usuario %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Expiró el tiempo para cargar la imagen"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "La imagen es demasiado grande"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "El CRL todavía no es válido"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Expiró el tiempo para cargar la imagen"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración del salón"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5557,111 +6013,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Error ejecutando \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s no es un nivel de registro válido"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Mensajes por defecto"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Tamaño: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Archivo: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "verde"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "error: no se puede abrir %s para lectura"
+msgid "Error: cannot open %s for reading"
+msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
@@ -6298,19 +6768,115 @@ msgstr "Estudiando"
 msgid "Writing"
 msgstr "Escribiendo"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "por defecto"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marino"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Escondiéndome"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "País:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Cuenta"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Descripción"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Error."
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "uno"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "salón"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Artista desconocido"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Título desconocido"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Recurso desconocido"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6319,33 +6885,19 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "No se puede enlazar al puerto %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Podría haber otra instancia de Gajim en ejecución. La transferencia será "
-"cancelada."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 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:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Error de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6354,44 +6906,43 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 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:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "No se pudo iniciar servicio local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Tu mensaje no pudo ser enviado."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6403,24 +6954,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error añadiendo el servicio. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Mensajes por defecto"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6429,73 +6980,73 @@ msgstr ""
 "Tienes que instalar el diccionario %s para usar el corrector, o elegir otro "
 "lenguaje definiendo la opción speller_language."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "¿Reconectar ahora?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si quieres que se apliquen todos los cambios instantáneamente, debes "
 "reconectar."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP no es usable en este ordenador"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Eventos sin leer"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Has abierto una conversación con la cuenta %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar el nombre de la cuenta, debes leer el resto de\n"
 " eventos pendientes"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta ya está en uso"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6503,147 +7054,148 @@ msgstr ""
 "Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
 "nombre."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Renombrar cuenta"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduce un nuevo nombre para la cuenta %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Selección de clave OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Tu servidor no soporta vCard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Lista de expulsión"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Lista de miembros"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Lista de propietarios"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Alias"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Puesto"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Expulsando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6651,11 +7203,11 @@ msgstr ""
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6663,11 +7215,11 @@ msgstr ""
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6675,11 +7227,11 @@ msgstr ""
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6687,7 +7239,7 @@ msgstr ""
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6704,111 +7256,108 @@ msgstr ""
 "usuario@dominio, dominio/ recurso, o una dirección conteniendo un "
 "subdominio)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticonos desactivados"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 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:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "¿Qué quieres hacer?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Eliminar la _cuenta únicamente de Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "Ninguno"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
 "este marcador."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Alias no válido"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Carácter no permitido"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Servidor no válido"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Salón no válido"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6819,32 +7368,32 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifica un servidor donde te quieras registrar."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6859,7 +7408,7 @@ msgstr ""
 "Error SSL: %(error)s\n"
 "¿Aún quieres conectar a este servidor?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6870,72 +7419,89 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "El nodo PEP no fue eliminado"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Configurar"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Primer mensaje recibido"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Primer mensaje recibido"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Primer mensaje recibido focalizado"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Primer mensaje recibido desfocalizado"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Mensaje enviado"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Resaltado de mensaje de grupo de charla"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Correo de GMail recibido"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6945,7 +7511,7 @@ msgstr ""
 "recibido por el extremo remoto. Si este icono permanece\n"
 "mucho tiempo, probablemente el mensaje se haya perdido."
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6953,238 +7519,239 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Cita"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, 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:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Ayer"
 msgstr[1] "Ayer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "No se puede cargar el módulo idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibilidad no soportada"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "La ID de Jabber ya está en la lista"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "nuevo@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nuevo%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Definir estado de ánimo"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "¿Sobreescribir mensaje de estado?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Guardar como mensaje de estado predefinido"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Escribe un nombre para este mensaje de estado"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Dirección AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Número GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Número ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Dirección MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Dirección Yahoo!:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Desarrolladores actuales:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Desarrolladores anteriores:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "AGRADECIMIENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7197,104 +7764,158 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Conexión no segura"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+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/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Sí, quiero conectarme de forma no segura"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_No preguntarme otra vez"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un grupo de charla con la cuenta %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Uri incorrecta"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Esto no es un grupo de charla"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Alias no válido"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, 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:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, 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:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7303,168 +7924,138 @@ msgstr ""
 "enviar un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede analizar \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contacto conectado"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Contacto desconectado"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nuevo mensaje"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Nuevo mensaje"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nuevo mensaje privado"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../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:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Contacto cambió su estado"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Triste"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7472,188 +8063,184 @@ 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:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Dirección"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupos"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugirió añadirte en mi roster."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Añadir un _Contacto"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Añadir un _Contacto"
+msgstr[1] "Añadir un _Contacto"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Elimina contacto del roster"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Elimina contacto del roster"
+msgstr[1] "Elimina contacto del roster"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Nombre de servidor no válido"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "El servicio devolvió un error"
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %(order)s, acción: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact te ha invitado a entrar en una discusión"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "¿Quieres aceptar la invitación?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condición"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "cuando esté "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7664,19 +8251,19 @@ msgstr ""
 "\n"
 "La cadena corta de autentificación de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Ya verificaste la identidad de este contacto."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Identidad del contacto verificada"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Verificar de nuevo..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7686,19 +8273,19 @@ msgstr ""
 "persona esperada, necesitas verificar su identidad haciendo click en el "
 "botón inferior."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "La identidad del contacto NO fue verificada"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "¿Has verificado la identidad del contacto?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7713,84 +8300,125 @@ msgstr ""
 "\n"
 "La Cadena Corta de Autentificación (CCA) de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 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:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "La clave GPG se asignó a este contacto, pero <b>no confías en esta clave</b> "
 "de modo que <b>no</b> será cifrado. Usa tu cliente GPG para otorgar "
 "confianza a esta clave."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 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:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "para la cuenta %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Certificado autofirmado"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7798,232 +8426,247 @@ 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:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar por %(address)s usando la cuenta %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Ejecutar comando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Descripción"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, 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:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nuevo post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Validación del certificado SSL"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Una librería usada para validar certificados de servidor para asegurar "
 "conexiones seguras."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Requiere python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Charla sin servidor con clientes autodetectados en una red local."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Requiere python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Requiere pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Línea de comandos"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Un script para controlar Gajim vía línea de comandos."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Requiere python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Característica no disponible en Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Cifrado del mensaje OpenPGP"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Cifrar conversaciones con claves gpg"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Requiere gpg y python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Autodetección del estado de la red."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requiere gnome-network-manager y python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Gestión de sesiones"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "La sesión de Gajim se guarda al desconectar y se restaura al conectar."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Requiere python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Cifrado de la contraseña"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Las contraseñas se pueden guardar de forma segura y no sólo en texto plano."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Requiere gnome-keyring y python-gnome2-desktop, o kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Posibilidad de conectar a servidores que usen registros SRV"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Requiere dnsutils"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Requiere nslookup para usar los registros SRV."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Corrector ortográfico"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Corrección ortográfica de los mensjes compuestos."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Requiere libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Requiere libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Notificaciones"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Mensajes emergentes pasivas para nuevos eventos."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -8031,66 +8674,40 @@ msgstr ""
 "Requiere python-notify o python-dbus en conjunción con notification-daemon "
 "en su lugar-"
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Estado automático"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Posibilidad de medir el tiempo de inactividad para definir el auto-estado."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Requiere la librería libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Requiere python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Transformar expresiones LaTeX entre $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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 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."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Cifrado de mensajes End to End"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Cifrando conversaciones."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Requiere python-crypto"
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "Generador RST"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8098,140 +8715,137 @@ msgstr ""
 "Generar salida XHTML partiendo de un código RST (mira http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Requiere python-docutils"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Requiere python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Requiere python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Requiere python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "En línea"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Característica"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Tú"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado en: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Transferencia de archivo finalizada"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Transferencia de archivo cancelada"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "La conexión con el cliente no se pudo establecer."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipiente: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Transferencia del archivo detenida"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Elige archivo a enviar..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Descripción: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Este archivo está siendo usado por otro proceso."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Archivo: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Descripción: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s quiere enviarte un archivo:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8239,33 +8853,64 @@ msgstr ""
 "Un archivo con este nombre ya existe y no tienes permisos para "
 "sobreescribirlo"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, 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:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "No tienes permisos para crear archivos en este directorio."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Guardar archivo como..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Archivo: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Descripción: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s quiere enviarte un archivo:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Enviando perfil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Error en la transferencia del archivo"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8273,69 +8918,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Archivo no válido"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Archivo: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "mensaje"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Emoticonos:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Sólo mostrar en la _lista de contactos"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor avanzado de configurción"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Configuración del salón"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita el servidor X para para funcionar. Abortando..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "falló el importado de PyGTK: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim necesita PyGTK 2.12 o superior"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim necesita PyGTK 2.12 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim necesita GTK 2.12 o superior"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim necesita GTK 2.12 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necesita pywin32 para funcionar"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8344,12 +9026,11 @@ msgstr ""
 "Por favor, asegúrate de que Pywin32 está instalado en tu sistema. Puedes "
 "obtenerlo en %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim ya se encuentra en ejecución"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8357,28 +9038,28 @@ msgstr ""
 "Otra instancia de Gajim parece estar ya en ejecución\n"
 "¿Ejecutar otra?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Muestra ayuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8386,53 +9067,57 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "cuenta"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "estado"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensaje"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8441,20 +9126,48 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia el estado de una o varias cuentas"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Pr_ioridad:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quiero _registrar una nueva cuenta de Jabber"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "contenido del mensaje. Se debe especificar la cuenta o \"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8464,34 +9177,29 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8501,137 +9209,134 @@ msgstr ""
 "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:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Añade contacto al roster"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 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
+#: ../src/gajim-remote.py:254
 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
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversación usando esta cuenta"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8639,44 +9344,93 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Cambiar estado"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Alias a usar"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for 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:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI a manejar"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "La cuenta que quieres manejar"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Contenido del mensaje"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 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"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "salón"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "JID del salón"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "alias"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Alias a usar"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "contraseña"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Contraseña para entrar al salón"
+
+#: ../src/gajim-remote.py:292
+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:297
 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
+#: ../src/gajim-remote.py:301
 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8685,165 +9439,44 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Modo de uso: %s %s %s \n"
-"\t %s"
+"Uso: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Uri incorrecta"
-
-#: ../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 de: desconectado, en línea, libre para hablar, ausente, no disponible, "
-"ocupado, invisible"
-
-#: ../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: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 ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Devuelve el mensaje de estado actual (el global si no se especifica una "
-"cuenta)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Cambiar estado"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Alias a usar"
-
-#: ../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 ""
-"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:279
-msgid "URI to handle"
-msgstr "URI a manejar"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "La cuenta que quieres manejar"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Contenido del mensaje"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "JID del salón"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Alias a usar"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Contraseña para entrar al salón"
-
-#: ../src/gajim-remote.py:291
-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:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Uso: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8852,7 +9485,7 @@ msgstr ""
 "Demasiados argumentos. \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8861,10 +9494,14 @@ msgstr ""
 "No se especificó el argumento \"%(arg)s\". \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Uri incorrecta"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8887,181 +9524,218 @@ msgid "You cannot delete your current theme"
 msgstr "No puedes eliminar el tema actual"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s ha cambiado el asunto a %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Cualquier ocupante puede ver tu JID completo"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "El salón ahora muestra miembros no disponibles"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "el salón ahora no muestra miembros no disponibles"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Ha sido activado el registro del salón"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "El salón está ahora deshabilitado"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "El salón es ahora no-anónimo"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "El salón es ahora semi-anónimo"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "El salón es ahora completamente anónimo"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s ha sido eliminado del salón (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Registro del salón activado"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "cambió la afiliación"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "apagado del sistema"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+"La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruyendo %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9069,22 +9743,22 @@ msgstr ""
 "Vas a destruir definitivamente este salón.\n"
 "Puedes especificar una razón abajo:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "También puedes introducir un lugar alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -9109,67 +9783,61 @@ msgstr "_Informar de fallo"
 msgid "Details"
 msgstr "Detalles"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim no es el cliente por defecto de Jabber"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 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:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Extensión no soportada"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "No se pudo entrar al grupo de charla"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9180,92 +9848,86 @@ msgstr ""
 "ocupante.\n"
 "Especifica otro alias abajo:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Usar este alias siempre que exista un conflicto"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "¿Aceptas esta petición en la cuenta %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Estás baneado del grupo de charla %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "El grupo de charla %s no existe."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Tu alias registrado podría estar en uso en el grupo de charla %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Petición de adición"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9273,109 +9935,105 @@ msgstr ""
 "Siempre le verás desconectado.\n"
 "¿Le quieres eliminar de tu lista de contactos?"
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Eliminado"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "El salón ahora muestra miembros no disponibles"
-
-#: ../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: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:934
-msgid "Room logging is now enabled"
-msgstr "Ha sido activado el registro del salón"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "El salón está ahora deshabilitado"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "El salón es ahora no-anónimo"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "El salón es ahora semi-anónimo"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "El salón es ahora completamente anónimo"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "El certificado ha expirado"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr ""
+"Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG no confiable"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "No se confía en la clave GPG usada para cifrar esta conversación. ¿Realmente "
 "quieres cifrar este mensaje?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Gnome Keyring está instalado pero no fue iniciado \t\t\t\tcorrectamente "
 "(probablemente la variable del entorno no esté \t\t\t\tcorrectamente "
 "definida)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Correo nuevo en %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9390,80 +10048,65 @@ msgstr ""
 "Asunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../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:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Error abriendo el archivo:"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Transferencias"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"No se puede descifrar el mensaje de %s\n"
-"Es posible que haya sido manipulado."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "No se puede descifrar el mensaje"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Error."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Conflicto en el recurso"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9472,21 +10115,21 @@ msgstr ""
 "nuevo"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Error verificando el certificado SSL"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9497,15 +10140,20 @@ msgstr ""
 "%(error)s\n"
 "¿Aún quieres conectarte a este servidor?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este error para este certificado"
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Error del certificado SSL"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Error del certificado SSL"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9522,27 +10170,7 @@ msgstr ""
 "\n"
 "¿Aún quieres conectar y actualizar la huella del certificado?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"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: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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9550,7 +10178,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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9560,11 +10188,11 @@ msgstr ""
 "querer hacer esto?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Emoticonos desactivados"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9572,7 +10200,7 @@ msgstr ""
 "No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
 "sido desactivados."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9582,84 +10210,87 @@ msgstr ""
 "actualizar el formato del archivo emoticons.py. Mira http://trac.gajim.org/"
 "wiki/Emoticons para más detalles."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "La clave GPG expiró"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Contraseña equivocada"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Nuevo grupo de charla"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "creando directorio %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Contactos"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Fecha"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Alias"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Mensaje"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9667,7 +10298,7 @@ msgstr ""
 "¿Quieres limpiar la base de datos? (TOTALMENTE DESACONSEJADO SI GAJIM ESTÁ "
 "EN EJECUCIÓN)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9681,95 +10312,109 @@ msgstr ""
 "\n"
 "En caso de elegir SI, por favor, espera..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Error en la base de datos"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exportando historial..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dijo: %(message)s\n"
 
-#: ../src/history_manager.py: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] "¿Realmente quieres eliminar el historial del contacto seleccionado?"
-msgstr[1] ""
-"¿Realmente quieres eliminar el historial de los contactos seleccionados?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "¿Realmente quieres eliminar el mensaje seleccionado?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "¿Realmente quieres eliminar el historial del contacto seleccionado?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Esta es una operación irreversible"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Cancelar información"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "¿Realmente quieres eliminar el mensaje seleccionado?"
 msgstr[1] "¿Realmente quieres eliminar los mensajes seleccionados?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversaciones con %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Error de disco"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está ahora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 #, fuzzy
 msgid "Error"
 msgstr "Error."
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Expiró el tiempo para cargar la imagen"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programando"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "La imagen es demasiado grande"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Estás a punto de cerrar varias pestañas"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "¿Realmente quieres cerrarlas todas?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Mensajes"
 
@@ -9781,100 +10426,112 @@ msgstr "- los mensajes serán registrados"
 msgid "- messages will not be logged"
 msgstr "- los mensajes no serán registrados"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s cambió su estado"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s se ha conectado"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s se ha desconectado"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Expulsando a %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nuevo mensaje de %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Falló el registro"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nuevo mensaje privado desde el grupo de charla %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "El servicio envió información malformada"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Enviado por %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Este archivo ya existe"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nuevo mensaje de %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorar"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuración del salón"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "El archivo está vacío"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "El archivo está vacío"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Información"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Información NO publicada"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9882,51 +10539,52 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG no es usable"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Te conectarás a %s sin OpenPGP"
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 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:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9934,38 +10592,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "desincronizado"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "¿Cerrar realmente Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "¿Estás seguro de que quieres cerrar Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Siempre cerrar Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancela la transferencia"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9973,27 +10631,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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 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:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10001,68 +10659,68 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos de estos transportes: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10071,11 +10729,11 @@ msgstr ""
 "resultante y el/ella siempre te verán desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10083,16 +10741,16 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10102,45 +10760,46 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 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:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10150,23 +10809,28 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s a %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Hacer %s y %s metacontactos"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Hacer %s y %s metacontactos"
@@ -10176,131 +10840,131 @@ msgstr "Hacer %s y %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Gestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "de la cuenta %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Configurar servicios..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Enviar mensaje"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Histórico"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
@@ -10317,24 +10981,14 @@ msgstr "Error en la información recibida del formulario"
 msgid "No result"
 msgstr "Sin resultados"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Error de escritura en disco"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Confirma estas opciones de la sesión"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10346,7 +11000,7 @@ msgstr ""
 "\n"
 "\t¿Son aceptables estas opciones?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10361,147 +11015,152 @@ msgstr ""
 "\n"
 "¿Continuar con la sesión?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "¿Está OpenPGP activado para este contacto?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "en _roster"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de este grupo de conversación"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Estado de ánimo:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Actividad:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Música:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Notificaciones"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servicio no ha respondido todavía con información detallada"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10509,32 +11168,32 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "Desconocida"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliación:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10542,7 +11201,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:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10550,14 +11209,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:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10565,19 +11224,403 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "No hay ninguna suscripción pendiente."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Elige archivo a enviar..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " una ventana/pestaña abierta con ese contacto "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Acciones</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Condiciones</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Acciones A_vanzadas"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Control de Notificaciones Avanzadas"
+
+#~ msgid "All statuses"
+#~ msgstr "Todos los estados"
+
+#~ msgid "Busy "
+#~ msgstr "Ocupado "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Contacto cambió su estado"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contacto desconectado"
+
+#~ msgid "Don't have "
+#~ msgstr "No tiene "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Transferencia del archivo detenida"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Resaltado de mensaje de grupo de charla"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Mensaje de grupo de charla recibido"
+
+#~ msgid "Have "
+#~ msgstr "Tiene "
+
+#~ msgid "Launch a command"
+#~ msgstr "Lanzar un comando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Uno o más estados especiales..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "En línea / Libre para hablar"
+
+#~ msgid "Play a sound"
+#~ msgstr "Reproducir un _sonido"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nuevo mensaje privado"
+
+#~ msgid "When "
+#~ msgstr "Cuando"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activar el índice de urgencia del gestor de ventanas en la barra de "
+#~ "tareas para resaltar la ventana de conversación"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Deshabilitar apertura automática de ventanas de conversación"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Deshabilitar ventanas emergentes existentes"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Deshabilitar sonidos existentes para este evento"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Deshabilitar mostar eventos en el roster"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Deshabilitar mostar eventos en el roster"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informarme con una ventana emergente"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Abrir ventana de conversación con este usuario"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Mostrar evento en roster"
+
+#~ msgid "and I "
+#~ msgstr "y yo "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contactos"
+
+#~ msgid "for "
+#~ msgstr "para "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupos"
+
+#~ msgid "when I'm in"
+#~ msgstr "cuando esté en"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Muestra el perfil del contacto (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Permitirle ver mi estado"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Descripción: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Avanzado..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Mostrar la _actividad de los contactos en el roster"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Mostrar _ajustes de los contactos en el roster"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
+#~ "roster"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "E_nviar mensaje..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Avatar del usuario:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Mensajero Gajim"
+
+#~ msgid "English"
+#~ msgstr "Inglés"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bieloruso"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
+
+#~ msgid "Breton"
+#~ msgstr "Bretón"
+
+#~ msgid "Czech"
+#~ msgstr "Checo"
+
+#~ msgid "German"
+#~ msgstr "Alemán"
+
+#~ msgid "Greek"
+#~ msgstr "Griego"
+
+#~ msgid "British"
+#~ msgstr "Británico"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Español"
+
+#~ msgid "Basque"
+#~ msgstr "Euskera"
+
+#~ msgid "French"
+#~ msgstr "Francés"
+
+#~ msgid "Croatian"
+#~ msgstr "Croata"
+
+#~ msgid "Italian"
+#~ msgstr "Italiano"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Noruego (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
+
+#~ msgid "Norwegian"
+#~ msgstr "Noruego"
+
+#~ msgid "Polish"
+#~ msgstr "Polaco"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Portugués de Brasil"
+
+#~ msgid "Russian"
+#~ msgstr "Ruso"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbio"
+
+#~ msgid "Slovak"
+#~ msgstr "Eslovaco"
+
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chino (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Lenguaje del corrector"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Si es True, Gajim convertirá la cadena entre $$ y $$ a una imagen usando "
+#~ "dvips y convert antes de insertarla en una ventana de conversación."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Cambiar el valor para cambiar el tamaño de las fórmulas latex "
+#~ "visualizadas. El mayor es el más grande."
+
+#~ msgid "all or space separated status"
+#~ msgstr "estado separado por espacios o all"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no' o 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' o ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Comprueba tu conexión o inténtalo más tarde"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Error ejecutando \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "error: no se puede abrir %s para lectura"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "No se puede enlazar al puerto %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Podría haber otra instancia de Gajim en ejecución. La transferencia será "
+#~ "cancelada."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Un cliente de Jabber en GTK"
+
+#~ msgid "Condition"
+#~ msgstr "Condición"
+
+#~ msgid "when I am "
+#~ msgstr "cuando esté "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Requiere pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Requiere gpg y python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transformar expresiones LaTeX entre $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Requiere textlive-latex-base y dvipng (Todo está en MikTeX). Tienes que "
+#~ "definir 'use_latex' a True en el Editor de Configuración Avanzada."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Requiere python-avahi."
+
+#, fuzzy
+#~ 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"
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Modo de uso: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Contactos"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Error de escritura en disco"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Tema: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Estado de ánimo:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Actividad:"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Deshabilitar mostrar eventos en el systray"
 
@@ -10602,32 +11645,12 @@ msgstr " recurso con prioridad "
 #~ msgid "Nickname not allowed: %s"
 #~ msgstr "Alias no permitido: %s"
 
-#~ msgid "Room has been destroyed"
-#~ msgstr "El salón ha sido destruido"
-
-#~ 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"
 
@@ -10721,9 +11744,6 @@ msgstr " recurso con prioridad "
 #~ "Históricos de charlas de grupo\n"
 #~ "Todos los históricos de charlas"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Gestionar cuentas"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10892,18 +11912,9 @@ msgstr " recurso con prioridad "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Asignar clave OpenPGP"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Comando no soportado por la cuenta zeroconf."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Comandos: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uso: /%s, limpia de texto la ventana."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uso: /%s, oculta los botones de conversación."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10911,12 +11922,6 @@ msgstr " recurso con prioridad "
 #~ "Uso: /%(command)s <action>, envía action al actual grupo de charla. Usa "
 #~ "una tercera persona (p.ej. /%(command)s explota.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Uso: /%s, envía un ping al contacto"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uso: /%s, envía el mensaje al contacto"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "No hay información de ayuda para /%s"
 
@@ -10932,9 +11937,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
-#~ msgid "Nickname not found"
-#~ msgstr "Alias no encontrado"
-
 #~ 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 \"@\". "
@@ -10946,13 +11948,6 @@ msgstr " recurso con prioridad "
 #~ "expulsado."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
-#~ "especificado."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10990,10 +11985,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr ""
-#~ "Uso: /%s , muestra los nombres de los ocupantes del grupo de charla."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
@@ -11154,9 +12145,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquio"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Click para ver anteriores conversaciones con este contacto"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "Vista _compacta    Alt+C"
 
@@ -11169,9 +12157,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Query Builder..."
 #~ msgstr "Constructor de consultas..."
 
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Invitación recibida"
 
@@ -11307,9 +12292,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Company:"
 #~ msgstr "Compañía:"
 
-#~ msgid "Country:"
-#~ msgstr "País:"
-
 #~ msgid "Given:"
 #~ msgstr "Nombre de pila:"
 
@@ -11591,9 +12573,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizar contactos automáticamente"
 
-#~ msgid "Send File"
-#~ msgstr "Enviar archivo"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "E_ntrar a un nuevo salón..."
 
@@ -11640,12 +12619,6 @@ msgstr " recurso con prioridad "
 #~ msgstr ""
 #~ "Todos los contactos de este grupo están desconectados o tienen errores"
 
-#~ msgid "Size: "
-#~ msgstr "Tamaño: "
-
-#~ msgid "Session bus is not available"
-#~ msgstr "El bus de la sesión no está disponible"
-
 #~ msgid "Sound"
 #~ msgstr "Sonido"
 
@@ -11901,9 +12874,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Po_sition:"
 #~ msgstr "Posición:"
 
-#~ msgid "Show roster window on Gajim startup"
-#~ msgstr "Mostrar la lista de contactos al inicio de Gajim"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "Gestión de _servicios"
 
diff --git a/po/eu.po b/po/eu.po
index 3937c8824..e13b258ef 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,15 +4,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -23,320 +19,311 @@ msgstr ""
 "X-Rosetta-Version: 0.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Egoera"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Informazio Pertsonala "
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "Elkarrizketa  _Hasi"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Txat Taldean _Sartu"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Kontaktua Gehitu..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Komandoa Exekutatu..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Kontua E_raldatu"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Ireki Gmail posta"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Informazio Pertsonala "
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "Elkarrizketa  _Hasi"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Egoera"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Kontua E_raldatu"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Kontu Sortzailearen Wizard-a"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Kontua sortua izan da</b>\n"
-"\n"
-"Mesedez itxoin..."
+"Kontu bat behar duzu\n"
+"Jabber sarera konektatzeko"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+msgid "I want to _register for a new account"
+msgstr "Kontu berri bat _erregistratu nahi dut"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Mesedez aukeratu hemen beheko aukeretako bat:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Mesedez bete zure kontu berrirako informazioa</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Pasahitza:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Gorde pasa_hitza"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Erabili autentifikazioa"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Konektatu bukatu sakatzen dudanean."
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Kontu Sortzailearen Wizard-a"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Erabili autentifikazioa"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Zerbitzaria"
 
 #: ../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"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Moldatu..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Erabili bezeroaren hostname/portua"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Proxy:"
+msgid "_Hostname:"
+msgstr "Hostname: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Gorde pasa_hitza"
+msgid "_Port:"
+msgstr "_Portua:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Ezarri nire profila konektatzen naizenean"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "A_urreratua"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Kontu bat behar duzu\n"
-"Jabber sarera konektatzeko"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Bukatu"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Hostname: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Kontua sortua izan da</b>\n"
+"\n"
+"Mesedez itxoin..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Konektatu bukatu sakatzen dudanean."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Pasahitza:"
+msgid "Set my profile when I connect"
+msgstr "Ezarri nire profila konektatzen naizenean"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Portua:"
+msgid "_Finish"
+msgstr "_Bukatu"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Zerbitzaria"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Denetatik</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ezer ez"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Informazio Pertsonala</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Ezaugarriak</b>"
+msgid "Accounts"
+msgstr "Kontuak"
 
-#: ../data/gui/accounts_window.ui.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "Egoerarekin b_at egin"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Gehitu"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Kontua"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Ezabatu"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Kontuak"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "_Berrizenpetu"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "Administratzaile Zerrenda"
+msgid "_Enable"
+msgstr "Aktibatu"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Erabili autentifikazioa"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"Baliabidea Jabber-eko zerbitzarira bidaltzen da JID berdineko eta zerbitzari "
+"berdinera konektatutako kontua bi zati desberdinetan edo gehiagotan "
+"banatzeko asmoarekin. Hau horrela dabil: kontu bat  `Lana` baliabidearekin "
+"jarrita eta kontu berdera `etxea` baliabidearekin jarria baduzu, mezua "
+"lehentasun handiena duenera bidaliko da. (Behean ikusi) "
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
-msgid "Auto-reconnect when connection is lost"
-msgstr "Konektatu berriro konexioa galtzean"
+msgid "Synchronize contacts"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Bilatu"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "K_onektatu Gajim irikitzean"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Al_datu Pasahitza"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Sakatu kontuaren pasahitza aldatzeko"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "Administratzaile Zerrenda"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Aukeratu Bidaltzeko Fitxeroa..."
+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-en lehentasuna, bi bezero edo gehiago konektatuta daudenean kontu "
+"berdinarekin, zeinek jaso behar duen informazioa determinatzen du; "
+"Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Aukeratu _Kodea...."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Egoerarekin b_at egin"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Sakatu kontuaren pasahitza aldatzeko"
+msgid "Priority will change automatically according to your status."
+msgstr "Lehentasuna automatikoki ezarriko da zure egoeraren arabera."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "Lehentas_una:"
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "Baliogabeko izena"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "K_onektatu Gajim irikitzean"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Konektatu"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Posta:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Lehen Izena:"
+msgid "Resour_ce:"
+msgstr "Baliabid_ea: "
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Bilatu"
 
 #: ../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 ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Mezu hau enkriptatua dago]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
+msgid "Client certificate"
+msgstr "Baliogabeko izena"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Kontua"
 
 #: ../data/gui/accounts_window.ui.h:29
-#, fuzzy
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa "
-"gerta ez dadin"
+msgid "C_onnect on Gajim startup"
+msgstr "K_onektatu Gajim irikitzean"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -347,6 +334,19 @@ msgstr ""
 "hau erabiliz"
 
 #: ../data/gui/accounts_window.ui.h:31
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Konektatu berriro konexioa galtzean"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "_Gorde kontu guztien elkarrizketak"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -356,187 +356,214 @@ msgstr ""
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"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."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Erabili proxy fitxero transferentzia"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Azken Izena:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Batu kontuak"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Orokorra"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Ez da koderik aukeratu"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Informazio Pertsonala "
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Moldatu..."
+
+#: ../data/gui/accounts_window.ui.h:40
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ezaugarriak</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Lehentas_una:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Jabber-en lehentasuna, bi bezero edo gehiago konektatuta daudenean kontu "
-"berdinarekin, zeinek jaso behar duen informazioa determinatzen du; "
-"Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Lehentasuna automatikoki ezarriko da zure egoeraren arabera."
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Bidali keep-alive paketeak"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "_Berrizenpetu"
+#: ../data/gui/accounts_window.ui.h:44
+#, fuzzy
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa "
+"gerta ez dadin"
 
 #: ../data/gui/accounts_window.ui.h:45
 #, fuzzy
-msgid "Resour_ce:"
-msgstr "Baliabid_ea: "
+msgid "Use cust_om hostname/port"
+msgstr "Erabili bezeroaren hostname/portua"
 
 #: ../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 ""
-"Baliabidea Jabber-eko zerbitzarira bidaltzen da JID berdineko eta zerbitzari "
-"berdinera konektatutako kontua bi zati desberdinetan edo gehiagotan "
-"banatzeko asmoarekin. Hau horrela dabil: kontu bat  `Lana` baliabidearekin "
-"jarrita eta kontu berdera `etxea` baliabidearekin jarria baduzu, mezua "
-"lehentasun handiena duenera bidaliko da. (Behean ikusi) "
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Hostname: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "_Gorde kontu guztien elkarrizketak"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Portua:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Denetatik</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Bidali keep-alive paketeak"
+msgid "Connection"
+msgstr "Konektatu"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Ez da koderik aukeratu"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
+msgid "Choose _Key..."
+msgstr "Aukeratu _Kodea...."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Ikusi _Deskonektatutako Kontaktuak"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Erabili bezeroaren hostname/portua"
+msgid "_Edit Personal Information..."
+msgstr "Informazio Pertsonala Editatu..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Erabili ezarritako portua:"
+msgid "Information about you, as stored in the server"
+msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Erabili proxy fitxero transferentzia"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Informazio Pertsonala</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Informazio Pertsonala "
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Informazio Pertsonala Editatu..."
+msgid "Co_nnect on Gajim startup"
+msgstr "K_onektatu Gajim irikitzean"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Aktibatu"
+msgid "Synchroni_ze account status with global status"
+msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Hostname: "
+msgid "Use cust_om port:"
+msgstr "Erabili ezarritako portua:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Moldatu..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"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."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Lehen Izena:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "_Portua:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Azken Izena:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Posta:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Batu kontuak"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "Kontu_a:"
+msgid "Add New Contact"
+msgstr "Kontaktu Berri bat Sartu"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Baimendu kontaktu honi nire egoera ikustea"
+msgid "A_ccount:"
+msgstr "Kontu_a:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Kontaktu Berri bat Sartu"
+msgid "_Protocol:"
+msgstr "_Protokoloa:"
 
-#: ../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 "Nire kontaktu zerrendara nahi zaitut sartu."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "E_rabiltzailearen ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Izengoitia:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "Ta_ldea:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Baimendu kontaktu honi nire egoera ikustea"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "Har_pidetza"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 #, fuzzy
 msgid ""
 "You have to register with this transport\n"
@@ -548,7 +575,11 @@ msgstr ""
 "protokolo honetako kontaktu bat ezartzeko.\n"
 "Sakatu erregistratu botoian jarraitzeko."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "Erre_gistratu"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -556,393 +587,196 @@ msgstr ""
 "Transporte batera konektatuta egon behar zara\n"
 "protokolo honetako kontaktu bat sartzeko."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "Ta_ldea:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Izengoitia:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokoloa:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "Erre_gistratu"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "Har_pidetza"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "E_rabiltzailearen ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-#, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Akats bat gertatu da:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Aukeratu betebeharreko komandoa:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Mesedez itxoin komandoak jasotzen diren bitartean..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Aukeratu betebeharreko komandoa:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Berriro saiatu"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Deskripzio errorea...."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Mesedez itxoin komandua bidaltzen den bitartean..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Bukatu"
+msgid "Please wait..."
+msgstr "Mesedez itxoin..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Mesedez itxoin komandoak jasotzen diren bitartean..."
+msgid "This jabber entity does not expose any commands."
+msgstr "E  Ez da komandurik aurkitu"
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Mesedez itxoin komandua bidaltzen den bitartean..."
+#, fuzzy
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Akats bat gertatu da:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Mesedez itxoin..."
+msgid "Error description..."
+msgstr "Deskripzio errorea...."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "E  Ez da komandurik aurkitu"
+#, fuzzy
+msgid "F_inish"
+msgstr "_Bukatu"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Konfigurazio Aurreratuaren Editorea"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtroa:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Deskribapena</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>OHARRA:</b> Gajim berriro abiarazi beharko duzu aldagai batzuek efektua "
 "sor dezaten"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Konfigurazio Aurreratuaren Editorea"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtroa:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Be_rezko Koloreak Ezarri"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Ezabatu MOTD"
+msgid "Show _XML Console"
+msgstr "_XML Konsola Ikusarazi"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Debekatze Zerrenda"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administratzailea"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Bidali Zerbitzarira Mezua"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Ezarri MOTD"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Ezarri Eguneko Mezua"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "_XML Konsola Ikusarazi"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Ezarri MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Eguneko Mezua Gaurkotu"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "MOTD Gaurkotu"
 
-#: ../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:11
-msgid "_Administrator"
-msgstr "_Administratzailea"
+msgid "Delete MOTD"
+msgstr "Ezabatu MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Bidali Zerbitzarira Mezua"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "leiho/tab bat kontaktu batekin irekia"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Ekintzak</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Baldintzak</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Soinuak</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Ekintza Aurreratuak"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Notifikazio Aurreratuaren Kontrola"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Egoera Guztiak"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Kanpoan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Lanpetuta"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontaktu Egoera Aldaketa"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontaktua Deskonektatuta"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Ez daukadanean"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Fitxero Transferentzia"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Fitxeroa Transferitzeko Baimena"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Fitxero Transferentzia Gelditua"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Txat Taldeko Mezu Nabarmendua"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Txat Taldeko Mezua Jasotzean"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "daukadanean"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Ikusezin"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Abiarazi agindua"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Ez Erabilgarri"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Egorera berezi bat edo gehiago..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Libre / Libre Hitz Egiteko"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Soinua ezarri"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Mezu Pribatu Berri Bat"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Denean"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Ezindu automatikoki elkarrizketa leihoa irikitzea"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Kendu esistitzen den popup leihoa "
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Ezindu esistitzen den soinua gertaera hontarako "
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Ezindu gertaeran zerrendan ikustea"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Jakinarazi popup leiho batekin"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Ireki elkarrizketa leihoa erabiltzailearekin"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Ikusarazi gertaera zerrendan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Ikusarazi gertaera zerrendan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "eta nik"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontaktua"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "norentzat"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Taldea"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "Nagoenean"
+msgid "Deletes Message of the Day"
+msgstr "Eguneko Mezuak Ezabatu"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ezer ez"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Hobespenak"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Automatikoki sartu"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ezer ez"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Hobespenak"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Automatikoki sartu"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Sarrera:"
+msgid "New entry received"
+msgstr "Ekintza berri bat jasoa"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Sarrera berri bat jaso duzu:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Emandako izena:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Sarrera:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Azken Eraldaketa:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Ekintza berri bat jasoa"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Sarrera berri bat jaso duzu:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
@@ -950,28 +784,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Egoera Mezu Ezarriak</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -979,322 +808,318 @@ msgstr "<b>Egoera Mezu Ezarriak</b>"
 msgid "<b>Mood:</b>"
 msgstr "<b>Soinuak</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Egoera Mezu Ezarriak</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Aldatu Pasahitza"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Sartu berriro baieztatzeko:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Sartu pasahitz berria:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Sartu berriro baieztatzeko:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Egoera mezu berria ezarri</b>"
+msgid "Save as Preset..."
+msgstr "Gorde Ezarritako Bezala...."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Aktibatuta"
+msgid "Mood:"
+msgstr "Gela:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Gela:"
+msgid "Activity:"
+msgstr "Aktibatuta"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Ezarritako egoerak:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Gorde Ezarritako Bezala...."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Egoera mezu berria ezarri</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Txat Taldean _Sartu"
+msgid "_Copy Link Location"
+msgstr "_Lotura kokapena kopiatu"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Zerrendara Sartu"
+msgid "_Open Link in Browser"
+msgstr "Web-ean _Ireki Lotura"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiatu JID/Email-a"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Lotura kokapena kopiatu"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Ireki E-posta Konposatzailea"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "Web-ean _Ireki Lotura"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Txat Taldean _Sartu"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Zerrendara Sartu"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Zerrendara kontaktua sartu"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "arreta jartzen ari da elkarrizketara"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "arreta jartzen ari da elkarrizketara"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Bidali mezua"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Bidali"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Honera gonbidatu"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Begiratzaileak"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr ""
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Bere egoera ikusteko esan"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:5
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Gehitu _Noifikazio Berezia"
+msgid "MUC server"
+msgstr "Begiratzaileak"
 
-#: ../data/gui/contact_context_menu.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Open_PGP kodea zehaztu"
+msgid "In_vite"
+msgstr "Honera gonbidatu"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Komandoa Exekutatu..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Elkarrizketa _Hasi"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Bidali _Mezu Bakarra..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Editatu _Taldeak"
+msgid "Send _File..."
+msgstr "Bidali _Fitxeroa"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kontaktua"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Toggle Open_PGP Encryption"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Ezabatu"
+msgid "Toggle End to End Encryption"
+msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sends custom XML"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Komandoa Exekutatu..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Bidali _Mezu Bakarra..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Berridatzi Kontaktua"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Bidali _Fitxeroa"
+msgid "_Rename..."
+msgstr "_Berrrizenpetu"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Editatu _Taldeak"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Elkarrizketa _Hasi"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Open_PGP kodea zehaztu"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Toggle Open_PGP Encryption"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Toggle Open_PGP Encryption"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Gehitu _Noifikazio Berezia"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "Har_pidetza"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Baimendu nire egoera ikustea"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Baimendu kontaktu honi nire egoera ikustea"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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 ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Bere egoera ikusteko esan"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historiala"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Berridatzi Kontaktua"
+msgid "_Unignore"
+msgstr "bederatzi"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Berrrizenpetu"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "Har_pidetza"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Ezabatu"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "bederatzi"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historiala"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Formularioan bete"
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Gelaren Konfigurazioa"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Formularioan bete"
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Taldeak Editatu"
@@ -1308,62 +1133,52 @@ msgstr "<b>Deskribapena</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
+msgid "File Transfers"
+msgstr "Fitxero Transferentzia"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Fitxategi transferentzia kantzelatu"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Kantzelatu aukeratutako fitxategi transferentzia"
+msgid "file transfers list"
+msgstr "fitxeroen transferentziaren lista"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Kantzelatu aukeratutako fitxategi transferentzia eta ezabatu bukatu gabeko "
-"fitxeroa "
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Garbitu"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Fitxero Transferentzia"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Leihoa ezkutatu"
-
-#: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Listatik fitxero tranferentzia ezabatu."
-
-#: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Ezabatu  kantzelatuak, osorik eta huts egin dutenak  fitxero transferentzia "
 "zerrendatik"
 
-#: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
+#: ../data/gui/filetransfers.ui.h:8
+msgid "Remove file transfer from the list."
+msgstr "Listatik fitxero tranferentzia ezabatu."
 
-#: ../data/gui/filetransfers.ui.h:11
+#: ../data/gui/filetransfers.ui.h:9
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1371,82 +1186,110 @@ msgstr ""
 "Aukera honek fitxero transferentzia bakar bat kantzelatzen du. "
 "Transferentzia martxan badago, lehenik gelditu egingo da eta ondoren ezabatu."
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Garbitu"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Eten"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr ""
+"Kantzelatu aukeratutako fitxategi transferentzia eta ezabatu bukatu gabeko "
+"fitxeroa "
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Jarraitu"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Fitxategi transferentzia kantzelatu"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Jakinarazi  fitxeroa transferitu denean"
+msgid "Cancels the selected file transfer"
+msgstr "Kantzelatu aukeratutako fitxategi transferentzia"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Ireki Fitxeroaren Edukia"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Leihoa ezkutatu"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Eten"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Jarraitu"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "fitxeroen transferentziaren lista"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Ireki Fitxeroaren Edukia"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Kontua"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Negrita"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Taldea"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontaktua"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Sortzen"
+msgid "Gajim Themes Customization"
+msgstr "Gajim-en Gaien Kustomizatazailea"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontaktua"
+msgid "Text _color:"
+msgstr "Testuaren _kolorea:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Iturburuaren estiloa:"
+msgid "_Background:"
+msgstr "A_tzealdeko kolorea:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim-en Gaien Kustomizatazailea"
+msgid "Text _font:"
+msgstr "Testu _mota:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Joanda"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Taldea"
+msgid "Font style:"
+msgstr "Iturburuaren estiloa:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inaktiboa"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Negrita"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Etzana"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Etena"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Sortzen"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inaktiboa"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Joanda"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1454,7 +1297,7 @@ msgstr ""
 "MUC\n"
 "Mezuak"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1462,22 +1305,6 @@ msgstr ""
 "MUC Zuzendua\n"
 "Mezuak"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Etena"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Testuaren _kolorea:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Testu _mota:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "A_tzealdeko kolorea:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1485,91 +1312,101 @@ msgstr "Aldatu _Izengoitia"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Talde Agenda Moldatu"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Aldatu _Gaia"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Gela Konfigu_ratu"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Talde Agendan Sartu Gela hau"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Deskribapena: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Talde Agenda Moldatu"
+msgid "_Request Voice"
+msgstr "_Ahotsa"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Talde Agendan Sartu Gela hau"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_deratzailea"
+msgid "_Send Private Message"
+msgstr "_Bidali Mezu Pribatu bat"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Bidali _Fitxeroa"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Bete Beharreko Aukerak"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Bidali _Fitxeroa"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Zerrendara Sartu"
+msgid "_Voice"
+msgstr "_Ahotsa"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_deratzailea"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Partaidea"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Debekatu"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Jabea"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Bota"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Partaidea"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Jabea"
+msgid "_Ban"
+msgstr "_Debekatu"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Bidali Mezu Pribatu bat"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Ahotsa"
+msgid "_Add to Roster"
+msgstr "_Zerrendara Sartu"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Talde Agendan Sartu Gela hau"
+msgid "Show a list of formattings"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Aldatu _Izengoitia"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Aldatu _Izengoitia"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Talde Agendan Sartu Gela hau"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1581,11 +1418,29 @@ msgid "From:"
 msgstr "Norena:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Gaia:"
 
 #: ../data/gui/history_manager.ui.h:1
+msgid "Gajim History Logs Manager"
+msgstr "Gajim Historialeko Log Administratzailea"
+
+#: ../data/gui/history_manager.ui.h:2
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gajim Historialeko Log Administratzailea"
+
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:6
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1600,201 +1455,188 @@ msgstr ""
 "Ezabatze handia egin behar baduzu, Gajim abiarazita ez dagoela begira ezazu. "
 "Normalean hitz egiten ari zaren kontaktuaen ezabaketak arbuilatzen ditu."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Ezabatu"
+#: ../data/gui/history_manager.ui.h:8
+msgid "_Search Database"
+msgstr "_Bilatu Datu Basean"
 
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:9
 msgid "Export"
 msgstr "Esportatu"
 
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim Historialeko Log Administratzailea"
-
-#: ../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"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
-msgid "_Search Database"
-msgstr "_Bilatu Datu Basean"
-
 #: ../data/gui/history_window.ui.h:1
 #, fuzzy
-msgid "All Chat Histories"
-msgstr "Old stories"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Elkarrizketaren Historiala"
-
-#: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Kontaturen izena"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Txat Taldeak"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Old stories"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Elkarrizketaren Historiala"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Bilatu"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "Kontaktuen egoera aldaketak gorde"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Host-a"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Host-a"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Ezarri nire profila konektatzen naizenean"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Gela:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Izengoitia:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Berriki:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Berriki:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Ezarri nire profila konektatzen naizenean"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Gela:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Talde Agendan Sartu Gela hau"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "_Talde Agendan Sartu Gela hau"
+msgid "Bro_wse Rooms"
+msgstr "_Bilatu"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Sartu"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automatikoki sartu"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Talde Agenda Moldatu"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Izenburua:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Inprimatu egoera:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatikoki sartu"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Izenburua:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1807,104 +1649,107 @@ msgid "_Configure"
 msgstr "_Jarraitu"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Ezaugarriak</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "HTTP konektatuta"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Aldaketak</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "HTTP konektatuta"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Profila Moldatu"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Mota:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pasa_hitza:"
+#, fuzzy
+msgid "_Name:"
+msgstr "_Izena "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Ezaugarriak</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Portua:"
+msgid "Use HTTP prox_y"
+msgstr "_Proxy erabili"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Proxy erabili"
+msgid "_BOSH URL:"
+msgstr "_URL:"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Erabili autentifikazioa"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Izena"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL:"
+msgid "Pass_word:"
+msgstr "Pasa_hitza:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
 #, fuzzy
-msgid "_Name:"
-msgstr "_Izena "
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Mota:"
+msgid "Proxy _Port:"
+msgstr "_Portua:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Izena"
+msgid "<b>Settings</b>"
+msgstr "<b>Aldaketak</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Kontuak moldatu"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Pasa-esaldia"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Autorizatu"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Libre"
+msgid "Version:"
+msgstr "GTK+ Bertsioa:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Jarraitu"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Deskribapena: %s"
+msgid "Authors:"
+msgstr "_Autorizatu"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1912,39 +1757,32 @@ msgid "Homepage:"
 msgstr "Web Pertsonala:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Stalled"
+msgid "Description:"
+msgstr "Deskribapena: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Jarraitu"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Stalled"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1958,515 +1796,504 @@ msgid "Event desc"
 msgstr "Gertaerak"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Konfigurazio Aurreratuaren Editorea</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikazioak</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Bezeroak</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Ekintzak</b>"
+msgid "All chat states"
+msgstr "Egoera Guztiak"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Ekintzak</b>"
+msgid "Composing only"
+msgstr "Sortzen"
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Arau bat editatu</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Ezindu"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
+msgid "Never"
+msgstr "_Inoiz"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Ikusizko Jakinarazketa</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Baldintzak</b>"
+msgid "Always"
+msgstr "Kanpoan"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Agertarazi"
 
-#. 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>Bezeroak</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Jakinarazi horri buruz"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Soinuak</b>"
+msgid "Show only in roster"
+msgstr "Ikusi _zerrendan bakarrik"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Aukerak</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Egoera Mezu Ezarriak</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Debekatze Zerrenda</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Egoera Mezu Ezarriak</b>"
+msgid "Last state"
+msgstr "Azken egoera: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Hobespenak"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Ezaugarriak</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Ezarri Araua</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
+"azalaraziko ditu"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Ikusizko Jakinarazketa</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
+"azpian eta txat taldeetan"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Aurreratua"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Aurreratua"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
+"azalaraziko ditu"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Egoera Guztiak"
+msgid "Sort contacts by status"
+msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Baimena _OS informazioa bidaltzeko"
+#, fuzzy
+msgid "in _roster"
+msgstr "Ez dago zerrendan"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Baimena _OS informazioa bidaltzeko"
+msgid "in _group chats"
+msgstr "Txat Taldean _Sartu"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/"
-"Ikusezin"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Kanpoan"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
+"edo animatura eraldatuko ditu"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Eskatu egoera mezua, nagoenean:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticonoak:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "M_ezu leiho bat"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "Egoera mezua:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
+msgid "_Highlight misspelled words"
+msgstr "_Highlight misspelled words"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Sortzen"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Interfazeko kolorea eta letra konfiguratu"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Ikusi _Zerrenda"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Egoera mezua:"
+msgid "Show icon when your messages are received"
+msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Kontaturen izena"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Bezeroak</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Arau bat editatu</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Ekintza berri bat jasotzean."
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Jakinarazi kontaktuek hau egitean: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Jakinarazi kontaktuek hau egitean: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
+"pantailako beheko eskubiko aldean"
 
-#: ../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:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/"
+"Ikusezin"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+msgid "Notify on new _GMail email"
+msgstr "_Gmail-eko E-posta berri batez jakinarazi"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
+"ere jarriko du."
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+msgid "Display _extra email details"
+msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
+"ere jarriko du."
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Aukerak</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+msgid "Show notification area icon:"
+msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Ikusizko Jakinarazketa</b>"
 
 #: ../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 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."
+msgid "Play _sounds"
+msgstr "Soinuak _entzun"
 
 #: ../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 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."
+msgid "Ma_nage..."
+msgstr "Mo_ldatu..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 msgstr ""
-"Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
-"pantailako beheko eskubiko aldean"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Soinuak</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "Ezkutatu botoiak txat taldeko leihoan."
+msgid "Notifications"
+msgstr "Kontu Eraldaketa"
 
 #: ../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"
+"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 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."
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
-"ere jarriko du."
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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 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."
 
 #: ../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 ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
-"azalaraziko ditu"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Ikusizko Jakinarazketa</b>"
 
 #: ../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 ""
-"Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
-"azpian eta txat taldeetan"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Informazio Pertsonala "
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
-"azalaraziko ditu"
+msgid "_Away after:"
+msgstr "Automatikoki _Kanpoan ondoren:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
-"azalaraziko ditu"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
-"azalaraziko ditu"
+msgid "_Not available after:"
+msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
-"azalaraziko ditu"
 
 #: ../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 ""
+msgid "minutes"
+msgstr "minutu"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"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: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:72
-#, fuzzy
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
-"ere jarriko du."
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko "
-"ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
-"jarriko dira)"
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
-"edo animatura eraldatuko ditu"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Ekintzak</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "M_ezu leiho bat"
+msgid "Ask status message when I:"
+msgstr "Eskatu egoera mezua, nagoenean:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Mo_ldatu..."
+msgid "Sign _in"
+msgstr "_Konektatuta"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Inoiz"
+msgid "Sign _out"
+msgstr "_Deskonektatuta"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Kontu Eraldaketa"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Jakinarazi kontaktuek hau egitean: "
+msgid "<b>Status Messages</b>"
+msgstr "<b>Egoera Mezu Ezarriak</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Jakinarazi kontaktuek hau egitean: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Jakinarazi horri buruz"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Egoera"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "_Gmail-eko E-posta berri batez jakinarazi"
+msgid "Use system _default"
+msgstr "_Sistemaren berezkoa erabili"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Egoera mezua:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Informazio Pertsonala "
+msgid "<b>Font</b>"
+msgstr "<b>Soinuak</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Soinuak _entzun"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Erabili _transporteen ikurrak"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Agertarazi"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko "
+"ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
+"jarriko dira)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Hobespenak"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Berezko egoera _ikurra:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Interfazeko kolorea eta letra konfiguratu"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "G_aia:"
 
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Zerbitzaria:"
+msgid "<b>Themes</b>"
+msgstr "<b>Ezaugarriak</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "E_rabili ikonifikazioa (aka. notification area)"
+msgid "Contact's nickname:"
+msgstr "Kontaturen izena"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Ikusi _zerrendan bakarrik"
+msgid "Your nickname:"
+msgstr "Izengoitia baino l_ehen:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Konektatuta"
+msgid "_Status message:"
+msgstr "Egoera mezua:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Deskonektatuta"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "Be_rezko Koloreak Ezarri"
 
 #: ../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 ""
-"Mezu batzuk gehiegizko edukia izan dezakete(koloreak, tamaina...). Hautatua "
-"badago, Gajim-ek testua modu sinple batean erakutsiko du. "
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Egoera mezua:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "_Sailkatu kontaktuak egoeraren bidez"
+msgid "Your message:"
+msgstr "Errore mezua: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Egoera"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Txat Taldeko Mezu Nabarmendua"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Berezko egoera _ikurra:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2474,569 +2301,581 @@ msgid "Style"
 msgstr "Stalled"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "G_aia:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Ekintzak</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Erabili _transporteen ikurrak"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Ezarri Araua</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "_Sistemaren berezkoa erabili"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Zerbitzaria:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Ekintza berri bat jasotzean."
+msgid "<b>Connection</b>"
+msgstr "<b>Baldintzak</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Errore mezua: %s"
+msgid "_File manager:"
+msgstr "_Fitxero administratzaile:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Izengoitia baino l_ehen:"
+msgid "_Mail client:"
+msgstr "_Email bezeroa"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Automatikoki _Kanpoan ondoren:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
+msgid "<b>Custom</b>"
+msgstr "<b>Bezeroak</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Emoticonoak:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikazioak</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Fitxero administratzaile:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Highlight misspelled words"
+#, fuzzy
+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 ""
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Baimena _OS informazioa bidaltzeko"
 
 #: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
+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:128
-msgid "_Log status changes of contacts"
-msgstr "Kontaktuen egoera aldaketak gorde"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Baimena _OS informazioa bidaltzeko"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Email bezeroa"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Automatikoki _Ez Erabilgarri ondoren:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Ireki..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "Be_rezko Koloreak Ezarri"
-
-#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
+msgid "Allow my _idle time to be sent"
+msgstr "Baimena _OS informazioa bidaltzeko"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "Egoera mezua:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Debekatze Zerrenda</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "Kontaktuen egoera aldaketak gorde"
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "in _group chats"
-msgstr "Txat Taldean _Sartu"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Ez dago zerrendan"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minutu"
+msgid "_Open..."
+msgstr "_Ireki..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Konfigurazio Aurreratuaren Editorea</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Aurreratua"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Debekatze Zerrendak:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Ezarri / Editatu arau bat</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Debekatze Zerrenda"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Arauen zerrenda</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Debekatze Zerrenda</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktibatu saio honetarako"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktibatu hastean"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Arauen zerrenda</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Dena"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Ezarri / Editatu arau bat</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "harpidetza honekin"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Baimendu"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Ukatu"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "talde hontakoak"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ordena:"
+msgid "all by subscription"
+msgstr "harpidetza honekin"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Debekatze Zerrenda"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Dena"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "harpidetza honekin"
+msgid "to send me messages"
+msgstr "niri mezuak bidaltzea"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "talde hontakoak"
+msgid "to send me queries"
+msgstr "niri galderak bidaltzeko"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Biak"
+msgid "to view my status"
+msgstr "nire egoera ikustea"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "-etik"
+msgid "to send me status"
+msgstr "niri egoera bidaltzeko"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "bat"
+msgid "All (including subscription)"
+msgstr "harpidetza honekin"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "bi"
+msgid "Order:"
+msgstr "Ordena:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "niri mezuak bidaltzea"
+#, fuzzy
+msgid "none"
+msgstr "bat"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "niri galderak bidaltzeko"
+#, fuzzy
+msgid "both"
+msgstr "Biak"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "niri egoera bidaltzeko"
-
-#: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "nire egoera ikustea"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Ezarri Araua</b>"
+msgid "from"
+msgstr "-etik"
 
-#: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Abatarea:"
+msgid "to"
+msgstr "bi"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Urtebetetzea:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Bezeroak</b>"
+msgid "<b>Family:</b>"
+msgstr "Familia:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Bezeroak</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Soinuak</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Ezarri Araua</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Departamentua:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "E-Posta:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Ezaugarriak</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Helbide Gehigarria:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familia:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Soinuak</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Bezeroak</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Aldaketak</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Bezeroak</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Web Pertsonala:"
+msgid "<b>State:</b>"
+msgstr "<b>Aldaketak</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Helbide Gehigarria:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Ezarri Araua</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Posta Kodea:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Bezeroak</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Soinuak</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Izengoitia:"
+msgid "<b>Address</b>"
+msgstr "<b>Ezarri Araua</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Telefono Zenbakia:"
+msgid "<b>Homepage:</b>"
+msgstr "Web Pertsonala:"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Baldintzak</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Bezeroak</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Posta Kodea:"
+msgid "<b>Nickname:</b>"
+msgstr "Izengoitia:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Ezaugarriak</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Telefono Zenbakia:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formatua: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Soinuak</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Urtebetetzea:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Aldaketak</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "E-Posta:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Aldaketak</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Abatarea:"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Sakatu abatarea ezartzeko"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Informazio Pertsonala "
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Soinuak</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Bezeroak</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "About"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Baldintzak</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Sakatu abatarea ezartzeko"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Departamentua:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formatua: YYYY-MM-DD"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Soinuak</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Informazio Pertsonala "
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Lana"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Zer nahi duzu egin?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "About"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Zer nahi duzu egin?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Ezabatu"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Kontaktua Gehitu..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Aukerak"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Zerbitzariaren Ezaugarriak:"
+msgid "Add _Contact..."
+msgstr "_Kontaktua Gehitu..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Fitxero _Transferentzia"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Editatu"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Frequently Asked Questions (online)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontuak"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Online laguntza"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profila, A_batarea"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Ikusi"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Trans_porteak Erakutsi"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Ikusi _Deskonektatutako Kontaktuak"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Kontuak"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Fitxero _Transferentzia"
 
-#. 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 "_Aukerak"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Laguntza"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Editatu"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Online laguntza"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Laguntza"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Bidali _Mezu Bakarra..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Frequently Asked Questions (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Ikusi"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Mesedez itxoin komandoak jasotzen diren bitartean..."
+msgid "Fea_tures"
+msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Bilatu"
 
+#: ../data/gui/search_window.ui.h:2
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Mesedez itxoin komandoak jasotzen diren bitartean..."
+
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Kontaktua _Sartu"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -3056,42 +2895,37 @@ msgstr "Erregistratu honetara"
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Erantzun mezu honi"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Norentzat:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Bidali"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Bidali mezua"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Bidali mezua eta itxi leihoa"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Erantzun"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Norentzat:"
+msgid "Reply to this message"
+msgstr "Erantzun mezu honi"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Erantzun"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Bidali eta Itxi"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Bidali mezua eta itxi leihoa"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Autorizatu"
+msgid "Subscription Request"
+msgstr "Harpidetza Eskaria"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-#, fuzzy
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Kontaktu autorizatua beraz, zure egoera ikus dezake"
+msgid "_Deny"
+msgstr "_Ukatu"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
@@ -3100,277 +2934,289 @@ msgid ""
 "connected"
 msgstr "Autorizazioa ezeztatu, honela kontaktuak ezin du zure egoera ikusi"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Harpidetza Eskaria"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Autorizatu"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Ukatu"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Kontaktu autorizatua beraz, zure egoera ikus dezake"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Soinua Kendu"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Bidali _Mezu Bakarra"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Ikusi Gabeko _Gertaerak"
-
-#: ../data/gui/systray_context_menu.ui.h:4
 msgid "Sta_tus"
 msgstr "E_goera"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "Txat _Taldea"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Ekintzak</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Bidali _Mezu Bakarra"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Bezeroak</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Ikusi Gabeko _Gertaerak"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Aldaketak</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Soinua Kendu"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontaktuaren Informazioa"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Baliabidea:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Aldaketak</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Deskribapena</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Bezeroak</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Azalpenak"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Aldaketak</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "Abatarea:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>Configured avatar:</b>"
 msgstr "Gela Konfigu_ratu"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontaktua"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Deskribapena</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kontaktuaren Informazioa"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Ekintzak</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Gehiago"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Abatarea:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontaktua"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Soinuak</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Azalpenak"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikoa</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Sarrera</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Informatu/Galdetu"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Soinuak</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IG"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Informatu/Galdetu"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Egoera"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mezua"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Egoera"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Sarrera</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "Kontua E_ditatu"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Tokiko jid-a:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Pertsonala"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Baliabidea:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber bezeroa"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Pertsonala"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Behealako Mezularitza"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "IM Jabber Bezeroa"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber bezeroa"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Sarrera baliogabea"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Activated"
 msgstr "Aktibatuta"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inaktiboa"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 #, fuzzy
 msgid "Integer"
 msgstr "Taldean"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Izen Hautapena"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Balorea"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Mota"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ezer ez)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Ikusezin"
 
@@ -3381,246 +3227,178 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Sarrera berri bat jaso duzu:"
 msgstr[1] "Sarrera berri bat jaso duzu:"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Ingelesa"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Belarusian"
-msgstr "Bulgariera"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgariera"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Breton"
-msgstr "Briton"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Czech"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Alemaniera"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Greziera"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "British"
-msgstr "Briton"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperantoa"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Gaztelania"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Basque"
-msgstr "Basc"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Frantsesa"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Kroaziera"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiera"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Norwegian (b)"
-msgstr "Norvegian b"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Alemana"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Norwegian"
-msgstr "Norbegiera"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polakoa"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugesa"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brasileko Portugesa"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Rusiera"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Serbian"
-msgstr "Alemaniera"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Eslovakoa"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Swedish"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Txinera (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Ortografia hizkuntza"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "bederatzi"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Izengoitia"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Mota:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Automatikoki ez erabilgarriko egoera mezua"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Bidali _Fitxeroa"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
@@ -3628,66 +3406,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3695,259 +3473,622 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Fitxero Transferentzia"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Tamaina: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Onartu"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Fitxero transferentzia osatua"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Txat Taldeko Gonbidapena"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Zerrendatik kontaktua ezabatu"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Errorea fitxeroa irakurtzean:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Fitxero Transferentzia Gelditua"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Fitxero transferentzia ezeztatua"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Connection with peer cannot be established."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s ez da aurkitu"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Kanpoan"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Libre"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Erabilera: %s, testu leihoa itxi."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Toggle Open_PGP Encryption"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Fitxero bat bidali kontaktu bati"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Sakatu kontaktu honen elkarrizketa zaharrak ikusteko"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Konexioa ez dago erabilgarri"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Konexioa ez erablgarri"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Aldatu _Izengoitia"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Baliogabeko izena"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
+"erabiltzaileari."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Izengoitia aurkitugabea: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
+"erabiltzaileari."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Galdetu leiho bat itxi baino lehen."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Bidali %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Gela honetan ukatua izan zara."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Baliogabeko izena"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Afizioak: "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Galdutako argumentua  \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "bederatzi"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ez nahasi."
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Deskripzio errorea...."
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Txat Taldea Berria"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s gelan sartu da"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 #, fuzzy
 msgid "Groupchats"
 msgstr "Txat Taldeak"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d mezu irakurri gabe"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "%d mezu irakurri gabe"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Erabili D-Bus eta Notification-Daemon jakinarazketak erakusteko"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Baliogabeko izena"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "egoera mezuaren testua"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Ikusarazi gertaera zerrendan"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Ikusarazi gertaera zerrendan"
+
+#. red
+#: ../src/common/config.py:104
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Fitxeroa Transferitzeko Baimena"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Fitxero transferentzia ezeztatua"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Txat Taldeko Gonbidapena"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Baliogabeko izena"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Izengoitia Aldatu"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "egoera mezuaren testua"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Zuzentzaileak erabiltzen duen hizkuntza"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3957,7 +4098,7 @@ msgstr ""
 "'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
 "'never' - inoiz ez inprimatu ordua."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3968,17 +4109,17 @@ msgstr ""
 "fuzzyclocks-ri eta 0 fuzzyclock ezintzeko. 1 ordu zehatzena da, 4 berriz, "
 "zehaztasun gutxienekoa."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3988,7 +4129,7 @@ msgstr ""
 "Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
 "(If you want to use this, install docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3996,7 +4137,7 @@ msgstr ""
 "Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
 "erabiltzen bada."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -4004,57 +4145,73 @@ msgstr ""
 "Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
 "beste pertsona batek izengoiti berbera badu."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Sartu * eta [n] zerrendako izenburuan?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
 "azkenetik."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4062,11 +4219,11 @@ msgstr ""
 "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
 "ICQ Client default behaviour)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4075,11 +4232,11 @@ msgstr ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4091,14 +4248,14 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4106,7 +4263,7 @@ msgstr ""
 "Txat elkarrizketen goera mezua ikusarazi txat leihoan. All, composing_only "
 "edo disabled izan daiteke. "
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4114,33 +4271,35 @@ msgstr ""
 "Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
 "imprimatu x minuturo."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4149,28 +4308,34 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Jakin arazi gertaerak system trayicon-ean."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4178,17 +4343,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4197,13 +4362,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4211,7 +4376,7 @@ msgstr ""
 "Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
 "mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4219,11 +4384,11 @@ msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4231,7 +4396,7 @@ msgstr ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4239,10 +4404,10 @@ msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4254,30 +4419,34 @@ msgstr ""
 "inprimatuko ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko "
 "ditu bakarrik."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Kontaktuen atzealdeko kolorea momentuan deskonektatzen direnean."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Egia bada, mezuen berrezartzea tamaia txikian egingo dira eta ez "
 "ezarritakoan."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "ez erakutsi zerrenda sistemako zeregin barran."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4287,7 +4456,7 @@ msgstr ""
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4298,7 +4467,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4307,7 +4476,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrolatu leihoa mezu berri bat dagoenean.\n"
@@ -4318,32 +4487,40 @@ msgstr ""
 "konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
 "behar da."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Egia bada, ateratzeko botoila sakatzean tab/leihoa itxiko da."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4351,28 +4528,28 @@ msgstr ""
 "Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
 "denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickame."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Txat taldeko izengoitietan erabiliko diren koloreen zerrenda"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4380,7 +4557,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4389,7 +4566,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4398,7 +4575,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -4409,115 +4586,129 @@ msgstr ""
 "lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
 "zerbitzariarengandik. "
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4525,84 +4716,97 @@ msgstr ""
 "Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
 "aukeran ezarriak daude."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4610,141 +4814,188 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s fitxero bat bidali nahi dizu"
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Erabili autentifikazioa"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Erabili autentifikazioa"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "dena edo espazio egoera banandua"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'bai', 'ez', edo 'biak'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Libre."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Agur!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4752,27 +5003,183 @@ 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Norentzat"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Harpidetza kentzekoa eskaera %s -tik"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Autorizazioa ezabatua izan da."
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Jabber ID baliogabea"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "errorea bidaltzen zen bitartean %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "D-Bus bertsioa aurkitugabea: %s"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Mezu Berri Bat"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Mezu Berria %(nickname)s -etik"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Mezu Pribatu Berri Bat"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Mezu Pribatu Berri Bat %s gelatik"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Mezu Berria %(nickname)s -etik"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Mezu Berria Bat"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Mezu Berria %(nickname)s -etik"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Egoera Aldatu du"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s orain dago %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontaktu Egoera Aldaketa"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Konektatuta"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontaktua konektatuta"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Deskonektatuta"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontaktua deskonektatuta"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ez izan da idle modulua kargatu"
@@ -4782,215 +5189,193 @@ msgstr "Ez izan da idle modulua kargatu"
 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:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard argitarapena egina"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Jabber ID baliogabea"
-
-#: ../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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Baliogabeko izena"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4999,179 +5384,189 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Manualki konektatu berriro."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../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:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Ezin izan da konektatu \"%s\" -rekin"
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "%s gordea"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktua"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transportea"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ez dago zerrendan"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 "D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
@@ -5188,7 +5583,7 @@ msgstr ""
 "Zerbitzua ez erabilgarri: Gajim ez dago abiarazita edota remote_control "
 "False egoeran dago"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
@@ -5374,267 +5769,294 @@ msgstr "Aste bukaera"
 msgid "Weekend!"
 msgstr "Asteburua!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Ez Erabilgarri"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Gelditua"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Gelditua"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Ikusezin"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "-etik"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Jabea"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Ezin izan da irudia kargatu"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Ezin izan da irudia kargatu"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Gelaren Konfigurazioa"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5646,111 +6068,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Berezko Egoera Mezuak"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Tamaina: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Fitxeroa: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "berdea"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "errorea: ezin da %s ireki irakurtzeko"
+msgid "Error: cannot open %s for reading"
+msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
@@ -6454,52 +6890,134 @@ msgstr ""
 msgid "Writing"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Berezkoa"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "arrantzale"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Botatzen %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Estatua:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Kontua"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Deskribapena"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Avahi error"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "bat"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+#, fuzzy
+msgid "room"
+msgstr "-etik"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr ""
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/common/socks5.py:92
-#, fuzzy
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Beharbada beste Gajim prozesu bat abiarazita duzu. Fitxero transferentzia "
-"bertan behera utziko da."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6508,46 +7026,45 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Ezin izan da zerbitzu lokalak hasi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
@@ -6558,26 +7075,26 @@ msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
 msgid "Error while adding service. %s"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Berezko Egoera Mezuak"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktibatu"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6586,72 +7103,72 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar "
 "dituzu."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6659,148 +7176,149 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kontuak moldatu"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6808,11 +7326,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6820,11 +7338,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6833,11 +7351,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6845,7 +7363,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6862,116 +7380,112 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Denak"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo "
 "talde agenda hau ezabatzeaz"
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Baliogabeko izena"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6979,34 +7493,34 @@ msgid ""
 "window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7016,7 +7530,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7024,218 +7538,235 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Jarraitu"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Lehen Mezu Jasoa"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, 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:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "At_era"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Atzo"
 msgstr[1] "Atzo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "IM Jabber Bezeroa"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ezarri MOTD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7243,107 +7774,108 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Hebidea:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG zenbakia:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ zanbakia:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Helbidea:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Helbide:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ jabber bezeroa"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber bezeroa"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7354,108 +7886,160 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Konektatu"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "E_z galdetu berriro  "
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "The nickname contains invalid characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Host okerra"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Hau ez da txat talde bat"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID gela baliogabea"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ez da txat gela baten izena."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7464,168 +8048,138 @@ msgstr ""
 "kontaktuaren Jabber ID-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontaktua konektatuta"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Kontaktua deskonektatuta"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Mezu Berria Bat"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Mezu Pribatu Berri Bat"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Txat Taldeko Gonbidapena"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontaktu Egoera Aldaketa"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr " XML Konsola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Stalled"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Ezabatu"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7633,192 +8187,188 @@ msgid ""
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Taldea"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Kontaktua _Sartu"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Kontaktua _Sartu"
+msgstr[1] "Kontaktua _Sartu"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Zerrendatik kontaktua ezabatu"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Zerrendatik kontaktua ezabatu"
+msgstr[1] "Zerrendatik kontaktua ezabatu"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Baliogabeko izena"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condition"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "nagoenean"
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7826,38 +8376,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7867,77 +8417,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "%s konturako"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Baliogabeko izena"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Besteak"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7945,477 +8533,492 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Baliogabeko izena"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Komandoa Exekutatu..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Deskribapena"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago jadanik."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Ezer ez"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Mezu berria"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Azalpenak: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "_Sarrerako mezua:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Kontu Eraldaketa"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Egoerarekin b_at egin"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "_Sarrerako mezua:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Orokorra"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Libre"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Fitxeroa"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Denbora"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Prozesua"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaina: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Zu"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "%s gordea"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Fitxero transferentzia osatua"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Fitxero transferentzia ezeztatua"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Connection with peer cannot be established."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Hartzailea: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Fitxero Transferentzia Gelditua"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Beste prozesu batek erabiltzen du orain fitxero hau."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Fitxeroa: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Mota: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Deskribapena: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s fitxero bat bidali nahi dizu:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Gorde Bezala..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Fitxeroa: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Mota: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Deskribapena: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s fitxero bat bidali nahi dizu:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Profila bidaltzen..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Fitxero Transferitze Errorea"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8423,70 +9026,107 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Fitxeroa:"
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "mezua"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Emoticonoak:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Ikusi _zerrendan bakarrik"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Konfigurazio Aurreratuaren Editorea"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Gelaren Konfigurazioa"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim-ek  pywin32  behar du abiarazteko"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8495,12 +9135,11 @@ msgstr ""
 "Mesedez begiratu Pywin32 instalatuta dagoela sisteman. %s-etin lortu "
 "dezakezu hau."
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim dagoeneko abiarazi da"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8508,29 +9147,29 @@ msgstr ""
 "Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
 "Abiarazi dena den?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8539,51 +9178,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "kontua"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "egoera"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mezua"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "egoera mezua"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8592,20 +9235,48 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Lehentas_una:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Kontu berri bat _erregistratu nahi dut"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8615,34 +9286,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: ../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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8652,185 +9318,231 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "gaia"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Zerrendara kontaktua sartu"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Sartu kontaktu berria kontu honetara"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ireki  'Txat-a Hasi' leiho"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Elkarrizketa hasi, kontu hau rabiliz"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr " XML bidaltzeko"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Kontaktu Egoera Aldaketa"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Izengoitia aurkitugabea: %s"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
+
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "mezuaren edukia"
+
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Gela Berri Sartu"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "room"
+msgid "?CLI:room"
 msgstr "-etik"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "Room JID"
+msgstr "Gela:"
+
+#: ../src/gajim-remote.py:290
 #, fuzzy
-msgid "nick"
+msgid "?CLI:nick"
 msgstr "Izengoitia"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:290
 #, fuzzy
-msgid "password"
+msgid "Nickname to use"
+msgstr "Izengoitia aurkitugabea: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "Pasahitza:"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Pasahitzak desberdinak dira"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 #, 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
+#: ../src/gajim-remote.py:301
 #, 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8839,164 +9551,42 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Usage: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../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-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \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-plugin.py:518 ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Host okerra"
-
-#: ../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: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: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
-msgid "Change the avatar"
-msgstr "Kontaktu Egoera Aldaketa"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Izengoitia aurkitugabea: %s"
-
-#: ../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-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "mezuaren edukia"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Gela:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Izengoitia aurkitugabea: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "Pasahitzak desberdinak dira"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9005,7 +9595,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9014,10 +9604,15 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Host okerra"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Gaia"
@@ -9041,203 +9636,237 @@ msgid "You cannot delete your current theme"
 msgstr "Ezin duzu zure berezko gaia ezabatu"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s orain %s bezala ezaguna da"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s botata izan da%(reason)s -engatik: "
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afizioak: "
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "ID Jabber gelak ez du onartzen karaktererik."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -9262,65 +9891,59 @@ msgstr "_Report Bug"
 msgid "Details"
 msgstr "Zehaztapenak"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9330,194 +9953,180 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Harpidetza Eskaria"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Pasa-esaldia Behar da"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9527,104 +10136,90 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Zerrendatik kontaktua ezabatu"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Error opening file"
-msgstr "Errorea fitxeroa irakurtzean:"
+msgid "File Transfer Failed"
+msgstr "Fitxero Transferentzia"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr ""
+"%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9632,15 +10227,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9651,32 +10251,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9684,109 +10265,112 @@ msgid ""
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "%s direktorioa sortzen"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontaktua"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Izengoitia"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Mezua"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Gaia"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Garbitu nahi al duzu datu basea?(EZ DA GOMENDATZEN GAJIM ABIARAZIA BADAGO)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9800,97 +10384,109 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s-ean esan du: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Ziur al zaude hautaturiko kontaktuaren log-a ezabatu nahi duzula?"
-msgstr[1] ""
-"Ziur al zaude hautaturiko kontaktuaren log-ak ezabatu nahi dituzula?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Ziur al zaude hautaturiko kontaktuaren log-a ezabatu nahi duzula?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Kontaktuaren Informazioa"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezuak ezabatu nahi dituzula?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa Historiala %s-rekin"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s orain %(status)s dago: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Ezin izan da irudia kargatu"
+msgid "Loading"
+msgstr "Sortzen"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Mezuak"
 
@@ -9902,103 +10498,114 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Egoera Aldatu du"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "bederatzi"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Konektatuta"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Deskonektatuta"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Debekatzen %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Mezu Berria %(nickname)s -etik"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Konexioak huts egin du"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Mezu Pribatu Berri Bat %s gelatik"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Mezu Berria %(nickname)s -etik"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Fitxero hau jadanik badago"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Mezu Berria %(nickname)s -etik"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "bederatzi"
+msgid "Configuration"
+msgstr "Gelaren Konfigurazioa"
 
-#: ../src/profile_window.py:58
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Fitxeroaren tokia"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Profila jasotzen..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Honako gela honek ez du existitzen."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formatua: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informazioa jasoa"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Profila bidaltzen..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informazio EZ argitaratua"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10006,51 +10613,52 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10058,55 +10666,55 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, 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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -10115,11 +10723,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10128,69 +10736,69 @@ msgstr ""
 "Ezin izango duzu transporte hauetako kontaktuen mezuak jaso ezta bidali ere: "
 "%s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10199,12 +10807,12 @@ msgstr ""
 "deskonektatuta ikusiko zaitu beti."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10212,16 +10820,16 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10231,47 +10839,47 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -10282,24 +10890,29 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Bidali %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Egin %s eta %s metacontacts"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
@@ -10309,138 +10922,138 @@ msgstr "Egin %s eta %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda _Moldatu..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Komandoa Exekutatu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
@@ -10457,31 +11070,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Gaia: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10491,149 +11094,154 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "OpenPGP aktibatu al dago kontu honetarako?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ez dago zerrendan"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "Gela honetako %(owner_or_admin_or_member)s "
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Egoera: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Azken egoera: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " %s-etik"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Konektatu"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " %s-etik"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Gela:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktibatuta"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Mota:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Kontu Eraldaketa"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Gelditua"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10641,34 +11249,34 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10676,7 +11284,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10684,31 +11292,379 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Aukeratu Bidaltzeko Fitxeroa..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "leiho/tab bat kontaktu batekin irekia"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Ekintzak</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Baldintzak</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Ekintza Aurreratuak"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Notifikazio Aurreratuaren Kontrola"
+
+#~ msgid "All statuses"
+#~ msgstr "Egoera Guztiak"
+
+#~ msgid "Busy "
+#~ msgstr "Lanpetuta"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontaktu Egoera Aldaketa"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontaktua Deskonektatuta"
+
+#~ msgid "Don't have "
+#~ msgstr "Ez daukadanean"
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Fitxero Transferentzia Gelditua"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Txat Taldeko Mezu Nabarmendua"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Txat Taldeko Mezua Jasotzean"
+
+#~ msgid "Have "
+#~ msgstr "daukadanean"
+
+#~ msgid "Launch a command"
+#~ msgstr "Abiarazi agindua"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Egorera berezi bat edo gehiago..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Libre / Libre Hitz Egiteko"
+
+#~ msgid "Play a sound"
+#~ msgstr "Soinua ezarri"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Mezu Pribatu Berri Bat"
+
+#~ msgid "When "
+#~ msgstr "Denean"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Ezindu automatikoki elkarrizketa leihoa irikitzea"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Kendu esistitzen den popup leihoa "
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Ezindu esistitzen den soinua gertaera hontarako "
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Ezindu gertaeran zerrendan ikustea"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Ezindu gertaeran zerrendan ikustea"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Jakinarazi popup leiho batekin"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Ireki elkarrizketa leihoa erabiltzailearekin"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Ikusarazi gertaera zerrendan"
+
+#~ msgid "and I "
+#~ msgstr "eta nik"
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontaktua"
+
+#~ msgid "for "
+#~ msgstr "norentzat"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Taldea"
+
+#~ msgid "when I'm in"
+#~ msgstr "Nagoenean"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Zerrendara kontaktua sartu"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Baimendu nire egoera ikustea"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Deskribapena: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Aurreratua"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen "
+#~ "abatereak azalaraziko ditu"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen "
+#~ "abatereak azalaraziko ditu"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen "
+#~ "abatereak azalaraziko ditu"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Bidali _Mezu Bakarra..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Abatarea:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Behealako Mezularitza"
+
+#~ msgid "English"
+#~ msgstr "Ingelesa"
+
+#, fuzzy
+#~ msgid "Belarusian"
+#~ msgstr "Bulgariera"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgariera"
+
+#, fuzzy
+#~ msgid "Breton"
+#~ msgstr "Briton"
+
+#~ msgid "Czech"
+#~ msgstr "Czech"
+
+#~ msgid "German"
+#~ msgstr "Alemaniera"
+
+#~ msgid "Greek"
+#~ msgstr "Greziera"
+
+#, fuzzy
+#~ msgid "British"
+#~ msgstr "Briton"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperantoa"
+
+#~ msgid "Spanish"
+#~ msgstr "Gaztelania"
+
+#, fuzzy
+#~ msgid "Basque"
+#~ msgstr "Basc"
+
+#~ msgid "French"
+#~ msgstr "Frantsesa"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroaziera"
+
+#~ msgid "Italian"
+#~ msgstr "Italiera"
+
+#, fuzzy
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norvegian b"
+
+#~ msgid "Dutch"
+#~ msgstr "Alemana"
+
+#, fuzzy
+#~ msgid "Norwegian"
+#~ msgstr "Norbegiera"
+
+#~ msgid "Polish"
+#~ msgstr "Polakoa"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugesa"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brasileko Portugesa"
+
+#~ msgid "Russian"
+#~ msgstr "Rusiera"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Alemaniera"
+
+#~ msgid "Slovak"
+#~ msgstr "Eslovakoa"
+
+#~ msgid "Swedish"
+#~ msgstr "Swedish"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Txinera (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Ortografia hizkuntza"
+
+#~ msgid "all or space separated status"
+#~ msgstr "dena edo espazio egoera banandua"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'bai', 'ez', edo 'biak'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'bai', 'ez' edo ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Begira ezazu zure konexioa edo saiatu berriro"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "errorea: ezin da %s ireki irakurtzeko"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Unable to bind to port %s."
+
+#, fuzzy
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Beharbada beste Gajim prozesu bat abiarazita duzu. Fitxero transferentzia "
+#~ "bertan behera utziko da."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ jabber bezeroa"
+
+#~ msgid "Condition"
+#~ msgstr "Condition"
+
+#~ msgid "when I am "
+#~ msgstr "nagoenean"
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontaktua"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Gaia: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Gela:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktibatuta"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Ezindu gertaerak systray-en ikustea"
 
@@ -10726,29 +11682,12 @@ msgstr "baliabidea lehentasunarekin: "
 #~ 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"
 
@@ -10835,9 +11774,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ "Kontaktu zerrenda\n"
 #~ "Banner Elkarrizketa "
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Kontuak moldatu"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Ezabatu"
@@ -10941,9 +11877,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgstr ""
 #~ "Ez zaude konektatuta edo ikusezin zaude. Ezin izan da zure mezua bidali."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Mezu hau enkriptatua dago]"
-
 #~ msgid "%i days ago"
 #~ msgstr "%i egun lehenago"
 
@@ -10956,12 +11889,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Commands: %s"
 #~ msgstr "Azalpenak: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Erabilera: %s, testu leihoa itxi."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10970,10 +11897,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
 #~ "gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Ez dago laguntza informazioa  /%s -rentzat"
 
@@ -10990,10 +11913,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Izengoitia aurkitugabea: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -11004,14 +11923,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ "aldatu beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera "
 #~ "botatata izango da ere. Izengoitiak EZ du onartzen tarterik. "
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
-#~ "erabiltzaileari."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
@@ -11052,9 +11963,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11087,10 +11995,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "_Host:"
 #~ msgstr "_Host-a"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Ikusi _Zerrenda"
-
 #~ msgid "Modify Account"
 #~ msgstr "Kontua E_raldatu"
 
@@ -11185,9 +12089,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquy"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Sakatu kontaktu honen elkarrizketa zaharrak ikusteko"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Bista trikoa        Alt+C"
 
@@ -11200,9 +12101,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Query Builder..."
 #~ msgstr "Query Builder..."
 
-#~ msgid "Accept"
-#~ msgstr "Onartu"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Gonbidapena Jasoa"
 
@@ -11291,9 +12189,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "The auto away status message"
 #~ msgstr "Automatikoki kanpoko egoera mezua"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "Automatikoki ez erabilgarriko egoera mezua"
-
 #~ 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 "
@@ -11334,9 +12229,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Company:"
 #~ msgstr "Konpainia:"
 
-#~ msgid "Country:"
-#~ msgstr "Estatua:"
-
 #~ msgid "Given:"
 #~ msgstr "Emandako izena:"
 
diff --git a/po/fr.po b/po/fr.po
index 3d060cab9..08dfab112 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12 svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-18 12:14+0100\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2011-05-30 08:28+0100\n"
 "Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n"
 "Language-Team: <>\n"
@@ -23,326 +23,298 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-SearchPath-0: .\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "É_tat"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Évènements P_ersonnels"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "Commencer une _discussion..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Rejoindre un _salon de discussion..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Ajouter un contact..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Exécuter une commande..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Modifier le compte"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Accéder au compte Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Évènements P_ersonnels"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "Commencer une _discussion..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "É_tat"
+msgid "_Modify Account"
+msgstr "_Modifier le compte"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim : Assistant de création de compte"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Connexion au serveur</b>\n"
-"\n"
-"Veuillez patienter..."
+"Vous devez avoir un compte pour vous connecter\n"
+"au réseau Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Choisissez une des options suivantes :</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Remplissez les informations pour votre compte</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Veuillez choisir un serveur</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "Mot de _passe : "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Sauver le mot de _passe"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Authentification anon_yme"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Se connecter quand je clique sur Finir"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "Identifiant _Jabber : "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim : Assistant de création de compte"
+msgid "Anon_ymous authentication"
+msgstr "Authentification anon_yme"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Veuillez choisir un serveur</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Serveur :"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:30
-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"
+msgid "Prox_y:"
+msgstr "Prox_y :"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gérer..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:41 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284
-#: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746
-#: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406
-#: ../src/config.py:2419 ../src/config.py:3703 ../src/config.py:3778
-#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
-#: ../src/dialogs.py:532 ../src/roster_window.py:3133
-#: ../src/roster_window.py:3139 ../src/roster_window.py:3144
-msgid "None"
-msgstr "Aucun"
+msgid "Use custom hostname/port"
+msgstr "Utiliser un nom d'hôte/port personnalisé"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y :"
+msgid "_Hostname:"
+msgstr "Nom d'_Hôte :"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Save pass_word"
-msgstr "Sauver le mot de _passe"
+msgid "_Port:"
+msgstr "_Port :"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avancées"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Vous devez avoir un compte pour vous connecter\n"
-"au réseau Jabber."
+"Ajouter ce certificat à la liste des certificats de confiance.\n"
+"Empreinte digitale SHA1 du certificat :\n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:17
-msgid "_Advanced"
-msgstr "_Avancées"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Finir"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Nom d'_Hôte :"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Connexion au serveur</b>\n"
+"\n"
+"Veuillez patienter..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Jabber ID:"
-msgstr "Identifiant _Jabber : "
+msgid "Connect when I press Finish"
+msgstr "Se connecter quand je clique sur Finir"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:65
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "_Password:"
-msgstr "Mot de _passe : "
+msgid "Set my profile when I connect"
+msgstr "Définir mon profil quand je me connecte"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port :"
+msgid "_Finish"
+msgstr "_Finir"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-msgid "_Server:"
-msgstr "_Serveur :"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Divers</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Aucun"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Informations personnelles</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "_Ajuster selon l'état"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Compte"
-
-#: ../data/gui/accounts_window.ui.h:7
 msgid "Accounts"
 msgstr "Comptes"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3387
-#: ../src/dialogs.py:3433
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Administration operations"
-msgstr "Opérations d'administration"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Supprimer"
 
-#: ../data/gui/accounts_window.ui.h:10
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Re_nommer"
+
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Activ_er"
+
+#: ../data/gui/accounts_window.ui.h:7
 msgid "Anonymous authentication"
 msgstr "Authentification anonyme"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"La ressource est envoyée au serveur Jabber pour différencier les clients "
+"connectés au même serveur avec le même compte. Vous pouvez donc être "
+"connecté avec le même compte avec les ressources « Maison » et « Travail » "
+"en même temps. La ressource avec la plus haute priorité recevra les messages "
+"(voir plus bas)."
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
+#: ../data/gui/accounts_window.ui.h:10
+msgid "Synchronize contacts"
+msgstr "Synchroniser les contacts"
+
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Auto-reconnect when connection is lost"
-msgstr "Reconnexion automatique quand la connexion est perdue"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Cliquez pour demander l'autorisation à tous les contacts d'un autre compte"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "Browse..."
-msgstr "_Parcourir..."
+msgid "Chan_ge Password"
+msgstr "Chan_ger le mot de passe"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "C_onnect on Gajim startup"
-msgstr "C_onnexion au démarrage"
+msgid "Click to change account's password"
+msgstr "Cliquez pour changer le mot de passe du compte"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Certificate is e_ncrypted"
-msgstr "Le certificat est chiffré"
+msgid "Administration operations"
+msgstr "Opérations d'administration"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Chan_ge Password"
-msgstr "Chan_ger le mot de passe"
-
-#: ../data/gui/accounts_window.ui.h:16
 msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
+"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 ""
-"Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de "
-"passe via une connexion non-sécurisée"
+"La priorité est utilisée par Jabber pour déterminer qui reçoit les "
+"événements du serveur quand plusieurs clients sont connectés avec le même "
+"compte. Le client ayant la plus haute priorité recevra les messages"
+
+#: ../data/gui/accounts_window.ui.h:16
+msgid "A_djust to status"
+msgstr "_Ajuster selon l'état"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Choose _Key..."
-msgstr "Choisissez une _clé..."
+msgid "Priority will change automatically according to your status."
+msgstr "La priorité va changer automatiquement selon votre état."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to change account's password"
-msgstr "Cliquez pour changer le mot de passe du compte"
+msgid "Priori_ty:"
+msgstr "Priori_té :"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Cliquez pour demander l'autorisation à tous les contacts d'un autre compte"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Client certificate"
-msgstr "Certificat client"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Co_nnect on Gajim startup"
-msgstr "C_onnexion au démarrage de Gajim"
-
-#: ../data/gui/accounts_window.ui.h:22
-msgid "Connection"
-msgstr "Connexion"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3391
-#: ../src/dialogs.py:3488
-msgid "Delete"
-msgstr "Supprimer"
+msgid "Resour_ce:"
+msgstr "Ressour_ce: "
 
 #: ../data/gui/accounts_window.ui.h:24
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Courriel :"
+msgid "_Client Cert File:"
+msgstr "Fichier du _certificat client:"
 
 #: ../data/gui/accounts_window.ui.h:25
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Prénom :"
+msgid "Browse..."
+msgstr "_Parcourir..."
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:26 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1168 ../src/common/helpers.py:1180
-#: ../src/notify.py:314 ../src/notify.py:337 ../src/notify.py:387
-#: ../src/notify.py:403
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:26
+msgid "Certificate is e_ncrypted"
+msgstr "Le certificat est chiffré"
 
-#. 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:27 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
-#: ../src/roster_window.py:3075 ../src/roster_window.py:4142
-#: ../src/roster_window.py:5732
-msgid "General"
-msgstr "Général"
+#: ../data/gui/accounts_window.ui.h:27
+msgid "Client certificate"
+msgstr "Certificat client"
 
 #: ../data/gui/accounts_window.ui.h:28
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la "
-"vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner."
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Compte"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent "
-"GPG comme seahorse"
-
-#: ../data/gui/accounts_window.ui.h:31
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Si coché, Gajim enverra des paquets de maintien de connection pour prévenir "
-"des temps de latence pouvant entraîner des déconnexions"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onnexion au démarrage"
 
-#: ../data/gui/accounts_window.ui.h:32
+#: ../data/gui/accounts_window.ui.h:30
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -350,7 +322,19 @@ msgstr ""
 "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement "
 "à jabber en utilisant ce compte"
 
+#: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Reconnexion automatique quand la connexion est perdue"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Garder l'_historique des conversations pour tous les contacts"
+
 #: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "S_ynchroniser l'état du compte avec l'état global"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -360,172 +344,206 @@ msgstr ""
 "l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état "
 "de ce compte"
 
-#: ../data/gui/accounts_window.ui.h:34
-msgid ""
-"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 ""
-"Si le port par défaut utilisé pour les messages entrants n'est pas adapté à "
-"vos besoins, vous pouvez en spécifier un ici.\n"
-"Vous devriez considérer modifier les paramètres de votre pare-feu si vous en "
-"avez un."
+#: ../data/gui/accounts_window.ui.h:35
+msgid "Use file transfer proxies"
+msgstr "Utiliser les proxies pour les transferts de fichiers"
 
 #: ../data/gui/accounts_window.ui.h:36
-msgid "Information about you, as stored in the server"
-msgstr "Les informations vous concernant, stockées sur le serveur"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la "
+"vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner."
 
-#: ../data/gui/accounts_window.ui.h:37
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1869
-#: ../src/dialogs.py:837
-msgid "Jabber ID:"
-msgstr "Identifiant Jabber :"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Général"
 
 #: ../data/gui/accounts_window.ui.h:38
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Nom :"
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_utiliser la variable d'environnement HTTP__PROXY"
 
-#: ../data/gui/accounts_window.ui.h:39
-msgid "Mer_ge accounts"
-msgstr "_Regrouper les comptes"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Gérer..."
 
-#: ../data/gui/accounts_window.ui.h:40 ../src/config.py:1842
-#: ../src/config.py:2420
-msgid "No key selected"
-msgstr "Pas de clé sélectionnée"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
-#: ../data/gui/accounts_window.ui.h:42 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Informations personnelles"
+#: ../data/gui/accounts_window.ui.h:41
+msgid "_Warn before using an insecure connection"
+msgstr "_Prévenir avant d'utiliser une connexion non sécurisée"
+
+#: ../data/gui/accounts_window.ui.h:42
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de "
+"passe via une connexion non-sécurisée"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priori_ty:"
-msgstr "Priori_té :"
+msgid "Send _keep-alive packets"
+msgstr "Envoi des pa_quets de maintien de connexion"
 
 #: ../data/gui/accounts_window.ui.h:44
 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"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
-"La priorité est utilisée par Jabber pour déterminer qui reçoit les "
-"événements du serveur quand plusieurs clients sont connectés avec le même "
-"compte. Le client ayant la plus haute priorité recevra les messages"
+"Si coché, Gajim enverra des paquets de maintien de connection pour prévenir "
+"des temps de latence pouvant entraîner des déconnexions"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Priority will change automatically according to your status."
-msgstr "La priorité va changer automatiquement selon votre état."
+msgid "Use cust_om hostname/port"
+msgstr "Utiliser un nom d'hôte/port personnalisé"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5682
-msgid "Re_name"
-msgstr "Re_nommer"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "_Hostname: "
+msgstr "Nom d'_Hôte :"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Resour_ce:"
-msgstr "Ressour_ce: "
+msgid "_Port: "
+msgstr "_Port :"
 
-#: ../data/gui/accounts_window.ui.h:48
-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 ""
-"La ressource est envoyée au serveur Jabber pour différencier les clients "
-"connectés au même serveur avec le même compte. Vous pouvez donc être "
-"connecté avec le même compte avec les ressources « Maison » et « Travail » "
-"en même temps. La ressource avec la plus haute priorité recevra les messages "
-"(voir plus bas)."
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Divers</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Save conversation _logs for all contacts"
-msgstr "Garder l'_historique des conversations pour tous les contacts"
+msgid "Connection"
+msgstr "Connexion"
+
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Pas de clé sélectionnée"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Send _keep-alive packets"
-msgstr "Envoi des pa_quets de maintien de connexion"
+msgid "Choose _Key..."
+msgstr "Choisissez une _clé..."
 
 #: ../data/gui/accounts_window.ui.h:52
-msgid "Synch_ronize account status with global status"
-msgstr "S_ynchroniser l'état du compte avec l'état global"
+msgid "Use G_PG Agent"
+msgstr "Utiliser un Agent G_PG"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "Synchroni_ze account status with global status"
-msgstr "S_ynchroniser l'état du compte avec l'état global"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent "
+"GPG comme seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Synchronize contacts"
-msgstr "Synchroniser les contacts"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use G_PG Agent"
-msgstr "Utiliser un Agent G_PG"
+msgid "_Edit Personal Information..."
+msgstr "_Éditer les informations personnelles…"
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om hostname/port"
-msgstr "Utiliser un nom d'hôte/port personnalisé"
+msgid "Information about you, as stored in the server"
+msgstr "Les informations vous concernant, stockées sur le serveur"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use cust_om port:"
-msgstr "Utiliser un port pers_onnalisé :"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Informations personnelles</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "Use file transfer proxies"
-msgstr "Utiliser les proxies pour les transferts de fichiers"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Informations personnelles"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Client Cert File:"
-msgstr "Fichier du _certificat client:"
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onnexion au démarrage de Gajim"
 
 #: ../data/gui/accounts_window.ui.h:60
-msgid "_Edit Personal Information..."
-msgstr "_Éditer les informations personnelles…"
+msgid "Synchroni_ze account status with global status"
+msgstr "S_ynchroniser l'état du compte avec l'état global"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:61 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Activ_er"
+#: ../data/gui/accounts_window.ui.h:61
+msgid "Use cust_om port:"
+msgstr "Utiliser un port pers_onnalisé :"
 
 #: ../data/gui/accounts_window.ui.h:62
-msgid "_Hostname: "
-msgstr "Nom d'_Hôte :"
+msgid ""
+"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 ""
+"Si le port par défaut utilisé pour les messages entrants n'est pas adapté à "
+"vos besoins, vous pouvez en spécifier un ici.\n"
+"Vous devriez considérer modifier les paramètres de votre pare-feu si vous en "
+"avez un."
 
-#: ../data/gui/accounts_window.ui.h:64 ../data/gui/preferences_window.ui.h:133
-msgid "_Manage..."
-msgstr "_Gérer..."
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Prénom :"
+
+#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Nom :"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Port: "
-msgstr "_Port :"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Courriel :"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_Warn before using an insecure connection"
-msgstr "_Prévenir avant d'utiliser une connexion non sécurisée"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Identifiant Jabber :"
 
 #: ../data/gui/accounts_window.ui.h:68
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_utiliser la variable d'environnement HTTP__PROXY"
+msgid "Mer_ge accounts"
+msgstr "_Regrouper les comptes"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Compte :"
+msgid "Add New Contact"
+msgstr "Ajouter un nouveau contact"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "_Autoriser ce contact à voir mon état"
+msgid "A_ccount:"
+msgstr "_Compte :"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Ajouter un nouveau contact"
+msgid "_Protocol:"
+msgstr "_Protocole :"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1359
-msgid "I would like to add you to my contact list."
-msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Identifiant :"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Surnom :"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Groupe :"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "_Autoriser ce contact à voir mon état"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "_Sauver le message d'abonnement"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -537,7 +555,11 @@ msgstr ""
 "protocole. Pour ce faire, cliquez sur le\n"
 "bouton « souscrire »."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Souscrire"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -545,399 +567,369 @@ msgstr ""
 "Vous devez être connecté à la passerelle pour\n"
 "pouvoir ajouter un contact de ce protocole."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Groupe :"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "_Nickname:"
-msgstr "_Surnom :"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocole :"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Souscrire"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "_Sauver le message d'abonnement"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Identifiant :"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Une erreur est survenue :</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Commandes Ad-hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
+msgid "Please wait while retrieving command list..."
+msgstr ""
+"Merci de patienter pendant la récupération de la liste des commandes..."
+
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Commande à exécuter :</b>"
 
-#. displaying the window
-#: ../data/gui/adhoc_commands_window.ui.h:3 ../src/adhoc_commands.py:102
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Commandes Ad-hoc - Gajim"
-
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Revérifier"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Description de l'erreur..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Merci de patienter pendant l'envoi de la commande..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "F_inir"
+msgid "Please wait..."
+msgstr "Veuillez patienter..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr ""
-"Merci de patienter pendant la récupération de la liste des commandes..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Cette entité jabber n'affiche pas de commandes."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Merci de patienter pendant l'envoi de la commande..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Une erreur est survenue :</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Veuillez patienter..."
+msgid "Error description..."
+msgstr "Description de l'erreur..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Cette entité jabber n'affiche pas de commandes."
+msgid "F_inish"
+msgstr "F_inir"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Éditeur de configuration avancée"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtre :"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Description</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTE :</b> Vous devriez redémarrer Gajim pour prendre en compte certaines "
 "de vos modifications."
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Éditeur de configuration avancée"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtre :"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Utilise_r les couleurs par défaut"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Supprimer MOTD"
+msgid "Show _XML Console"
+msgstr "Montrer la console _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "Supprime le message du jour"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "Éditer les préférences d'archi_vages"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Éditer les Listes _privées..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrateur"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Envoyer un message au serveur..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Définir MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Mets un message du jour"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Montrer la console _XML"
+msgid "Set MOTD..."
+msgstr "Définir MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Mettre à jour MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Mettre à jour MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrateur"
+msgid "Delete MOTD"
+msgstr "Supprimer MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Envoyer un message au serveur..."
+msgid "Deletes Message of the Day"
+msgstr "Supprime le message du jour"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr "<i>Méthode Automatique</i>"
+msgid "No"
+msgstr "Non"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr "<i>Méthode locale</i>"
+msgid "Yes"
+msgstr "Oui"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr "<i>Méthode manuelle</i>"
+msgid "Prefer"
+msgstr "Préfère"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-msgid "Auto"
-msgstr "Auto"
-
-#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Concede"
 msgstr "Autoriser"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "Interdire"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr "<i>Méthode manuelle</i>"
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "Non"
+msgid "<i>Method Local</i>"
+msgstr "<i>Méthode locale</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-msgid "Prefer"
-msgstr "Préfère"
+msgid "<i>Method Auto</i>"
+msgstr "<i>Méthode Automatique</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Oui"
+msgid "Auto"
+msgstr "Auto"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Article :"
+msgid "New entry received"
+msgstr "Nouvel événement reçu"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Vous avez publié l'article :"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Nom du fil :"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Article :"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Dernière modification :"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Nouvel événement reçu"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Vous avez publié l'article :"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:14 ../src/roster_window.py:5701
-#: ../src/roster_window.py:5828 ../src/roster_window.py:5961
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Débloquer"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Message :</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Définir l'Activité"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Publier une activité"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Message :</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Message :</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humeur :</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Message :</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Entrez le à nouveau pour confirmer :"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Entrez un nouveau mot de passe :"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Entrez le à nouveau pour confirmer :"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Taper votre nouveau message d'état</b>"
+msgid "Save as Preset..."
+msgstr "Enregistrer comme messages d'état prédéfini..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Activité :"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Humeur :"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Activité :"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Messages prédéfinis :"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Enregistrer comme messages d'état prédéfini..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Taper votre nouveau message d'état</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Rejoindre un _salon de discussion"
+msgid "_Copy Link Location"
+msgstr "_Copier l'adresse du lien"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Add to Roster..."
-msgstr "_Ajouter à la liste de contacts..."
+msgid "_Open Link in Browser"
+msgstr "_Ouvrir le lien dans votre navigateur"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copier l'identifiant Jabber / l'adresse électronique"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copier l'adresse du lien"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Ouvrir le logiciel de courriel"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Ouvrir le lien dans votre navigateur"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "Commencer une _discussion"
 
-#: ../data/gui/chat_control.ui.h:1
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Rejoindre un _salon de discussion"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Ajouter à la liste de contacts..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Afficher une liste des émoticônes (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Ajouter le contact à la liste de contacts (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter des contacts dans la conversation (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Inviter des contacts dans la conversation (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Parcourir l'historique des conversations (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Affiche un menu de fonctions avancées (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Envoyer le message"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "En_voyer"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr "9"
 
-#: ../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
-#: ../src/command_system/implementation/standard.py:214
-msgid "Toggle audio session"
-msgstr "Démarrer/arrêter une session audio"
-
-#: ../data/gui/chat_control.ui.h:21
-#: ../src/command_system/implementation/standard.py:224
-msgid "Toggle video session"
-msgstr "Démarrer/arrêter une session vidéo"
+msgid "*"
+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:277
-msgid "_Send"
-msgstr "En_voyer"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "In_viter"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Inviter des Amis !"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Serveur de salon"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Veuillez choisir un serveur de Salons de Discussion."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -945,120 +937,135 @@ msgstr ""
 "Vous allez commencer une Conversation Groupée.\n"
 "Sélectionnez les contacts que vous voulez inviter"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Demander à voir son état"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Veuillez choisir un serveur de Salons de Discussion."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Ajouter une _Notification Spéciale..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Serveur de salon"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Assigner une clé Open_PGP..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "In_viter"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "E_xécuter une commande…"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Commencer une _discussion"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Éditer les _groupes..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Envoyer un _message simple..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Envoyer un _fichier..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5637
-#: ../src/roster_window.py:5796
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_viter à"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Inviter des _Contacts"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "M_anage Contact"
-msgstr "_Gérer le Contact"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Activer le chiffrement _GPG"
 
-#: ../data/gui/contact_context_menu.ui.h:9
-msgid "Remo_ve"
-msgstr "Suppri_mer"
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Activer le chiffrement de bout en bout"
 
-#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5647
-#: ../src/roster_window.py:5885
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Envoyer un Statut Personnalisé"
 
-#: ../data/gui/contact_context_menu.ui.h:11 ../data/gui/roster_window.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Envoyer un _message simple..."
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "E_xécuter une commande…"
+
+#: ../data/gui/contact_context_menu.ui.h:10
+msgid "M_anage Contact"
+msgstr "_Gérer le Contact"
+
+#: ../data/gui/contact_context_menu.ui.h:11
+msgid "_Rename..."
+msgstr "_Renommer..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Send _File..."
-msgstr "Envoyer un _fichier..."
+msgid "Edit _Groups..."
+msgstr "Éditer les _groupes..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Set Custom _Avatar..."
-msgstr "Définir un _Avatar personnalisé..."
+msgid "Assign Open_PGP Key..."
+msgstr "Assigner une clé Open_PGP..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Start _Chat"
-msgstr "Commencer une _discussion"
+msgid "Set Custom _Avatar..."
+msgstr "Définir un _Avatar personnalisé..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle End to End Encryption"
-msgstr "Activer le chiffrement de bout en bout"
+msgid "Add Special _Notification..."
+msgstr "Ajouter une _Notification Spéciale..."
 
 #: ../data/gui/contact_context_menu.ui.h:16
-msgid "Toggle Open_PGP Encryption"
-msgstr "Activer le chiffrement _GPG"
+msgid "_Subscription"
+msgstr "_Autorisation"
+
+#: ../data/gui/contact_context_menu.ui.h:17
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "_Autoriser ce contact à voir mon état"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-msgid "_Allow him/her to see my status"
-msgstr "L'autoriser à voir mon état"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Demander à voir son état"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5709
-#: ../src/roster_window.py:5834 ../src/roster_window.py:5964
-msgid "_Block"
-msgstr "_Bloquer"
-
-#: ../data/gui/contact_context_menu.ui.h:20
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "Interdire de voir mon état"
 
 #: ../data/gui/contact_context_menu.ui.h:21
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
-#: ../src/roster_window.py:6035
-msgid "_History"
-msgstr "_Historique"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Bloquer"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Ignore"
-msgstr "_Ignorer"
+msgid "_Unignore"
+msgstr "_Ne plus ignorer"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Renommer..."
+msgid "_Ignore"
+msgstr "_Ignorer"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Autorisation"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Suppri_mer"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Ne plus ignorer"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historique"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Remplissez le formulaire."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuration du salon de discussion"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Remplissez le formulaire."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Éditer les groupes"
@@ -1071,57 +1078,50 @@ msgstr "(Info <b>ESession</b>)"
 msgid "_Verify"
 msgstr "_Vérifier"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Fonctionnalités"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Liste des fonctionnalités disponibles dans Gajim :</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Fonctionnalités"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Une liste des transferts de fichier actifs, terminés et arrêtés"
+msgid "File Transfers"
+msgstr "Transfert de fichiers"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Annule le transfert de fichier"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Affiche une liste des transferts de fichiers entre vous et les autres"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Annule le transfert du fichier sélectionné"
+msgid "file transfers list"
+msgstr "liste des transferts de fichier"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Annule le transfert du fichier sélectionné et supprime le fichier incomplet"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Une liste des transferts de fichier actifs, terminés et arrêtés"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Nettoyer"
+msgid "_Notify me when a file transfer is complete"
+msgstr "Me _signaler quand un transfert de fichier est terminé"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Transfert de fichiers"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+"Quand le transfert de fichier est terminé, montrer une fenêtre de "
+"notification"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Cache la fenêtre"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr ""
+"Supprimer les transferts de fichier terminés, annulés et échoués de la liste"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Supprimer le transfert de fichier de la liste."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr ""
-"Supprimer les transferts de fichier terminés, annulés et échoués de la liste"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Affiche une liste des transferts de fichiers entre vous et les autres"
-
-#: ../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"
@@ -1129,82 +1129,106 @@ msgstr ""
 "Cette action supprime les transferts de fichier de la liste. Si le transfert "
 "est actif, il est d'abord arrêté puis supprimé"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Nettoyer"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pause"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
-"Quand le transfert de fichier est terminé, montrer une fenêtre de "
-"notification"
+"Annule le transfert du fichier sélectionné et supprime le fichier incomplet"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:808
-msgid "_Continue"
-msgstr "_Continuer"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Annule le transfert de fichier"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "Me _signaler quand un transfert de fichier est terminé"
+msgid "Cancels the selected file transfer"
+msgstr "Annule le transfert du fichier sélectionné"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/chat_control.py:3236
-#: ../src/filetransfers_window.py:206
-msgid "_Open Containing Folder"
-msgstr "_Ouvrir le répertoire de destination"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Cache la fenêtre"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pause"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Continuer"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "liste des transferts de fichier"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Ouvrir le répertoire de destination"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Couleurs des Onglets</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "Ligne de compte"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1040
-msgid "Bold"
-msgstr "Gras"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "Ligne de groupe"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "Ligne de contact"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "Bannière"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "En train d'écrire"
+msgid "Gajim Themes Customization"
+msgstr "Personnalisation des thèmes de Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "Ligne de contact"
+msgid "Text _color:"
+msgstr "_Couleur du texte :"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Style de la police :"
+msgid "_Background:"
+msgstr "_Arrière-plan :"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personnalisation des thèmes de Gajim"
+msgid "Text _font:"
+msgstr "_Police du texte :"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Parti"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "Ligne de groupe"
+msgid "Font style:"
+msgstr "Style de la police :"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inactif"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Gras"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1041
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Italique"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pause"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "En train d'écrire"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inactif"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Couleurs des Onglets</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Parti"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1212,7 +1236,7 @@ msgstr ""
 "Messages\n"
 "de salon"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1221,109 +1245,97 @@ msgstr ""
 "dirigés dans\n"
 "les salons"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pause"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Couleur du texte :"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Police du texte :"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Arrière-plan :"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Changer de Sur_nom..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Gérer le Salon"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Changer le _Sujet..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Configurer le _Salon..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Marque-pages"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Détruire le Salon"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Gérer le Salon"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimiser à la fermeture"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_control_popup_menu.ui.h:7
 msgid "_Request Voice"
 msgstr "_Demander la parole"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Marque-pages"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "_Send Private Message"
+msgstr "_Envoyer un message privé"
+
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Mo_derator"
-msgstr "Mo_dérer"
+msgid "Send _File"
+msgstr "Envoyer un _fichier"
 
 #: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "Actions des Occupants"
 
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "Send _File"
-msgstr "Envoyer un _fichier"
+msgid "_Voice"
+msgstr "_S'exprimer"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
-msgid "_Add to Roster"
-msgstr "_Ajouter à la liste de contacts"
+msgid "Mo_derator"
+msgstr "Mo_dérer"
 
 #: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membre"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administrateur"
 
-#: ../data/gui/gc_occupants_menu.ui.h:7
-msgid "_Ban"
-msgstr "_Bannir"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "Pr_opriétaire"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Éjecter"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Member"
-msgstr "_Membre"
+#: ../data/gui/gc_occupants_menu.ui.h:10
+msgid "_Ban"
+msgstr "_Bannir"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Owner"
-msgstr "Pr_opriétaire"
-
-#: ../data/gui/gc_occupants_menu.ui.h:13
-msgid "_Send Private Message"
-msgstr "_Envoyer un message privé"
-
-#: ../data/gui/gc_occupants_menu.ui.h:15
-msgid "_Voice"
-msgstr "_S'exprimer"
+msgid "_Add to Roster"
+msgstr "_Ajouter à la liste de contacts"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Afficher une liste de styles"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Changer votre surnom (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Enregistrer ce salon dans les marque-pages (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1335,34 +1347,19 @@ msgid "From:"
 msgstr "De :"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Sujet :"
 
 #: ../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."
-msgstr ""
-"<b>ATTENTION :</b>\n"
-"Si vous comptez faire beaucoup de suppressions, vérifiez que Gajim n'est pas "
-"lancé. Évitez les suppressions de contacts avec qui vous êtes en train de "
-"parler."
+msgid "Gajim History Logs Manager"
+msgstr "Gestionnaire d'historique de Gajim"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenue dans le Gestionnaire d'Archives Gajim</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "Exporter"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Gestionnaire d'historique de Gajim"
-
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1378,26 +1375,41 @@ msgstr ""
 "sélectionner les archives à droite et/ou chercher dans la base de donnée en "
 "bas."
 
-#: ../data/gui/history_manager.ui.h:9
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>ATTENTION :</b>\n"
+"Si vous comptez faire beaucoup de suppressions, vérifiez que Gajim n'est pas "
+"lancé. Évitez les suppressions de contacts avec qui vous êtes en train de "
+"parler."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Rechercher dans la base de données"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "Tous les historiques"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:324
-msgid "Conversation History"
-msgstr "Historique de conversation"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Exporter"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "Entrer un JID ou un nom de contact"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr "Historique de salons de discussion"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "Tous les historiques"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Historique de conversation"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Chercher :"
@@ -1407,142 +1419,145 @@ msgid "_In date search"
 msgstr "Chercher à cette date"
 
 #: ../data/gui/history_window.ui.h:7
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#, fuzzy
+msgid "Searching only in the selected day "
+msgstr "cherche uniquement à la date sélectionnée "
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
-#: ../data/gui/history_window.ui.h:8
-msgid "searching only in the selected day "
-msgstr "cherche uniquement à la date sélectionnée "
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "Inscrire dans l'_historique les changements d'état des contacts"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
-msgstr "approuver"
+msgid "expire"
+msgstr "expirer"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
-msgstr "corps"
+msgid "save"
+msgstr "enregistrer"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr "concéder"
+msgid "otr"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr "expirer"
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "identifiant Jabber"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr "faux"
+msgid "body"
+msgstr "corps"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
-msgstr "interdire"
+msgid "false"
+msgstr "faux"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "identifiant Jabber"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../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:8
+msgid "stream"
+msgstr "flux"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
-msgstr "opposer"
+msgid "approve"
+msgstr "approuver"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
-msgstr "otr"
+msgid "concede"
+msgstr "concéder"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
-msgstr "préfère"
+msgid "forbid"
+msgstr "interdire"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
-msgstr "nécessite"
+msgid "oppose"
+msgstr "opposer"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr "enregistrer"
+msgid "prefer"
+msgstr "préfère"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
-msgstr "flux"
-
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "_Parcourir les salons"
+msgid "require"
+msgstr "nécessite"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2337
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "Joindre ce s_alon de discussion quand je me connecte"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Salon de discussion :"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Surnom :"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Récemment :"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Récemment :"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "Joindre ce s_alon de discussion quand je me connecte"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-msgid "Room:"
-msgstr "Salon de discussion :"
+msgid "_Bookmark this room"
+msgstr "Enregistrer ce salon dans les marque-pages"
 
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1859
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Serveur :"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "Enregistrer ce salon dans les marque-pages"
+msgid "Bro_wse Rooms"
+msgstr "_Parcourir les salons"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "Re_joindre"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "A_uto join"
-msgstr "Rejoindre automatiquement"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gérer les marque-pages"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimi_ze on Auto Join"
-msgstr "_Minimiser automatiquement"
+msgid "Roo_m:"
+msgstr "_Salon:"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Title:"
+msgstr "_Titre :"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Pr_int status:"
 msgstr "_Afficher l'état :"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Roo_m:"
-msgstr "_Salon:"
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "A_uto join"
+msgstr "Rejoindre automatiquement"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "_Title:"
-msgstr "_Titre :"
+msgid "Minimi_ze on Auto Join"
+msgstr "_Minimiser automatiquement"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1553,124 +1568,129 @@ msgid "_Configure"
 msgstr "_Configurer"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Propriétés</b>"
+msgid "HTTP Connect"
+msgstr "Connexion HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Paramètres</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "Connexion HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de proxies"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Type : "
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Mot de passe : "
+msgid "_Name:"
+msgstr "_Nom :"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Hôte du proxy :"
+msgid "<b>Properties</b>"
+msgstr "<b>Propriétés</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "_Port du proxy :"
+msgid "Use HTTP prox_y"
+msgstr "Utiliser un prox_y HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL :"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Utiliser un prox_y HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Utiliser l'auth_entification"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Nom :"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL :"
+msgid "Pass_word:"
+msgstr "_Mot de passe : "
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Nom :"
+msgid "Proxy _Host:"
+msgstr "Hôte du proxy :"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Type : "
+msgid "Proxy _Port:"
+msgstr "_Port du proxy :"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Nom :"
+msgid "<b>Settings</b>"
+msgstr "<b>Paramètres</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Gérer les comptes"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Mot de passe"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;vide&gt;"
+msgid "Plugins"
+msgstr "Plugins"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<vide>"
+msgid "Install from zip"
+msgstr "Installer d'un zip"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "Auteurs :"
+msgid "&lt;empty&gt;"
+msgstr "&lt;vide&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Configure"
-msgstr "Configurer"
+msgid "Version:"
+msgstr "Version :"
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Description:"
-msgstr "Description :"
+msgid "<empty>"
+msgstr "<vide>"
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Homepage:"
-msgstr "Site perso :"
+msgid "Authors:"
+msgstr "Auteurs :"
 
 #: ../data/gui/plugins_window.ui.h:7
-msgid "Install from zip"
-msgstr "Installer d'un zip"
+msgid "Homepage:"
+msgstr "Site perso :"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Installed"
-msgstr "Installé"
+msgid "homepage url"
+msgstr "url de la page d'accueil"
 
 #: ../data/gui/plugins_window.ui.h:9
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
-msgstr ""
-"La description du plugin doit se trouver ici. Ce teste sera effacé lors de "
-"l'initialisation de la fenêtre de plugins."
+msgid "Description:"
+msgstr "Description :"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../data/gui/plugins_window.ui.h:11
 msgid "Uninstall"
 msgstr "Désintaller"
 
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Configure"
+msgstr "Configurer"
+
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Version:"
-msgstr "Version :"
+msgid "Installed"
+msgstr "Installé"
 
 #: ../data/gui/plugins_window.ui.h:13
-msgid "homepage url"
-msgstr "url de la page d'accueil"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+"La description du plugin doit se trouver ici. Ce teste sera effacé lors de "
+"l'initialisation de la fenêtre de plugins."
 
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
@@ -1681,215 +1701,278 @@ msgid "Event desc"
 msgstr "Événement"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Éditeur de configuration avancée</b>"
+msgid "Use default applications"
+msgstr "Toujours utiliser les applications par défaut."
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Applications</b>"
+msgid "Custom"
+msgstr "Personnalisé"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
+msgid "All chat states"
+msgstr "Tous les états"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Statut Automatique</b>"
+msgid "Composing only"
+msgstr "Seulement en train d'écrire"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Apparence des conversations</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Désactivé"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Couleurs des messages</b>"
+msgid "Never"
+msgstr "Jamais"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notifications visuelles</b>"
+msgid "Only when pending events"
+msgstr "Seulement lorsqu'il y a des évènements en attente"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Connexions</b>"
+msgid "Always"
+msgstr "Toujours"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "Faire surgir un pop up"
 
-#. 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>Paramètres personnalisés</b>"
+msgid "Notify me about it"
+msgstr "Me le signaler"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Police d'écriture</b>"
+msgid "Show only in roster"
+msgstr "Ne le montrer que dans la liste"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Paramètres Gmail</b>"
+msgid "Detached roster with detached chats"
+msgstr "Liste des contacts détachée avec conversations détachéee"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "Liste des contacts détachée avec conversations groupées"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Messages d'état prédéfinis</b>"
+msgid "Single window for everything"
+msgstr "Une seule fenêtre pour tout"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Vie privée</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "Liste des contacts détachée avec conversations groupées par compte"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Apparence de la fenêtre principale</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "Liste des contacts détachée avec conversations groupées par type"
 
 #: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sons</b>"
+msgid "Last state"
+msgstr "Dernier état"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Messages d'état prédéfinis</b>"
+msgid "Preferences"
+msgstr "Préférences"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Thèmes</b>"
+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:20
-msgid "<b>Video</b>"
-msgstr "<b>Vidéo</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+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:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notifications visuelles</b>"
+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:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(exemple: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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:23
-msgid "Advanced"
-msgstr "Avancées"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Afficher la localisation des contacts dans la liste"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "All chat states"
-msgstr "Tous les états"
+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:25
-msgid "Allow client / _OS information to be sent"
-msgstr ""
-"Envoyer des informations concernant votre client / _système d'exploitation"
+msgid "Sort contacts by status"
+msgstr "Trier les contacts par état"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow local system time information to be sent"
-msgstr "Envoyer des informations concernant l'heure de votre système"
+msgid "in _roster"
+msgstr "dans le _roster"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "Envoyer mon temps d'inactivité"
+msgid "in _group chats"
+msgstr "dans les _salons de discussion"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Autoriser les _notifications lorsque je suis absent(e)/indisponible/occupé"
-"(e)/invisible"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Apparence de la fenêtre principale</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Autoriser les sons quand je suis _occupé(e)"
+msgid "_Window behavior:"
+msgstr "Comportement de la _fenêtre :"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "Toujours"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Demander le message d'état lorsque je me : "
+msgid "_Emoticons:"
+msgstr "É_moticônes :"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:106
-msgid "Audio / Video"
-msgstr "Audio / Vidéo"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Rendre les fenêtres de conversation _compactes"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "Périphérique audio d'entrée"
+msgid "Hide all buttons in chat windows"
+msgstr "Cacher tous les boutons dans les fenêtres de conversations"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "Périphérique audio de sortie"
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorer le formatage complexe du texte dans les messages entrants"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Message de conversation :"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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: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"
+msgid "_Highlight misspelled words"
+msgstr "_Souligner les fautes d'orthographe"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
-msgstr "Seulement en train d'écrire"
+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 ""
+"Si cette case est cochée, Gajim soulignera les erreurs d'orthographe dans le "
+"champ de saisie des fenêtres de conversation. Si aucune langue n'a été "
+"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:38
-msgid "Configure color and font of the interface"
-msgstr "Paramétrer la couleur et la police de texte de l'interface"
+msgid "_Show roster on startup:"
+msgstr "Montrer la _liste au démarrage:"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "Le message du contact :"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Son émis lors de l'arrivée d'un message de salon de discussion."
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "Le pseudo du contact :"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Personnalisé"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Apparence des conversations</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr "Liste des contacts détachée avec conversations groupées par compte"
+msgid "When new event is received:"
+msgstr "Quand un nouvel événement est reçu :"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr "Liste des contacts détachée avec conversations groupées par type"
+msgid "Notify me about contacts that sign _in"
+msgstr "Me signaler les contacts qui se _connectent"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr "Liste des contacts détachée avec conversations détachéee"
+msgid "Notify me about contacts that sign _out"
+msgstr "Me signaler les contacts qui se _déconnectent"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr "Liste des contacts détachée avec conversations groupées"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+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:46 ../src/config.py:171
-#: ../src/config.py:683
-msgid "Disabled"
-msgstr "Désactivé"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Autoriser les _notifications lorsque je suis absent(e)/indisponible/"
+"occupé(e)/invisible"
 
 #: ../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"
+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:48
-msgid "Display _extra email details"
-msgstr "Afficher des informations détaillées de courriels"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+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:49
-msgid "Display _location of contacts in roster"
-msgstr "Afficher la localisation des contacts dans la liste"
+msgid "Display _extra email details"
+msgstr "Afficher des informations détaillées de courriels"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Afficher ce que mes contacts écoutent"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+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:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Afficher l'a_vatar des contacts dans la liste des contacts"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Paramètres Gmail</b>"
 
 #: ../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"
+msgid "Show notification area icon:"
+msgstr "Montrer l'icone de la zone de notification :"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notifications visuelles</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "_Jouer les sons"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "_Gérer..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Autoriser les sons quand je suis _occupé(e)"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sons</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../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 "
@@ -1899,7 +1982,11 @@ 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:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Afficher les notifications d'état :"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -1909,697 +1996,618 @@ 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: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 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:58
-msgid "Global proxy:"
-msgstr "Proxy global :"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid "Hide all buttons in chat windows"
-msgstr "Cacher tous les boutons dans les fenêtres de conversations"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-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:61
-msgid "If checked, Gajim will allow others to detect the time on your system"
-msgstr ""
-"Si cette case est cochée, Gajim autorisera les autres à détecter l'heure de "
-"votre système"
-
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Si cette case est cochée, Gajim affichera également des informations à "
-"propos de l'expéditeur des nouveaux courriels"
+msgid "_Send chat state notifications:"
+msgstr "_Envoyer les notifications d'état :"
 
 #: ../data/gui/preferences_window.ui.h:63
-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é."
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notifications visuelles</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-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"
+msgid "Personal Events"
+msgstr "Événements Personnels"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
-"fenêtre principale et les salons"
+msgid "_Away after:"
+msgstr "Passer _Absent(e) après :"
 
 #: ../data/gui/preferences_window.ui.h:66
 msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+"If checked, Gajim will change status to Away when the computer is unused."
 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"
+"Si cette case est cochée, Gajim changera votre statut en Absent(e) quand "
+"l'ordinateur est inutilisé."
 
 #: ../data/gui/preferences_window.ui.h:67
-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"
+msgid "_Not available after:"
+msgstr "Passer _indisponible après :"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Si cette case est cochée, Gajim affichera la localisation de chaque contact "
-"dans votre liste de contacts"
+"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:69
-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"
+msgid "minutes"
+msgstr "minutes"
 
 #: ../data/gui/preferences_window.ui.h:70
 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:71
-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 ""
-"Si cette case est cochée, Gajim soulignera les erreurs d'orthographe dans le "
-"champ de saisie des fenêtres de conversation. Si aucune langue n'a été "
-"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:72
-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"
+"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 ""
-"Si cette case est cochée, Gajim ignorera les événements en provenance des "
-"contacts non autorisés. Utilisez avec précaution car cela bloque tous les "
-"messages provenant des contacts qui ne sont pas dans votre liste"
+"Le message de statut absent automatique. S'il est vide, Gajim ne changera "
+"pas le message de statut courant\n"
+"$S sera remplacé par l'ancien message de statut\n"
+"$T sera remplacé par le temps d'absence"
 
 #: ../data/gui/preferences_window.ui.h:73
 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 ""
-"Si cette case est cochée, Gajim archivera les conversations chiffrées. "
-"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:74
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-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:75
-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...)"
+"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 ""
-"Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux "
-"protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
-"disponible, absent(e), occupé(e), etc.)"
+"Le message de statut non-disponible automatique. S'il est vide, Gajim ne "
+"changera pas le message de statut courant\n"
+"$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:76
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"Si cette case est cochée, Gajim ne demandera pas de message de statut. Le "
-"message par défaut sera utilisé à la place."
+msgid "<b>Auto Status</b>"
+msgstr "<b>Statut Automatique</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-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"
+msgid "Ask status message when I:"
+msgstr "Demander le message d'état lorsque je me : "
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Last state"
-msgstr "Dernier état"
+msgid "Sign _in"
+msgstr "_connecte"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Log _encrypted chat session"
-msgstr "Archiver les conversations _chiffrées"
+msgid "Sign _out"
+msgstr "_déconnecte"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Ma_ke message windows compact"
-msgstr "Rendre les fenêtres de conversation _compactes"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Ma_nage..."
-msgstr "_Gérer..."
+msgid "<b>Status Messages</b>"
+msgstr "<b>Messages d'état prédéfinis</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Never"
-msgstr "Jamais"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Messages d'état prédéfinis</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notifications"
-msgstr "Notifications"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "État"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify me about contacts that sign _in"
-msgstr "Me signaler les contacts qui se _connectent"
+msgid "Use system _default"
+msgstr "Utiliser la valeur par _défaut"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Notify me about contacts that sign _out"
-msgstr "Me signaler les contacts qui se _déconnectent"
+msgid "Chat message:"
+msgstr "Message de conversation :"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Notify me about it"
-msgstr "Me le signaler"
+msgid "<b>Font</b>"
+msgstr "<b>Police d'écriture</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Notify on new _GMail email"
-msgstr "M'avertir lors de l'arrivée d'un courrier électronique _Gmail"
+msgid "Use _transports icons"
+msgstr "Utiliser les icônes des passere_lles"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Only when pending events"
-msgstr "Seulement lorsqu'il y a des évènements en attente"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux "
+"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:89
-msgid "Personal Events"
-msgstr "Événements Personnels"
+msgid "Status _iconset:"
+msgstr "_Icônes d'état :"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid "Play _sounds"
-msgstr "_Jouer les sons"
+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:91
-msgid "Pop it up"
-msgstr "Faire surgir un pop up"
+msgid "T_heme:"
+msgstr "T_hème :"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "Preferences"
-msgstr "Préférences"
+msgid "<b>Themes</b>"
+msgstr "<b>Thèmes</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
-"Nom d'hote du serveur STUN. Si rien n'est rempli, Gajim va tenter\n"
-" de le découvrir à partir du serveur."
+msgid "Contact's nickname:"
+msgstr "Le pseudo du contact :"
+
+#: ../data/gui/preferences_window.ui.h:94
+msgid "Your nickname:"
+msgstr "Votre pseudo :"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "STUN server:"
-msgstr "Serveur STUN :"
+msgid "_Status message:"
+msgstr "Message d'état :"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Show notification area icon:"
-msgstr "Montrer l'icone de la zone de notification :"
+msgid "_URL highlight:"
+msgstr "Mise à valeur des _URL :"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Show only in roster"
-msgstr "Ne le montrer que dans la liste"
+msgid "_Reset to Default Colors"
+msgstr "Utilise_r les couleurs par défaut"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid "Sign _in"
-msgstr "_connecte"
+msgid "Contact's message:"
+msgstr "Le message du contact :"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sign _out"
-msgstr "_déconnecte"
+msgid "Your message:"
+msgstr "Votre message :"
 
 #: ../data/gui/preferences_window.ui.h:100
-msgid "Single window for everything"
-msgstr "Une seule fenêtre pour tout"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Message d'un salon mis en surbrillance"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"Certains messages peuvent contenir du texte complexe (formatage, couleurs, "
-"etc.). Si activé, Gajim l'affichera seulement en tant que texte non formaté. "
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Couleurs des messages</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
-msgid "Sort contacts by status"
-msgstr "Trier les contacts par état"
+msgid "Style"
+msgstr "Style"
 
-#: ../data/gui/preferences_window.ui.h:103 ../src/config.py:401
-msgid "Status"
-msgstr "État"
+#: ../data/gui/preferences_window.ui.h:103
+msgid "Audio input device"
+msgstr "Périphérique audio d'entrée"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid "Status _iconset:"
-msgstr "_Icônes d'état :"
+msgid "Audio output device"
+msgstr "Périphérique audio de sortie"
 
 #: ../data/gui/preferences_window.ui.h:105
-msgid "Style"
-msgstr "Style"
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
 
 #: ../data/gui/preferences_window.ui.h:106
-msgid "T_heme:"
-msgstr "T_hème :"
+msgid "Video input device"
+msgstr "Périphérique d'entrée vidéo."
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"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 ""
-"Le message de statut absent automatique. S'il est vide, Gajim ne changera "
-"pas le message de statut courant\n"
-"$S sera remplacé par l'ancien message de statut\n"
-"$T sera remplacé par le temps d'absence"
+msgid "Video output device"
+msgstr "Périphérique vidéo de sortie"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "Images par seconde"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "Taille de la vidéo"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid ""
-"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"
+msgid "View own video source"
 msgstr ""
-"Le message de statut non-disponible automatique. S'il est vide, Gajim ne "
-"changera pas le message de statut courant\n"
-"$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:111
+msgid "<b>Video</b>"
+msgstr "<b>Vidéo</b>"
+
+#: ../data/gui/preferences_window.ui.h:112
+msgid "STUN server:"
+msgstr "Serveur STUN :"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Use _transports icons"
-msgstr "Utiliser les icônes des passere_lles"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(exemple: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Use default applications"
-msgstr "Toujours utiliser les applications par défaut."
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Use system _default"
-msgstr "Utiliser la valeur par _défaut"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+"Nom d'hote du serveur STUN. Si rien n'est rempli, Gajim va tenter\n"
+" de le découvrir à partir du serveur."
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video framerate"
-msgstr "Images par seconde"
+msgid "<b>Connection</b>"
+msgstr "<b>Connexions</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "Video input device"
-msgstr "Périphérique d'entrée vidéo."
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Audio / Vidéo"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Video output device"
-msgstr "Périphérique vidéo de sortie"
+msgid "_File manager:"
+msgstr "Gestionnaire de _fichiers :"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Video size"
-msgstr "Taille de la vidéo"
+msgid "_Mail client:"
+msgstr "Logiciel de courriel :"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "When new event is received:"
-msgstr "Quand un nouvel événement est reçu :"
-
-#: ../data/gui/preferences_window.ui.h:121
-msgid "Your message:"
-msgstr "Votre message :"
+msgid "_Browser:"
+msgstr "_Navigateur :"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "Your nickname:"
-msgstr "Votre pseudo :"
+msgid "<b>Custom</b>"
+msgstr "<b>Paramètres personnalisés</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Away after:"
-msgstr "Passer _Absent(e) après :"
+msgid "<b>Applications</b>"
+msgstr "<b>Applications</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_Browser:"
-msgstr "_Navigateur :"
+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:125
-msgid "_Display chat state notifications:"
-msgstr "_Afficher les notifications d'état :"
+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 ""
+"Si cette case est cochée, Gajim ignorera les événements en provenance des "
+"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:126
-msgid "_Emoticons:"
-msgstr "É_moticônes :"
+msgid "Allow client / _OS information to be sent"
+msgstr ""
+"Envoyer des informations concernant votre client / _système d'exploitation"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_File manager:"
-msgstr "Gestionnaire de _fichiers :"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+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:128
-msgid "_Highlight misspelled words"
-msgstr "_Souligner les fautes d'orthographe"
+msgid "Allow local system time information to be sent"
+msgstr "Envoyer des informations concernant l'heure de votre système"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Si cette case est cochée, Gajim autorisera les autres à détecter l'heure de "
+"votre système"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorer le formatage complexe du texte dans les messages entrants"
+msgid "Log _encrypted chat session"
+msgstr "Archiver les conversations _chiffrées"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Log status changes of contacts"
-msgstr "Inscrire dans l'_historique les changements d'état des contacts"
+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 ""
+"Si cette case est cochée, Gajim archivera les conversations chiffrées. "
+"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:132
-msgid "_Mail client:"
-msgstr "Logiciel de courriel :"
+msgid "Allow my _idle time to be sent"
+msgstr "Envoyer mon temps d'inactivité"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Not available after:"
-msgstr "Passer _indisponible après :"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr "Proxy global :"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Open..."
-msgstr "_Ouvrir..."
+msgid "<b>Privacy</b>"
+msgstr "<b>Vie privée</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Reset to Default Colors"
-msgstr "Utilise_r les couleurs par défaut"
+msgid "_Log status changes of contacts"
+msgstr "Inscrire dans l'_historique les changements d'état des contacts"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "_Send chat state notifications:"
-msgstr "_Envoyer les notifications d'état :"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "_Show roster on startup:"
-msgstr "Montrer la _liste au démarrage:"
+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:139
-msgid "_Status message:"
-msgstr "Message d'état :"
+msgid "_Open..."
+msgstr "_Ouvrir..."
 
 #: ../data/gui/preferences_window.ui.h:140
-msgid "_URL highlight:"
-msgstr "Mise à valeur des _URL :"
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Éditeur de configuration avancée</b>"
 
 #: ../data/gui/preferences_window.ui.h:141
-msgid "_Window behavior:"
-msgstr "Comportement de la _fenêtre :"
-
-#: ../data/gui/preferences_window.ui.h:142
-msgid "in _group chats"
-msgstr "dans les _salons de discussion"
-
-#: ../data/gui/preferences_window.ui.h:143
-msgid "in _roster"
-msgstr "dans le _roster"
-
-#: ../data/gui/preferences_window.ui.h:144
-msgid "minutes"
-msgstr "minutes"
+msgid "Advanced"
+msgstr "Avancées"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listes privées :"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Ajouter / modifier une règle</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Liste privée"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Liste des règles</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Liste privée</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Actif pour cette session"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Actif a chaque démarrage"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Liste des règles</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Tous"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Ajouter / modifier une règle</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Tout (y compris les abonnements)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permettre"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Identifiant Jabber :"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "tous ceux dans le groupe"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ordre :"
+msgid "all by subscription"
+msgstr "tous par état d'inscription"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3982
-msgid "Privacy List"
-msgstr "Liste privée"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Tous"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "tous par état d'inscription"
+msgid "to send me messages"
+msgstr "à m'envoyer des messages"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "tous ceux dans le groupe"
+msgid "to send me queries"
+msgstr "à m'envoyer des requêtes"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "les deux"
+msgid "to view my status"
+msgstr "à voir mon état"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "depuis"
+msgid "to send me status"
+msgstr "à m'envoyer son état"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "aucun"
+msgid "All (including subscription)"
+msgstr "Tout (y compris les abonnements)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "vers"
+msgid "Order:"
+msgstr "Ordre :"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "à m'envoyer des messages"
+msgid "none"
+msgstr "aucun"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "à m'envoyer des requêtes"
+msgid "both"
+msgstr "les deux"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "à m'envoyer son état"
+msgid "from"
+msgstr "depuis"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "à voir mon état"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresse</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar :</b>"
+msgid "to"
+msgstr "vers"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Date de Naissance :</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Ville :</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Nom de Famille :</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Entreprise :</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Country:</b>"
-msgstr "<b>Pays :</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Deuxième :</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>Department:</b>"
-msgstr "<b>Département :</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>E-Mail:</b>"
-msgstr "<b>Courriel :</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Préfixe :</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:13
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Adresse 2 :</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Prénom :</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:15
-msgid "<b>Family:</b>"
-msgstr "<b>Nom de Famille :</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suffixe :</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Nom complet</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Rue :</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Given:</b>"
-msgstr "<b>Prénom :</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Ville :</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:19
-msgid "<b>Homepage:</b>"
-msgstr "<b>Site perso :</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Région :</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Adresse 2 :</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Middle:</b>"
-msgstr "<b>Deuxième :</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Code postal :</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Name:</b>"
-msgstr "<b>Nom :</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Pays :</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Nickname:</b>"
-msgstr "<b>Surnom :</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresse</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Téléphone :</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Site perso :</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Position:</b>"
-msgstr "<b>Position :</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Nom :</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:27
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Code postal :</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Surnom :</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Téléphone :</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:29
-msgid "<b>Prefix:</b>"
-msgstr "<b>Préfixe :</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format : AAAA-MM-JJ"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>Role:</b>"
-msgstr "<b>Rôle :</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Date de Naissance :</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:32
-msgid "<b>State:</b>"
-msgstr "<b>Région :</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>Courriel :</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:34
-msgid "<b>Street:</b>"
-msgstr "<b>Rue :</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar :</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Cliquez pour choisir votre avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:38
-msgid "<b>Suffix:</b>"
-msgstr "<b>Suffixe :</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Informations personnelles"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/profile_window.ui.h:30
 #: ../data/gui/vcard_information_window.ui.h:42
-msgid "About"
-msgstr "À propos"
+msgid "<b>Company:</b>"
+msgstr "<b>Entreprise :</b>"
+
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Position :</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Cliquez pour choisir votre avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Département :</b>"
 
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "Format: YYYY-MM-DD"
-msgstr "Format : AAAA-MM-JJ"
+#: ../data/gui/vcard_information_window.ui.h:45
+msgid "<b>Role:</b>"
+msgstr "<b>Rôle :</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "Personal Info"
-msgstr "Informations personnelles"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Emploi"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Que voulez vous faire ?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "À propos"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Supprimer le compte de Gajim _uniquement"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Supprimer le compte de Gajim et du _serveur"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Que voulez vous faire ?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5719
-#: ../src/roster_window.py:5844 ../src/roster_window.py:5974
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Supprimer"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Échange d'item du roster"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2607,111 +2615,111 @@ msgstr ""
 "<b>quelqu'un@quelquepart.com</b> aimerait que vous <b>ajoutiez</b> quelques "
 "contacts à votre roster."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Corps du Message <actuellement inutilisé, donc caché par défaut>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Échange d'item du roster"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Ajouter un contact..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Corps du Message <actuellement inutilisé, donc caché par défaut>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "Fonc_tionnalités"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "Act_ions"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Transfert de fichiers"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Ajouter un contact..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Foire Aux Questions (en ligne)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "É_dition"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Aide en ligne"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Comptes"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil et _avatar"
+
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr "P_lugins"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Profil et _avatar"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Affichage"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Afficher les Contacts _déconnectés"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Afficher seulement les contacts _Actifs"
 
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:16
 msgid "Show T_ransports"
 msgstr "Afficher les _Passerelles"
 
-#: ../data/gui/roster_window.ui.h:13
-msgid "Show _Offline Contacts"
-msgstr "Afficher les Contacts _déconnectés"
-
-#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../data/gui/roster_window.ui.h:15
-msgid "_Accounts"
-msgstr "_Comptes"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Transfert de fichiers"
 
-#. 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:16
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "Act_ions"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "Aid_e"
 
-#: ../data/gui/roster_window.ui.h:18
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "É_dition"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Aide en ligne"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:22
-msgid "_Help"
-msgstr "Aid_e"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Foire Aux Questions (en ligne)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Affichage"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Merci de patienter pendant la recherche..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fonc_tionnalités"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Chercher"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Merci de patienter pendant la recherche..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Ajouter un contact"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5986
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Rechercher"
 
@@ -2731,41 +2739,37 @@ msgstr "S'enregistrer à"
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Répondre à ce message"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "À :"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Envoyer"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Envoyer le message"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Envoyer un message et fermer la fenêtre"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Répondre"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "À :"
+msgid "Reply to this message"
+msgstr "Répondre à ce message"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Répondre"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Envoyer et Fermer"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Envoyer un message et fermer la fenêtre"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_toriser"
+msgid "Subscription Request"
+msgstr "Requête d'Inscription"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autoriser le contact à savoir quand vous êtes connecté"
+msgid "_Deny"
+msgstr "_Refuser"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2775,270 +2779,271 @@ msgstr ""
 "Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous "
 "êtes connecté"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Requête d'Inscription"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_toriser"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Refuser"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autoriser le contact à savoir quand vous êtes connecté"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
-msgid "Select the account with which you want to synchronise"
-msgstr "Sélectionnez le compte avec lequel vous voulez vous synchroniser"
-
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Synchronise contacts"
 msgstr "Synchroniser les contacts"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Sélectionnez les contacts que vous voulez synchroniser"
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Select the account with which you want to synchronise"
+msgstr "Sélectionnez le compte avec lequel vous voulez vous synchroniser"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 msgid "Synchronise : select contacts"
 msgstr "Synchroniser : choisissez des contacts"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Désactiver les sons"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Envoyer un _message simple"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Montrer les _événements en attente"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Sélectionnez les contacts que vous voulez synchroniser"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "É_tat"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Salons de discussion"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Requête :</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Envoyer un _message simple"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Client :</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Montrer les _événements en attente"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Configured avatar:</b>"
-msgstr "<b>Avatar configuré :</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Désactiver les sons"
 
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Contact time:</b>"
-msgstr "<b>Heure du contact :</b>"
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informations du Contact"
 
-#: ../data/gui/vcard_information_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Identifiant Jabber :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Statut :</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:36
-msgid "<b>Subscription:</b>"
-msgstr "<b>Abonnement :</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Client :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:39
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Système :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Heure du contact :</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>User avatar:</b>"
 msgstr "<b>Avatar :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-msgid "Comments"
-msgstr "Commentaires"
+#: ../data/gui/vcard_information_window.ui.h:9
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>Avatar configuré :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Contact"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Abonnement :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:45
-msgid "Contact Information"
-msgstr "Informations du Contact"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Requête :</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Complément"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Filtre</b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Contact"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Commentaires"
+
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafic Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Entrée XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "Cacher les stanzas entrantes"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "Cacher les stanzas de type iq"
+msgid "Hide OUT stanzas"
+msgstr "Cacher les stanzas sortantes"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "Cacher les stanzas de type message"
+msgid "Hide Presence stanzas"
+msgstr "Cacher les stanzas de type presence"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "Cacher les stanzas sortantes"
+msgid "Hide IQ stanzas"
+msgstr "Cacher les stanzas de type iq"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "Cacher les stanzas de type presence"
+msgid "Hide Message stanzas"
+msgstr "Cacher les stanzas de type message"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Information/Requête"
+msgid "<b>Filter</b>"
+msgstr "<b>Filtre</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Information/Requête"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Présence"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Message"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Présence"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Entrée XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Modifier le compte..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Identifiant local :"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Personnel"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Ressource :"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "État :"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un client Jabber en GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Personnel"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Messagerie instantanée Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Client de Messagerie Instantanée Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Un client Jabber en GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Annuler la confirmation"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 msgid "Invalid Form"
 msgstr "Formulaire invalide"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 msgid "The form is not filled correctly."
 msgstr "Le forumlaire n'est pas correctement rempli."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Le service a envoyé des données mal-formées"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Le service a modifié l'identifiant de la session."
 
-#: ../src/adhoc_commands.py:418
+#: ../src/adhoc_commands.py:421
 #, python-format
 msgid "%s - Ad-hoc Commands - Gajim"
 msgstr "%s - Commandes Ad-hoc - Gajim"
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Le service a renvoyé une erreur."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Activé"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Désactivé"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Booléen"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Entier"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1060
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Couleur"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Option"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Valeur"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Aucune)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Éléments masqués"
 
@@ -3049,261 +3054,187 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Vous avez reçu de nouvelles entrées (et %d non-affichées) :"
 msgstr[1] "Vous avez reçu de nouvelles entrées (et %d non-affichées) :"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:85
-msgid "English"
-msgstr "Anglais"
-
-#: ../src/chat_control.py:85
-msgid "Belarusian"
-msgstr "Biélorusse"
-
-#: ../src/chat_control.py:85
-msgid "Bulgarian"
-msgstr "Bulgare"
-
-#: ../src/chat_control.py:85
-msgid "Breton"
-msgstr "Breton"
-
-#: ../src/chat_control.py:85
-msgid "Czech"
-msgstr "Tchèque"
-
-#: ../src/chat_control.py:85
-msgid "German"
-msgstr "Allemand"
-
-#: ../src/chat_control.py:85
-msgid "Greek"
-msgstr "Grec"
-
-#: ../src/chat_control.py:85
-msgid "British"
-msgstr "Anglais (Britannique)"
-
-#: ../src/chat_control.py:85
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:85
-msgid "Spanish"
-msgstr "Espagnol"
-
-#: ../src/chat_control.py:85
-msgid "Basque"
-msgstr "Basque"
-
-#: ../src/chat_control.py:85
-msgid "French"
-msgstr "Français"
-
-#: ../src/chat_control.py:85
-msgid "Croatian"
-msgstr "Croate"
-
-#: ../src/chat_control.py:85
-msgid "Italian"
-msgstr "Italien"
-
-#: ../src/chat_control.py:85
-msgid "Norwegian (b)"
-msgstr "Norvégien"
-
-#: ../src/chat_control.py:85
-msgid "Dutch"
-msgstr "Hollandais"
-
-#: ../src/chat_control.py:85
-msgid "Norwegian"
-msgstr "Norvégien"
-
-#: ../src/chat_control.py:85
-msgid "Polish"
-msgstr "Polonais"
-
-#: ../src/chat_control.py:85
-msgid "Portuguese"
-msgstr "Portugais"
-
-#: ../src/chat_control.py:85
-msgid "Brazilian Portuguese"
-msgstr "Portugais brésilien"
-
-#: ../src/chat_control.py:85
-msgid "Russian"
-msgstr "Russe"
-
-#: ../src/chat_control.py:85
-msgid "Serbian"
-msgstr "Serbe"
-
-#: ../src/chat_control.py:85
-msgid "Slovak"
-msgstr "Slovaque"
-
-#: ../src/chat_control.py:85
-msgid "Swedish"
-msgstr "Suédois"
-
-#: ../src/chat_control.py:85
-msgid "Chinese (Ch)"
-msgstr "Chinois"
-
-#: ../src/chat_control.py:228
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: ../src/chat_control.py:233
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong ! (%s s.)"
 
-#: ../src/chat_control.py:238
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "Erreur."
 
-#: ../src/chat_control.py:573
-msgid "Spelling language"
-msgstr "Langue du correcteur orthographique"
-
 #. we are not connected
-#: ../src/chat_control.py:605 ../src/chat_control.py:821
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:606 ../src/chat_control.py:822
+#: ../src/chat_control.py:801
 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:1042
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../src/chat_control.py:1043
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Barré"
 
-#: ../src/chat_control.py:1066
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Police"
 
-#: ../src/chat_control.py:1075
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Style par défaut"
 
-#: ../src/chat_control.py:1152
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
 
-#: ../src/chat_control.py:1153
+#: ../src/chat_control.py:1158
 #, 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:1636 ../src/chat_control.py:2170
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "Chiffrement GPG activé"
 
-#: ../src/chat_control.py:1657 ../src/chat_control.py:1660
-msgid "Requires python-farsight."
-msgstr "Nécessite python-farsight."
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Ce contact ne prend pas en charge les transferts de fichier."
 
 #. Add to roster
-#: ../src/chat_control.py:1700 ../src/common/contacts.py:149
-#: ../src/common/contacts.py:270 ../src/common/helpers.py:67
-#: ../src/common/helpers.py:261 ../src/dialogs.py:1099 ../src/dialogs.py:2231
-#: ../src/dialogs.py:2260 ../src/gui_interface.py:482
-#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:405
-#: ../src/roster_window.py:767 ../src/roster_window.py:1664
-#: ../src/roster_window.py:1666 ../src/roster_window.py:2011
-#: ../src/roster_window.py:3551 ../src/roster_window.py:3578
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
-#: ../src/chat_control.py:1732
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Démarrer/arrêter une session audio"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Démarrer/arrêter une session vidéo"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Fonctionnalité indisponible sous Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Envoyer un _fichier"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Ce contact ne prend pas en charge les transferts de fichier."
 
-#: ../src/chat_control.py:1735
+#: ../src/chat_control.py:1788
 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:1849
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "État %(type)s : %(state)s, raison : %(reason)s"
 
-#: ../src/chat_control.py:2040
+#: ../src/chat_control.py:2098
 #, 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:2150 ../src/dialogs.py:5043
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Aucune clef GPG assignée"
 
-#: ../src/chat_control.py:2151
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages avec GPG."
 
-#: ../src/chat_control.py:2160
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "Chiffrement GPG désactivé"
 
-#: ../src/chat_control.py:2186
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:2188
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
 #. encryption %s active
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "est"
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "N'est PAS"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2207
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "sera"
 
-#: ../src/chat_control.py:2207
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NE sera PAS"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2211
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "et authentifiée"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2294
 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:2222
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3312,31 +3243,31 @@ msgstr ""
 "Chiffrement %(type)s %(status)s actif %(authenticated)s.\n"
 "Votre discussion %(logged)s archivée."
 
-#: ../src/chat_control.py:2349
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: ../src/chat_control.py:2359
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "Cette session sera archivée sur le serveur"
 
-#: ../src/chat_control.py:2361
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "La session ne sera PAS archivée sur le serveur"
 
-#: ../src/chat_control.py:2370
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Cette session est chiffrée"
 
-#: ../src/chat_control.py:2373
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " et SERA archivée"
 
-#: ../src/chat_control.py:2375
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " et NE SERA PAS archivée"
 
-#: ../src/chat_control.py:2380
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3344,25 +3275,25 @@ msgstr ""
 "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
 "de détails."
 
-#: ../src/chat_control.py:2382
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: ../src/chat_control.py:2430 ../src/chat_control.py:2444
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Le message suivant n'a PAS été chiffré"
 
-#: ../src/chat_control.py:2436
+#: ../src/chat_control.py:2526
 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:2707
+#: ../src/chat_control.py:2797
 #, 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:2708
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3370,14 +3301,14 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/chat_control.py:2875 ../src/common/connection_handlers_events.py:887
-#: ../src/common/connection_handlers.py:948
-#: ../src/common/connection_handlers.py:1060 ../src/common/connection.py:456
-#: ../src/common/logger.py:1144 ../src/gajim.py:210 ../src/session.py:100
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: ../src/chat_control.py:2876
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3386,7 +3317,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:3112 ../src/gui_interface.py:1071
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3395,48 +3326,53 @@ msgstr ""
 "Impossible de déchiffrer le message de %s\n"
 "Il a peut-être été manipulé."
 
-#: ../src/chat_control.py:3145
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
 
-#: ../src/chat_control.py:3204
+#: ../src/chat_control.py:3321
 msgid "File transfer"
 msgstr "Transfert de fichiers"
 
-#: ../src/chat_control.py:3207
+#: ../src/chat_control.py:3324
 msgid "Size"
 msgstr "Taille"
 
-#: ../src/chat_control.py:3209
+#: ../src/chat_control.py:3326
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: ../src/chat_control.py:3232 ../src/filetransfers_window.py:204
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/chat_control.py:3260 ../src/gui_interface.py:942
-#: ../src/roster_window.py:1923
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Invitation à un salon"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
 msgid "Remote contact stopped transfer"
 msgstr "Le contact distant à stoppé le transfert"
 
-#: ../src/chat_control.py:3262 ../src/gui_interface.py:945
-#: ../src/roster_window.py:1925
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
 msgid "Error opening file"
 msgstr "Erreur à l'ouverture du fichier"
 
-#: ../src/chat_control.py:3264 ../src/filetransfers_window.py:240
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
 msgid "File transfer stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/chat_control.py:3267 ../src/filetransfers_window.py:219
-#: ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: ../src/chat_control.py:3268 ../src/filetransfers_window.py:219
-#: ../src/filetransfers_window.py:227
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
@@ -3452,6 +3388,10 @@ msgstr "Éxecute une expression dans un shell, montre la sortie"
 msgid "Execute expression inside a shell, send output"
 msgstr "Éxecute une expression dans un shell, envoie la sortie"
 
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
 #: ../src/command_system/implementation/standard.py:50
 msgid "Hide the chat buttons"
 msgstr "Cache les boutons de discussion."
@@ -3484,13 +3424,15 @@ msgstr "%s : rien de trouvé"
 msgid "Limit must be an integer"
 msgstr "La limite doit être un entier"
 
-#: ../src/command_system/implementation/standard.py:129
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+#, fuzzy
 msgid ""
 "\n"
-"    Set the current the status\n"
+"    Set the current status\n"
 "\n"
-"    Status can be given as one of the following values: online, away,\n"
-"    chat, xa, dnd.\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
 "    "
 msgstr ""
 "\n"
@@ -3500,117 +3442,125 @@ msgstr ""
 "dnd.\n"
 "    "
 
-#: ../src/command_system/implementation/standard.py:147
+#: ../src/command_system/implementation/standard.py:148
 msgid "Set the current status to away"
 msgstr "Fixe l'état actuel à away"
 
-#: ../src/command_system/implementation/standard.py:150
-#: ../src/common/commands.py:109 ../src/common/helpers.py:249
-#: ../src/tooltips.py:194
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
 msgid "Away"
 msgstr "Absent(e)"
 
-#: ../src/command_system/implementation/standard.py:161
+#: ../src/command_system/implementation/standard.py:162
 msgid "Set the current status to online"
 msgstr "Fixe l'état actuel à online"
 
-#: ../src/command_system/implementation/standard.py:164
+#: ../src/command_system/implementation/standard.py:165
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/command_system/implementation/standard.py:184
-#: ../src/command_system/implementation/standard.py:261
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
 msgid "Clear the text window"
 msgstr "Nettoie la fenêtre de conversation"
 
-#: ../src/command_system/implementation/standard.py:189
-msgid "Toggle the GPG encryption"
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
 msgstr "Basculer le chiffrement GPG"
 
-#: ../src/command_system/implementation/standard.py:194
+#: ../src/command_system/implementation/standard.py:195
 msgid "Send a ping to the contact"
 msgstr "Envoie un ping au contact"
 
-#: ../src/command_system/implementation/standard.py:197
+#: ../src/command_system/implementation/standard.py:198
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Commande non prise en charge pour les comptes zeroconf"
 
-#: ../src/command_system/implementation/standard.py:201
+#: ../src/command_system/implementation/standard.py:202
 msgid "Send DTMF sequence through an open audio session"
 msgstr "Envoie une séquence DTMF dans une session audio ouverte"
 
-#: ../src/command_system/implementation/standard.py:204
+#: ../src/command_system/implementation/standard.py:205
 msgid "No open audio sessions with the contact"
 msgstr "Pas de session audio ouverte avec le contact"
 
-#: ../src/command_system/implementation/standard.py:207
+#: ../src/command_system/implementation/standard.py:208
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s n'est pas un ton valide"
 
-#: ../src/command_system/implementation/standard.py:217
+#: ../src/command_system/implementation/standard.py:218
 msgid "Audio sessions are not available"
 msgstr "Les sessions audio ne sont pas disponibles"
 
-#: ../src/command_system/implementation/standard.py:227
+#: ../src/command_system/implementation/standard.py:228
 msgid "Video sessions are not available"
 msgstr "Les sessions video ne sont pas disponibles"
 
-#: ../src/command_system/implementation/standard.py:268
+#: ../src/command_system/implementation/standard.py:235
+#, fuzzy
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr "Envoie un message a un contact"
+
+#: ../src/command_system/implementation/standard.py:274
 msgid "Change your nickname in a group chat"
 msgstr "Changer votre surnom dans un salon de discussion"
 
 #. invalid char
-#: ../src/command_system/implementation/standard.py:273 ../src/config.py:3392
-#: ../src/dialogs.py:2078
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/command_system/implementation/standard.py:278
+#: ../src/command_system/implementation/standard.py:284
 msgid "Open a private chat window with a specified occupant"
 msgstr ""
 "Ouvre une fenêtre de conversation privée avec l'occupant(e) spécifié(e)"
 
-#: ../src/command_system/implementation/standard.py:284
-#: ../src/command_system/implementation/standard.py:293
-#: ../src/command_system/implementation/standard.py:347
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
 msgid "Nickname not found"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/command_system/implementation/standard.py:287
+#: ../src/command_system/implementation/standard.py:293
 msgid ""
 "Open a private chat window with a specified occupant and send him a message"
 msgstr ""
 "Ouvre une fenêtre de conversation privée avec l'occupant(e) spécifié(e) et "
 "lui envoyer un mesage"
 
-#: ../src/command_system/implementation/standard.py:296
+#: ../src/command_system/implementation/standard.py:302
 msgid "Display or change a group chat topic"
 msgstr "Affiche ou modifie le sujet d'un salon de discussion"
 
-#: ../src/command_system/implementation/standard.py:304
+#: ../src/command_system/implementation/standard.py:310
 msgid "Invite a user to a room for a reason"
 msgstr "Invite un contact à un salon de discussion pour une raison"
 
-#: ../src/command_system/implementation/standard.py:307
+#: ../src/command_system/implementation/standard.py:313
 #, python-format
 msgid "Invited %s to %s"
 msgstr "Invité %s à %s"
 
-#: ../src/command_system/implementation/standard.py:310
+#: ../src/command_system/implementation/standard.py:316
 msgid "Join a group chat given by a jid, optionally using given nickname"
 msgstr ""
 "Rejoindre un salon de discussion donné par son jid, éventuellement en "
 "utilisant le surnom donné"
 
-#: ../src/command_system/implementation/standard.py:327
+#: ../src/command_system/implementation/standard.py:333
 msgid ""
 "Leave the groupchat, optionally giving a reason, and close tab or window"
 msgstr ""
 "Quitte le salon de discussion, éventuellement en donnant une raison, et "
 "ferme l'onglet ou la fneêtre"
 
-#: ../src/command_system/implementation/standard.py:332
+#: ../src/command_system/implementation/standard.py:338
 msgid ""
 "\n"
 "    Ban user by a nick or a jid from a groupchat\n"
@@ -3625,136 +3575,186 @@ msgstr ""
 "    Si le surnom donné n'existe pas, il sera traité comme un jid.\n"
 "    "
 
-#: ../src/command_system/implementation/standard.py:344
+#: ../src/command_system/implementation/standard.py:350
 msgid "Kick user by a nick from a groupchat"
 msgstr "Éjecter un utilisateur par son surnom d'un salon de discussion"
 
-#: ../src/command_system/implementation/standard.py:351
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+#, fuzzy
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+"\n"
+"    Fixe l'état actuel\n"
+"\n"
+"    L'état doit être l'une des valeurs suivates : online, away, chat, xa, "
+"dnd.\n"
+"    "
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Serveur invalide"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+#, fuzzy
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+"\n"
+"    Fixe l'état actuel\n"
+"\n"
+"    L'état doit être l'une des valeurs suivates : online, away, chat, xa, "
+"dnd.\n"
+"    "
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Changement d'affiliation"
+
+#: ../src/command_system/implementation/standard.py:383
 msgid "Display names of all group chat occupants"
 msgstr "Affiche les noms des occupants du salon"
 
-#: ../src/command_system/implementation/standard.py:373
+#: ../src/command_system/implementation/standard.py:405
 msgid "Forbid an occupant to send you public or private messages"
 msgstr ""
 "Interdir un(e) occupant(e) de vous envoyer des messages publics ou privés"
 
-#: ../src/command_system/implementation/standard.py:378
+#: ../src/command_system/implementation/standard.py:410
 msgid "Allow an occupant to send you public or private messages"
 msgstr ""
 "Autoriser un(e) occupant(e) de vous envoyer des messages publics ou privés"
 
-#: ../src/common/check_paths.py:38
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Argument manquant \"jid_contact\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:86
+#: ../src/common/check_paths.py:87
 msgid "creating cache database"
 msgstr "création de la base de donnée de cache"
 
-#: ../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:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
+#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
-#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:352
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
 
-#: ../src/common/commands.py:85
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Modifier les informations du statut"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Modifier le statut"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Choisissez le type de présence et la description"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Disponible pour Discuter"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Connecté"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Longue absence"
 
-#: ../src/common/commands.py:111
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Ne pas déranger"
 
-#: ../src/common/commands.py:112
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Hors-ligne - Déconnecté(e)"
 
-#: ../src/common/commands.py:117
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Description de la présence :"
 
-#: ../src/common/commands.py:152 ../src/common/commands.py:320
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "L'état a été changé."
 
-#: ../src/common/commands.py:184 ../src/common/commands.py:210
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Quitter des Groupes de Discussion"
 
-#: ../src/common/commands.py:200
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s dans %(room_jid)s"
 
-#: ../src/common/commands.py:204
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Vous n'avez pas joint de groupe de discussion."
 
-#: ../src/common/commands.py:211
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Choisissez les groupes de discussion que vous voulez quitter"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:215 ../src/common/contacts.py:128
-#: ../src/common/helpers.py:67 ../src/roster_window.py:820
-#: ../src/roster_window.py:1668 ../src/roster_window.py:1670
-#: ../src/roster_window.py:2546 ../src/roster_window.py:5604
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Salons de discussion"
 
-#: ../src/common/commands.py:256
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Vous avez quitté les groupes de discussion suivants :"
 
-#: ../src/common/commands.py:268
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Transférer les messages non-lus"
 
-#: ../src/common/commands.py:290
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Tous les messages non-lus ont été transmis."
 
-#: ../src/common/commands.py:298
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr "Transférer les messages non-lus et se déconnecter"
 
@@ -3781,7 +3781,8 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Absent(e) car inactif depuis plus de $T min)"
 
 #: ../src/common/config.py:83
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S sera remplacé par le message de statut, $T par le temps d'auto-absence"
 
@@ -3794,7 +3795,8 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Non disponible car inactif depuis plus de $T min)"
 
 #: ../src/common/config.py:86
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S sera remplacé par the message de statut, $T par le temps d'auto-idle"
 
@@ -3833,26 +3835,80 @@ msgid "Status message text color."
 msgstr "Colour des messages de statut"
 
 #: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Afficher les événements dans la zone de notification"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Afficher les événements dans la zone de notification"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Aperçu des nouveaux messages dans un popup ?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Requête de transfert de fichier"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Transfert de fichier annulé"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr ""
+"Quand le transfert de fichier est terminé, montrer une fenêtre de "
+"notification"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Invitation à un salon"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Police des pseudos entrants."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Police des pseudos sortants."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Police du texte entrant."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Police du texte sortant."
 
-#: ../src/common/config.py:106
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Police du message de statut"
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3860,17 +3916,17 @@ msgstr ""
 "repliés."
 
 #. sorted alphanum
-#: ../src/common/config.py:108 ../src/common/config.py:504
-#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
-#: ../src/common/optparser.py:526 ../src/gui_interface.py:2679
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "Par défaut"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Langue utilisée par le vérificateur orthographique"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3881,7 +3937,7 @@ msgstr ""
 "minute.\n"
 "'never' - ne jamais afficher l'heure."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:125
 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. "
@@ -3893,19 +3949,19 @@ msgstr ""
 "valeur 0. Ceci est utilisé seulement lorsque la valeur de print_time est "
 "'sometimes'."
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
 "les * *"
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3915,7 +3971,7 @@ msgstr ""
 "Pour la syntaxe voir http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (si vous voulez utiliser cela, installez docutils)"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3923,7 +3979,7 @@ msgstr ""
 "Caractère à ajouter après un surnom en utilisant la complétion automatique "
 "(tab) dans un salon de discussion."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3931,15 +3987,16 @@ msgstr ""
 "Caractère ajouté automatiquement après un surnom s'il est déjà utilisé dans "
 "un salon de discussion."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
+"If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
 "Si vrai, Gajim sauvera la position de la liste de contacts avant de la "
 "cacher et la restaurera en la faisant réapparaître"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3950,39 +4007,40 @@ msgstr ""
 "documentation python de strftime pour une documentation complète : http://"
 "docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caractères affichés avant le surnom dans les conversations"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caractères affichés après le surnom dans les conversations"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 "Spécifie la commande a exécuter quand un nouveau courriel arrive, ex : /usr/"
 "bin/getmail -q"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
 "de discussion est ouvert à nouveau."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Durée de vie en minutes des dernières lignes des conversations précédentes."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:182
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
@@ -3990,15 +4048,16 @@ msgstr ""
 "Le nombre de lignes d'archives qui seront demandées en entrant dans un "
 "salon. -1 signifie \"pas de limitation\""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:183
+#, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Le nombre de minutes d'archives qui seront demandées en entrant dans un "
 "salon. -1 signifie \"pas de limitation\""
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -4007,14 +4066,14 @@ msgstr ""
 "automatiquement à un salon dont vous avez été déconnecté. Mettre à 0 pour "
 "désactiver."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:185
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
 "La reconnexion automatique doit-elle être activée lorsque l'on est éjecté "
 "d'un salon de discussion ?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4022,13 +4081,13 @@ msgstr ""
 "Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée "
 "(comportement par défaut du client ICQ de Mirabilis)."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 "Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl"
 "+flèche vers le haut)."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4037,13 +4096,13 @@ msgstr ""
 "Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit "
 "\"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-"
 "remote."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:195
 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 "
@@ -4054,13 +4113,13 @@ msgstr ""
 "automatiquement l'état des comptes (en autant que listen_to_network_manager "
 "n'est pas désactivé et qu'ils soient synchronisés à l'état global)."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notifications d'états envoyées. Peut être all, composing_only ou disabled."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4068,7 +4127,7 @@ msgstr ""
 "Notifications d'états affichées dans les fenêtres de conversations. Peut "
 "être all, composing_only ou disabled."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4076,37 +4135,40 @@ msgstr ""
 "Au lieu d'afficher l'heure à chaque message (print_time==sometimes), "
 "l'afficher toutes les x minutes."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Demander avant de fermer un onglet ou une fenêtre de discussion de salon."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Toujours demander avant de fermer les onglets/fenêtres de salons de cette "
 "liste séparés par des espaces."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Ne jamais demander avant de fermer onglets/fenêtres des salons de cette "
 "liste séparées par des espaces."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Demander avant de fermer une fenêtre contenant des onglets si des données "
 "peuvent être perdues (conversations, conversations privées, salons qui se "
 "seront pas minimisés)"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4115,27 +4177,33 @@ msgstr ""
 "interfaces locales, pour les transferts de fichiers dans le cas de "
 "traduction  d'adresse / redirection de port."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:208
 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:200
+#: ../src/common/config.py:210
 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:206
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Afficher la bordure fenêtres de discussion à onglets ?"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:220
 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 "
@@ -4148,18 +4216,18 @@ msgstr ""
 "sécurisés, mais prennent plus de temps pour le calcul quand vous commencez "
 "une session."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Aperçu des nouveaux messages dans un popup ?"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Une liste de mots séparés par des points-virgules qui seront mis en "
 "surbrillance dans les salons."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:247
 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."
@@ -4168,14 +4236,14 @@ msgstr ""
 "fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
 "notification est utilisée."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Si vrai, Gajim vérifiera qu'il est le client Jabber par défaut à chaque "
 "démarrage."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4183,7 +4251,7 @@ msgstr ""
 "Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages "
 "non lus. En fonction du thème, cette icône peut être animée."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4191,13 +4259,13 @@ msgstr ""
 "Si Vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom "
 "de chaque contact dans la liste des contacts."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Définir la position de l'avatar dans le roster. Peut être à droite (right) "
 "ou à gauche (left)."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:257
 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."
@@ -4205,7 +4273,7 @@ msgstr ""
 "Si Vrai demandera son avatar à chaque contact qui n'en avait pas la fois "
 "précédente ou dont la version en cache a expiré."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:258
 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."
@@ -4213,9 +4281,10 @@ msgstr ""
 "Si Faux, vous ne verrez plus les lignes d'état dans les conversations quand "
 "un contact modifie son état et/ou son message d'état."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4228,36 +4297,36 @@ msgstr ""
 "affichera seulement « TRUC vient de rejoindre/quitter le groupe de "
 "discussion »."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:261
 msgid "Log XHTML messages instead of plain text messages."
 msgstr "Enregistrer les messages XHTML au lieu des messages en texte simple."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se connecter."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se déconnecter."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Si Vrai, les messages restaurés utiliseront une police de texte plus petite "
 "que la normale."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne pas afficher d'avatars particuliers pour les passerelles."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne pas afficher d'icône dans la barre des tâches."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:268
 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 "
@@ -4267,7 +4336,7 @@ msgstr ""
 "clignoter (comportement par défaut dans la plupart des gestionnaires de "
 "fenêtres) la fenêtre quand elle contient des événements non lus."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:270
 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 "
@@ -4278,7 +4347,8 @@ msgstr ""
 "l'information sha dans les salons."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:250
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4286,7 +4356,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Contrôle la fenêtre dans laquelle sont placées les nouvelles conversations.\n"
@@ -4297,7 +4367,7 @@ msgstr ""
 "'pertype' - Toutes les conversations d'un même type (discussion, salon) dans "
 "la même fenêtre."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:274
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -4309,36 +4379,36 @@ msgstr ""
 "'never' - Jamais montrer.\n"
 "'last_state' - Restaurer le dernier état."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Si Faux, vous ne verrez plus les avatars dans les fenêtres de conversation."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Si Vrai, appuyer sur la touche d'échappement fermera l'onglet ou la fenêtre "
 "de conversation."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Cacher les boutons dans les fenêtres de conversations."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Cache la bannière dans les fenêtres de discussions"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Cache la liste des occupants du salon dans les fenêtres des salons de "
 "discussion."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:281
 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."
@@ -4346,15 +4416,15 @@ msgstr ""
 "Dans une conversation, affiche le surnom au début d'une ligne seulement "
 "lorsque ce n'est pas la même personne qui a écrit le dernier message."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation lors du fusionnement d'un surnom répété."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Défilement doux dans la fenêtre de conversation"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4362,13 +4432,13 @@ msgstr ""
 "Liste des couleurs, séparées par « : », qui seront utilisées pour colorier "
 "les surnoms dans les salons de discussion."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab pour basculer au prochain onglet lorsqu'aucun d'entre eux n'a de "
 "nouveaux messages non lus."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4377,7 +4447,7 @@ msgstr ""
 "métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
 "affiché."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4385,7 +4455,7 @@ msgstr ""
 "Doit-on afficher le dialogue de confirmation de bloquage d'un contact ? Une "
 "valeur vide fera en sorte que le dialogue ne soit jamais affiché."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4394,7 +4464,7 @@ msgstr ""
 "personnalisé ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
 "affiché."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:289
 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 "
@@ -4405,7 +4475,7 @@ msgstr ""
 "connecté avec une priorité négative, vous ne recevrez AUCUN message en "
 "provenance de votre serveur."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4413,7 +4483,7 @@ msgstr ""
 "Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker "
 "les mots de passe des comptes."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4421,7 +4491,7 @@ msgstr ""
 "Si vrai, Gajim va utiliser KDE Wallet (si kwalletcli est disponible) pour "
 "stocker les mots de passe des comptes."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4429,7 +4499,7 @@ msgstr ""
 "Si vrai, Gajim montrera le nombre de contacts connectés et totaux sur les "
 "lignes de groupe et de compte"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4437,7 +4507,7 @@ msgstr ""
 "Peut être vide, 'chat' ou 'normal'. Si non vide, traite tous les messages "
 "entrant comme des messages de ce type"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4445,22 +4515,13 @@ msgstr ""
 "Si Activé, Gajim scrollera et sélectionnera le contact qui vous a envoyé le "
 "dernier message, si la fenêtre de conversation n'est pas déjà ouverte."
 
-#: ../src/common/config.py:272
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Si Activé, Gajim convertira les chaines de caractères entre $$ et $$ en une "
-"image, en utilisant dvips et convert avant de l'insérer dans la fenêtre de "
-"conversation."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se "
 "faire."
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4468,7 +4529,7 @@ msgstr ""
 "Nombre maximum de lignes affichées dans les conversations. Les lignes les "
 "plus vieilles sont effacées."
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
@@ -4476,20 +4537,12 @@ msgstr ""
 "Si Activé, les fenêtres de notification du notification-daemon seront "
 "attachées à l'icône du Tray."
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Choisissez l'intervalle en secondes entre deux vérifications de l'inactivité."
 
-#: ../src/common/config.py:277
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Modifiez la valeur pour changer la taille des formules latex affichées. Plus "
-"la valeur est grande, plus la taille l'est."
-
-#: ../src/common/config.py:278
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4497,21 +4550,22 @@ msgstr ""
 "Schémas d'uri valides. Seuls les schémas dans cette liste seront acceptés "
 "comment « vraies » uri. (mailto et xmpp sont gérés séparément)"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Demander le message de statut à tous les contacts hors-ligne lorsque la "
 "connexion à un compte est établie. ATTENTION : cela provoque l'envoie de "
 "nombreuses requêtes !"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Si Vrai, la complétion dans les salons sera similaire à celle d'un shell"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4520,18 +4574,22 @@ msgstr ""
 "» (toujours), « when_other_resource » (quand d'autres ressources sont "
 "connectées) ou « never » (jamais)"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 "Fixe éventuellement le nombre d'image par seconde pour la sortie video "
 "jingle. Exemple : 10/1 ou 25/2"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 "Redimenssionne éventuellement la sortie video jingle. Exemple : 320x240"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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."
@@ -4540,11 +4598,11 @@ msgstr ""
 "jingle. Celui défini dans l'option \"stun_server\", ou celui donné par le "
 "serveur jabber."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr "Serveur STUN a utiliser avec jingle"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
@@ -4552,7 +4610,7 @@ msgstr ""
 "si vrai, Gajim affichera l'affiliation des occupant(e)s des salons de "
 "discussions en ajoutant un carré coloré a l'icône d'état"
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:315
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
@@ -4560,7 +4618,26 @@ msgstr ""
 "Proxy utilisé pour toutes les connexions sortantes si le compte n'a pas de "
 "proxy spécifique configuré"
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Si cette case est cochée, Gajim ne demandera pas de message de statut. Le "
+"message par défaut sera utilisé à la place."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4568,7 +4645,7 @@ msgstr ""
 "La priorité va changer automatiquement selon votre état. Les priorités sont "
 "définies dans les options autopriority_*."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:340
 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"
@@ -4578,41 +4655,41 @@ msgstr ""
 "(indisponible), dnd (Occupé(e)) ou Invisible. NOTE : cette option n'est "
 "utilisée que si l'option restore_last_status est désactivée"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Si activé, restaure le dernier statut qui était utilisé."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Si Vrai, les demandes d'autorisation de contact seront automatiquement "
 "acceptées."
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Si Faux, ce compte sera désactivé et n'apparaîtra plus dans votre roster."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Si désactivé, ne pas signaler les présences avec une clef GPG, même si GPG "
 "est configuré."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Activer le chiffrage ESessions pour ce compte."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée quand cela "
 "est possible ?"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4620,7 +4697,7 @@ msgstr ""
 "Liste ordonnée de types de connexion, séparés par des virgules, à essayer. "
 "Peut contenir tls, ssl ou plain."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:352
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -4629,24 +4706,24 @@ msgstr ""
 "connexion non-chiffrée. Peut prendre les valeurs 'warn', 'connect', "
 "'disconnect'"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Afficher un message d'avertissement avant d'utiliser la librairie SSL "
 "standard."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:354
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Afficher un message d'avertissement avant d'envoyer un mot de passe non-"
 "chiffré via une connexion non-chiffrée."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:362
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -4655,7 +4732,7 @@ msgstr ""
 "enregistrer les conversations. Vous pouvez également ajouter le nom d'un "
 "compte pour ne rien enregistrer pour ce compte."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:363
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -4663,28 +4740,29 @@ msgstr ""
 "Liste de jid, séparée par un espace, pour lesquels vous accepter de ne pas "
 "enregistrer les conversations s'il ne veut pas."
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Espace envoyée après inactivité"
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "ping XMPP envoyé après inactivité"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Nombre de secondes d'attente pour la réponse du Paquet d'Entretien de "
 "Connexion avant de tenter de se connecter."
 
 #. yes, no, ask
-#: ../src/common/config.py:350
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de jabberd2"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4692,7 +4770,7 @@ msgstr ""
 "Si cette case est cochée, Gajim utilisera votre IP et les proxies définis "
 "dans l'option file_transfer_proxies pour les transferts de fichiers."
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:379
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
@@ -4701,26 +4779,26 @@ msgstr ""
 "être sûr qu'ils fonctionnent. Les proxys de Openfire sont connus pour "
 "échouer à ce test, même s'ils fonctionnent"
 
-#: ../src/common/config.py:368
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Répondre aux demandes d'accusés de réception"
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Envoyer des demandes d'accusés de réception"
 
-#: ../src/common/config.py:378
+#: ../src/common/config.py:403
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Si cette case est cochée, Gajim autorisera les autres à détecter le système "
 "d'exploitation que vous utilisez"
 
-#: ../src/common/config.py:379
+#: ../src/common/config.py:404
 msgid "Allow Gajim to send your local time."
 msgstr "Autorise Gajim à envoyer votre heure."
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4728,15 +4806,15 @@ msgstr ""
 "Durant la négociation d'une session chiffrée, Gajim doit-il partir du "
 "principe que vous voulez archiver vos conversations ?"
 
-#: ../src/common/config.py:383
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr "Message à envoyer aux contacts que vous souhaitez ajouter"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr "Date de la dernière synchronisation des logs avec le serveur."
 
-#: ../src/common/config.py:385
+#: ../src/common/config.py:410
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
@@ -4744,7 +4822,7 @@ msgstr ""
 "Si activé et si le serveur supporte cette fonctionnalité, Gajim recevra les "
 "messages envoyés et reçus par les autres resources."
 
-#: ../src/common/config.py:386
+#: ../src/common/config.py:411
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -4752,23 +4830,32 @@ msgstr ""
 "Si activé, Gajim enverra vos IPs publiques pour que vos contacts puissent se "
 "connecter à votre machine pour les transfert de fichiers."
 
-#: ../src/common/config.py:387
+#: ../src/common/config.py:412
 msgid "Latest token for Oauth2 authentication."
 msgstr "Dernier jeton pour l'authentification Oauth2."
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:413
 msgid "client_id for Oauth2 authentication."
 msgstr "client_id pour l'authentification Oauth2."
 
-#: ../src/common/config.py:389
+#: ../src/common/config.py:414
 msgid "redirect_url for Oauth2 authentication."
 msgstr "redirect_url pour l'authentification Oauth2."
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:415
+#, fuzzy
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+"Liste de jid, séparée par un espace, pour lesquels vous accepter de ne pas "
+"enregistrer les conversations s'il ne veut pas."
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Est-ce que OpenPGP est activé pour ce contact ?"
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4776,11 +4863,29 @@ msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée avec ce "
 "contact quand cela est possible ?"
 
-#: ../src/common/config.py:453 ../src/common/config.py:456
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Langue dans laquelle faire la vérification orthographique"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Le nombre de lignes d'archives qui seront demandées en entrant dans un "
+"salon. -1 signifie \"pas de limitation\""
+
+#: ../src/common/config.py:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Le nombre de minutes d'archives qui seront demandées en entrant dans un "
+"salon. -1 signifie \"pas de limitation\""
+
+#: ../src/common/config.py:487
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -4790,83 +4895,83 @@ msgstr ""
 "s'eteint). Cette option NE DEVRAIT PAS être utilisée pour (dés)activer un "
 "plugin. Utiliser l'interface graphique pour cela."
 
-#: ../src/common/config.py:464 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dort"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:466 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:468 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Travaille"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Disponible"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:483 ../src/config.py:1652
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: ../src/common/config.py:486 ../src/common/config.py:487
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:526
 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."
@@ -4874,31 +4979,31 @@ 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:498
+#: ../src/common/config.py:527
 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:507 ../src/common/optparser.py:310
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:511 ../src/common/optparser.py:296
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:515
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:519
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/config.py:526
+#: ../src/common/config.py:555
 msgid "Tor"
 msgstr "Tor"
 
-#: ../src/common/connection_handlers_events.py:367
+#: ../src/common/connection_handlers_events.py:370
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4908,23 +5013,23 @@ msgstr ""
 "à votre liste de contacts. Utilisez un outil de gestion de liste de contact "
 "tel que http://jru.jabberstudio.org pour le supprimer"
 
-#: ../src/common/connection_handlers_events.py:799
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers_events.py:884
-#: ../src/common/connection_handlers.py:334
-#: ../src/common/connection_handlers.py:946
-#: ../src/common/connection_handlers.py:1058 ../src/common/connection.py:453
-#: ../src/common/logger.py:1142 ../src/gajim.py:392 ../src/session.py:97
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "Erreur d'Écriture du disque"
 
-#: ../src/common/connection_handlers_events.py:888
-#: ../src/common/connection_handlers.py:949
-#: ../src/common/connection_handlers.py:1061 ../src/common/connection.py:457
-#: ../src/common/logger.py:1145 ../src/gajim.py:211 ../src/session.py:101
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4936,144 +5041,148 @@ msgstr ""
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:909
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: ../src/common/connection_handlers_events.py:917
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: ../src/common/connection_handlers_events.py:1001
-#: ../src/common/connection_handlers_events.py:1038
-#: ../src/common/connection.py:263 ../src/config.py:2149 ../src/config.py:2158
-#: ../src/config.py:2226 ../src/config.py:3667 ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3095
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/common/connection_handlers_events.py:1002
-#: ../src/common/connection_handlers_events.py:1039
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 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é."
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1064
-#: ../src/gui_interface.py:430 ../src/gui_interface.py:444
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: ../src/common/connection_handlers_events.py:1498
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection_handlers_events.py:2030 ../src/dialogs.py:2782
-#: ../src/notify.py:263
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
-#: ../src/common/connection_handlers_events.py:2032
+#: ../src/common/connection_handlers_events.py:2213
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau message simple de %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2036 ../src/dialogs.py:2783
-#: ../src/notify.py:264
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/common/connection_handlers_events.py:2038
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nouveau message privé dans le salon %s"
 
-#: ../src/common/connection_handlers_events.py:2041
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/common/connection_handlers_events.py:2044
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Message de %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2048 ../src/dialogs.py:2782
-#: ../src/notify.py:263
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: ../src/common/connection_handlers_events.py:2050
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau message de %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2179
+#: ../src/common/connection_handlers_events.py:2375
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: ../src/common/connection_handlers_events.py:2181
-#: ../src/groupchat_control.py:205 ../src/groupchat_control.py:1765
-#: ../src/history_window.py:448
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: ../src/common/connection_handlers_events.py:2186 ../src/dialogs.py:2794
-#: ../src/notify.py:277
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: ../src/common/connection_handlers_events.py:2188
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté(e)"
 
 #. default value
-#: ../src/common/connection_handlers_events.py:2193 ../src/dialogs.py:2778
-#: ../src/notify.py:259
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/common/connection_handlers_events.py:2195
+#: ../src/common/connection_handlers_events.py:2389
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté(e)"
 
-#: ../src/common/connection_handlers_events.py:2200 ../src/dialogs.py:2780
-#: ../src/notify.py:261
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
-#: ../src/common/connection_handlers.py:88
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+#: ../src/common/connection_handlers.py:92
+#: ../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:121
+#: ../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:129
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "L'inscription a réussi"
 
-#: ../src/common/connection_handlers.py:130
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Enregistrement avec l'agent %s réussi"
 
-#: ../src/common/connection_handlers.py:139
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "L'inscription a échoué"
 
-#: ../src/common/connection_handlers.py:140
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -5081,16 +5190,16 @@ msgstr ""
 "L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:571 ../src/common/connection.py:1547
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Invisibilité non-supportée"
 
-#: ../src/common/connection_handlers.py:572 ../src/common/connection.py:1548
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Le compte %s ne supporte pas l'invisibilité."
 
-#: ../src/common/connection_handlers.py:1720
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
@@ -5222,28 +5331,29 @@ 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:264 ../src/dialogs.py:3096
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:286
+#: ../src/common/connection.py:304
 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:289
+#: ../src/common/connection.py:307
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 "La clef du contact (%s) ne correspond pas à la clef assignée dans Gajim."
 
 #. we're not english: one in locale and one en
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
 
-#: ../src/common/connection.py:440
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5252,78 +5362,82 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:855
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:942
 #, 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"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:908
+#: ../src/common/connection.py:984
 #, 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:925
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:926
+#: ../src/common/connection.py:1002
 #, 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:1201 ../src/common/connection.py:1356
-#: ../src/common/connection.py:1983
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1202 ../src/gui_interface.py:539
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Impossible de se connecter à \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/common/connection.py:1207
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "le serveur a répondu : %s"
 
-#: ../src/common/connection.py:1222
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "La connexion au proxy a échoué"
 
-#: ../src/common/connection.py:1260 ../src/common/connection.py:1332
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter au compte %s"
 
-#: ../src/common/connection.py:1261 ../src/common/connection.py:1333
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1286
+#: ../src/common/connection.py:1388
 #, 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:1289
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -5332,7 +5446,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: ../src/common/connection.py:1291
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -5341,7 +5455,7 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection.py:1314
+#: ../src/common/connection.py:1420
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -5350,24 +5464,26 @@ msgstr ""
 "L'authentification du certificat %s peut être invalide.\n"
 "Le certificat ne couvre pas ce domaine."
 
-#: ../src/common/connection.py:1357
-msgid "Check your connection or try again later"
-msgstr "Vérifiez votre connexion ou réessayer plus tard"
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1392
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:1393
+#: ../src/common/connection.py:1499
 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:1468
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: ../src/common/connection.py:1469
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5376,68 +5492,68 @@ 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:1850
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Contact envoyé : « %s » (%s)"
 
-#: ../src/common/connection.py:1853
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Contacts envoyés :"
 
-#: ../src/common/connection.py:2000 ../src/common/connection.py:2023
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
-#: ../src/common/connection.py:2583
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "La désinscription a échoué"
 
-#: ../src/common/connection.py:2584
+#: ../src/common/connection.py:2827
 #, 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:126 ../src/common/helpers.py:67
-#: ../src/gui_interface.py:482
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "Observateurs"
 
-#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
-#: ../src/common/helpers.py:67 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:859
-#: ../src/roster_window.py:1556 ../src/roster_window.py:1660
-#: ../src/roster_window.py:1662 ../src/roster_window.py:1824
-#: ../src/roster_window.py:2514
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Passerelles"
 
-#: ../src/common/contacts.py:366
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Pas dans la liste"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "La passerelle python - D-Bus n'est pas installée sur cet ordinateur"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus n'est pas correctement lancé sur cette machine"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 "D-Bus n'est pas correctement lancé sur cette machine : le bus de session "
 "n'est pas disponible"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
 "D-Bus n'est pas correctement lancé sur cette machine : le bus de session "
@@ -5452,7 +5568,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Service indisponible : Gajim n'est pas lancé ou remote_control est False"
 
-#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus n'est pas présent sur cette machine"
 
@@ -5669,7 +5785,7 @@ msgstr "Caractère non valide dans la ressource."
 msgid "_Busy"
 msgstr "O_ccupé(e)"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:196
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Occupé(e)"
 
@@ -5677,7 +5793,7 @@ msgstr "Occupé(e)"
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:198
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
 msgid "Not Available"
 msgstr "Non disponible"
 
@@ -5685,7 +5801,7 @@ msgstr "Non disponible"
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:237 ../src/tooltips.py:192
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
@@ -5693,7 +5809,7 @@ msgstr "Disponible pour discuter"
 msgid "?user status:_Available"
 msgstr "?user status:_Disponible"
 
-#: ../src/common/helpers.py:242 ../src/tooltips.py:190
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "?user status:Disponible"
 
@@ -5709,7 +5825,7 @@ msgstr "_Absent(e)"
 msgid "_Offline"
 msgstr "Déc_onnecté(e)"
 
-#: ../src/common/helpers.py:254 ../src/tooltips.py:200
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Déconnecté(e)"
 
@@ -5781,19 +5897,19 @@ msgstr "Visiteurs"
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:316 ../src/tooltips.py:211
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: ../src/common/helpers.py:318 ../src/tooltips.py:217
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/common/helpers.py:320 ../src/tooltips.py:215
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../src/common/helpers.py:322 ../src/tooltips.py:213
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Membre"
 
@@ -5894,33 +6010,33 @@ msgstr[1] "%d événements en attente"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1361
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "Bonjour, je m'appelle $name."
 
-#: ../src/common/helpers.py:1471 ../src/common/helpers.py:1480
-#: ../src/common/helpers.py:1534
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: ../src/common/helpers.py:1490 ../src/common/helpers.py:1532
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/common/helpers.py:1500
+#: ../src/common/helpers.py:1507
 msgid "PyCURL is not installed"
 msgstr "PyCURL n'est pas installé"
 
-#: ../src/common/helpers.py:1536
+#: ../src/common/helpers.py:1543
 msgid "Error loading image"
 msgstr "Erreur lors du chargement de l'image"
 
-#: ../src/common/jingle_rtp.py:109
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s erreur de configuration"
 
-#: ../src/common/jingle_rtp.py:110
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5939,11 +6055,11 @@ msgstr ""
 "L'error était :\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:208
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "Erreur GStreamer"
 
-#: ../src/common/jingle_rtp.py:208
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5952,108 +6068,114 @@ msgstr ""
 "Message d'erreur : %s\n"
 "Debug : %s"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "Entrée audio"
 
-#: ../src/common/jingle_rtp.py:341
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "Sortie audio"
 
-#: ../src/common/jingle_rtp.py:384
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "Entrée vidéo"
 
-#: ../src/common/jingle_rtp.py:393
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "Sortie audio"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Erreur en exécutant « %(command)s » : %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s n'est pas un loglevel valide"
 
-#: ../src/common/multimedia_helpers.py:39
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr "Périphérique par défaut"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:60
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Test audio"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:79
-#: ../src/common/multimedia_helpers.py:93
-#: ../src/common/multimedia_helpers.py:111
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "Autodétection"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA : %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
 #, python-format
 msgid "Pulse: %s"
 msgstr "Pulse : %s"
 
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:77
-#: ../src/common/multimedia_helpers.py:105
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "Sortie audio feinte"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:90
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Test vidéo"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2 : %s"
 
-#: ../src/common/multimedia_helpers.py:108
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "vert"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "Sortie audio"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X Window System (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:110
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X Window System (without Xv)"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:203
-#: ../src/gtkgui_helpers.py:219
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:385
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
@@ -6690,19 +6812,117 @@ msgstr "Étudie"
 msgid "Writing"
 msgstr "Écrit"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Par défaut"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "Marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Se cache"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Compte"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Ligne de compte"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+# ccount). Description column
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Description"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Erreur"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "un"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "groupe de discussion"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+#, fuzzy
+msgid "street"
+msgstr "flux"
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "URI"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Artiste Inconnu"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Titre Iconnu"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Source Inconnue"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6711,22 +6931,8 @@ msgstr ""
 "<b>« %(title)s »</b> par <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Impossible de débloquer le port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Il se peut qu'une autre instance de Gajim soit en cours d'exécution. Le "
-"transfert de fichiers sera annulé."
-
 #. we're not english
-#: ../src/common/stanza_session.py:424
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6775,47 +6981,45 @@ msgstr "Vérifiez si avahi-daemon est actif."
 msgid "Could not change status of account \"%s\""
 msgstr "Impossible de changer l'état du compte « %s »"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:352
-#: ../src/common/zeroconf/connection_zeroconf.py:392
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Votre message n'a pas pu être envoyé."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:366
-#: ../src/common/zeroconf/connection_zeroconf.py:406
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:433
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "La connexion à l'hôte n'a pas pu être établie : délai d'envoi des données "
 "dépassé"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:193
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Erreur en ajoutant le service. %s"
 
-#: ../src/config.py:407
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Message par défaut"
 
-#: ../src/config.py:416
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/config.py:469 ../src/config.py:473 ../src/config.py:3159
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/config.py:757 ../src/dialogs.py:1493
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Le dictionnaire pour la langue %s est indisponible"
 
-#: ../src/config.py:758
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6824,215 +7028,216 @@ msgstr ""
 "Vous devez installer le dictionnaire %s pour la vérification orthographique, "
 "ou choisir un autre langage en paramétrant l'option speller_language."
 
-#: ../src/config.py:1238
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:1238
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "texte du message d'état :"
 
 #. Name column
-#: ../src/config.py:1566 ../src/dialogs.py:2539 ../src/dialogs.py:2606
-#: ../src/dialogs.py:3398 ../src/disco.py:886 ../src/disco.py:1744
-#: ../src/disco.py:2046 ../src/history_window.py:91
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1662
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si vous voulez que vos changements soit appliqués immédiatement, vous devez "
 "vous reconnecter."
 
-#: ../src/config.py:1816 ../src/config.py:1949
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1989 ../src/config.py:2036
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1990
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les événements avant de supprimer ce compte."
 
-#: ../src/config.py:2019
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
 
-#: ../src/config.py:2020
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Toutes les fenêtres de conversation et de salons de discussion seront "
 "fermées. Voulez-vous continuer ?"
 
-#: ../src/config.py:2032 ../src/config.py:2574 ../src/config.py:2611
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Pour changer le nom du compte, vous devez être déconnecté."
 
-#: ../src/config.py:2037
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "Pour changer le nom du compte, vous devez lire tous ses événements."
 
-#: ../src/config.py:2043
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:2044
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom."
 
-#: ../src/config.py:2048 ../src/config.py:2052
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:2049
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:2053
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:2130
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Renommer le compte"
 
-#: ../src/config.py:2131
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entrez un nouveau nom pour le compte %s"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2168
 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:2382 ../src/config.py:3713
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:2383 ../src/config.py:3714
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Aucune clef OpenPGP disponible."
 
-#: ../src/config.py:2439
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2466
 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:2455 ../src/dialogs.py:2290 ../src/dialogs.py:2528
-#: ../src/dialogs.py:2716 ../src/disco.py:515 ../src/profile_window.py:361
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:2460
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#: ../src/config.py:2575 ../src/config.py:2612
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Afin de désactiver un compte vous devez être déconnecté."
 
-#: ../src/config.py:2581
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
 
-#: ../src/config.py:2582
+#: ../src/config.py:2605
 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:2739
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2741
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the beginning
-#: ../src/config.py:2777
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Liste des bannis"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Liste des membres"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Liste des propriétaires"
 
-#: ../src/config.py:2779
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2843 ../src/disco.py:893 ../src/history_manager.py:207
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: ../src/config.py:2853
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2860
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2866
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2893
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2895
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -7040,11 +7245,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2897
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2898
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -7052,11 +7257,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2900
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2901
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -7064,11 +7269,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2903
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2904
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -7076,7 +7281,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2905
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -7093,104 +7298,104 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:3006
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:3021
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "Compte désactivé"
 
-#: ../src/config.py:3022
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr "Pour se désinscrire d'un serveur, le compte doit être activé."
 
-#: ../src/config.py:3035 ../src/gui_interface.py:283
-#: ../src/gui_interface.py:711
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:3036 ../src/gui_interface.py:691
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:3037 ../src/gui_interface.py:711
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:3047
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:3062
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "La connexion au serveur %s a échoué"
 
-#: ../src/config.py:3063
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "Que voulez vous faire ?"
 
-#: ../src/config.py:3064
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "Supprimer le compte de Gajim _uniquement"
 
-#: ../src/config.py:3065
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ne rien supprimer. Je réessaierai plus tard."
 
-#: ../src/config.py:3159
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
 
-#: ../src/config.py:3160
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
-#: ../src/config.py:3161
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "Aucun"
 
-#: ../src/config.py:3233
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:3267
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
 
-#: ../src/config.py:3393 ../src/config.py:3404 ../src/config.py:3413
-#: ../src/config.py:3424 ../src/config.py:3432
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Caractère non-autorisé"
 
-#: ../src/config.py:3404 ../src/config.py:3412 ../src/config.py:3424
-#: ../src/config.py:3689
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
-#: ../src/config.py:3431
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Salon invalide"
 
-#: ../src/config.py:3601
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3602 ../src/config.py:3608
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -7200,32 +7405,32 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3607
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3646
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3648
+#: ../src/config.py:3661
 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:3690
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
 
-#: ../src/config.py:3746 ../src/gui_interface.py:1213
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: ../src/config.py:3747 ../src/gui_interface.py:1214
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3835
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7240,7 +7445,7 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: ../src/config.py:3841 ../src/gui_interface.py:1242
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7251,77 +7456,89 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 "%s"
 
-#: ../src/config.py:3873 ../src/config.py:3907
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3972
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3973
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/config.py:4103
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "Le nœud PEP n'a pas été supprimé"
 
-#: ../src/config.py:4104
+#: ../src/config.py:4119
 #, 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:4132
+#: ../src/config.py:4147
 #, python-format
 msgid "Configure %s"
 msgstr "Configurer %s"
 
-#: ../src/config.py:4148 ../src/plugins/gui.py:74
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:4156
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:4191
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Premier message reçu"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Premier message reçu"
 
-#: ../src/config.py:4192
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Message Reçu Suivant Avec le Focus."
 
-#: ../src/config.py:4194
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Message Reçu Suivant Sans le Focus"
 
-#: ../src/config.py:4195
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Contact connecté"
 
-#: ../src/config.py:4196
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Contact déconnecté"
 
-#: ../src/config.py:4197
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Message envoyé"
 
-#: ../src/config.py:4198
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un salon mis en surbrillance"
 
-#: ../src/config.py:4199
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: ../src/config.py:4200
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Courriel Gmail reçu"
 
-#: ../src/conversation_textview.py:603
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -7331,7 +7548,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:622
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -7339,45 +7556,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:742
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Citation"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:767
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:835
 #, 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:797
+#: ../src/conversation_textview.py:848
 #, 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:800
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:806
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1323
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7385,193 +7602,193 @@ msgstr[0] "Hier"
 msgstr[1] "il y a %(nb_days)i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1372 ../src/history_window.py:481
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: ../src/dataforms_widget.py:565
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "Impossible de charger l'image"
 
-#: ../src/dataforms_widget.py:567
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Type de média non-supportée : %s"
 
-#: ../src/dataforms_widget.py:582
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "Le champ est requis"
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Identifiant Jabber déjà existant"
 
-#: ../src/dataforms_widget.py:628
+#: ../src/dataforms_widget.py:638
 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:639
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "nouveau@jabber.id"
 
-#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nouveau%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nom du contact : <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Identifiant Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:197
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:295
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:475
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Définir l'Humeur"
 
-#: ../src/dialogs.py:595
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:609
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:800
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Remplacer le message de statut ?"
 
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:805
 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:809
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Adresse AIM :"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Numéro GG :"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Numéro ICQ :"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Adresse MSN :"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Adresse Yahoo! :"
 
-#: ../src/dialogs.py:879
+#: ../src/dialogs.py:883
 #, 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:882
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:1081
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:1086
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1279
 msgid "A GTK+ Jabber/XMPP client"
 msgstr "Un client Jabber/XMPP en GTK+"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Version de GTK+ :"
 
-#: ../src/dialogs.py:1275
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Version de PyGTK :"
 
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Développeurs actuels :"
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1305
 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:1311
+#: ../src/dialogs.py:1317
 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:1494
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7584,114 +7801,161 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: ../src/dialogs.py:1877
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Connexion non-sécurisée"
+
+#: ../src/dialogs.py:1846
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Vous êtes sur le point de vous connecter au compte %(account)s (%(server)s) "
+"avec une connexion non-sécurisée. Cela signifie que toutes vos conversations "
+"ne seront pas chiffrées. Ce type de connexion est vraiment déconseillé.\n"
+"Êtes vous sûr de vouloir faire cela ?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr "Gajim ne se connectera pas si vous ne cochez pas cette case."
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "_Ne plus me poser la question"
+
+#: ../src/dialogs.py:1950
 msgid "_Resume"
 msgstr "Reprendre"
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:1958
 msgid "Re_place"
 msgstr "Remplacer"
 
-#: ../src/dialogs.py:2079 ../src/dialogs.py:2480
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Le pseudonyme contient des caractères non autorisés."
 
-#: ../src/dialogs.py:2198
+#: ../src/dialogs.py:2277
 #, 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:2201
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:2285 ../src/gui_interface.py:1970
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:2291
+#: ../src/dialogs.py:2370
 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:2335
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:2466
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Mauvaise adresse (URI)"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Ceci n'est pas une conversation multi-utilisateurs"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Compte invalide"
 
-#: ../src/dialogs.py:2467
+#: ../src/dialogs.py:2599
 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:2479
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:2484 ../src/dialogs.py:2490
-#: ../src/groupchat_control.py:2091
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber de salon invalide"
 
-#: ../src/dialogs.py:2485
+#: ../src/dialogs.py:2617
 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:2491 ../src/groupchat_control.py:2092
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 "L'identifiant jabber du salon de discussion contient des caractères "
 "interdits."
 
-#: ../src/dialogs.py:2496 ../src/gui_interface.py:1952
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: ../src/dialogs.py:2497 ../src/gui_interface.py:1953
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, 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:2529
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: ../src/dialogs.py:2542
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/dialogs.py:2578
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: ../src/dialogs.py:2579
+#: ../src/dialogs.py:2713
 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:2604
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: ../src/dialogs.py:2665
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:2667
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:2668
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7700,137 +7964,135 @@ msgstr ""
 "envoyer un message :"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2695 ../src/dialogs.py:3076 ../src/dialogs.py:3311
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:2696 ../src/dialogs.py:3077 ../src/dialogs.py:3312
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:2705 ../src/dialogs.py:2708
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:2708
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossible d'interpréter \"%s\"."
 
-#: ../src/dialogs.py:2717
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:2736
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/dialogs.py:2736
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:2740
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:2741
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
-#: ../src/dialogs.py:2783 ../src/gui_interface.py:852 ../src/notify.py:273
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: ../src/dialogs.py:2785 ../src/gui_interface.py:907 ../src/notify.py:266
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:2787 ../src/gui_interface.py:814
-#: ../src/gui_interface.py:878 ../src/notify.py:268
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: ../src/dialogs.py:2789 ../src/gui_interface.py:953
-#: ../src/gui_interface.py:976 ../src/gui_interface.py:993
-#: ../src/notify.py:270
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/dialogs.py:2790 ../src/gui_interface.py:956 ../src/notify.py:271
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/dialogs.py:2792 ../src/gui_interface.py:624 ../src/notify.py:275
-msgid "Groupchat Invitation"
-msgstr "Invitation à un salon"
-
-#: ../src/dialogs.py:2995
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:2997
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: ../src/dialogs.py:2999
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:3002
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3185
 #, 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:3132
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:3133
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:3192
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:3194
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3341
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "Ajouter"
 
-#: ../src/dialogs.py:3341
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "Modifier"
 
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "Supprimer"
 
-#: ../src/dialogs.py:3371
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7840,172 +8102,181 @@ msgstr ""
 "votre liste."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3389 ../src/dialogs.py:3464
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../src/dialogs.py:3395
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Identifiant Jabber"
 
-#: ../src/dialogs.py:3401
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Groupes"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3509
+#: ../src/dialogs.py:3646
 #, 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:3523
-#, python-format
-msgid "Added  %s contacts"
-msgstr "%s contacts ajoutés"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "%s contacts ajoutés"
+msgstr[1] "%s contacts ajoutés"
 
-#: ../src/dialogs.py:3560
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "Enlever %s contacts"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Enlever %s contacts"
+msgstr[1] "Enlever %s contacts"
 
-#: ../src/dialogs.py:3600 ../src/dialogs.py:3777
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Sauvegarde des préférences pour %s"
 
-#: ../src/dialogs.py:3640
+#: ../src/dialogs.py:3779
 msgid "Invalid expire value"
 msgstr "Valeur d'expiration non valide"
 
-#: ../src/dialogs.py:3641
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr "La valeur d'expiration doit être un nombre positif."
 
-#: ../src/dialogs.py:3688
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr "Il y a une erreur dans le formulaire"
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr "Le service a renvoyé une erreur."
 
-#: ../src/dialogs.py:3976
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3980
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: ../src/dialogs.py:4047
+#: ../src/dialogs.py:4186
 #, 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:4052
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:4103
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: ../src/dialogs.py:4214
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: ../src/dialogs.py:4315
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: ../src/dialogs.py:4405
+#: ../src/dialogs.py:4544
 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:4437
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes invité(e) dans un groupe de discussion"
 
-#: ../src/dialogs.py:4440
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: ../src/dialogs.py:4442
+#: ../src/dialogs.py:4585
 #, 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:4450
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:4452
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/dialogs.py:4514
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "Choisissez le certificat client #PCKS12"
 
-#: ../src/dialogs.py:4524 ../src/dialogs.py:4566 ../src/dialogs.py:4622
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:4529
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "Fichier PKCS12"
 
-#: ../src/dialogs.py:4556
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:4571
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:4609
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:4627
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:4697
+#: ../src/dialogs.py:4847
 msgid "Choose Archive"
 msgstr "Choisissez une Archive"
 
-#: ../src/dialogs.py:4715
+#: ../src/dialogs.py:4865
 msgid "Zip files"
 msgstr "fichiers Zip"
 
-#: ../src/dialogs.py:4741
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:4743
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
-#: ../src/dialogs.py:4963
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -8016,19 +8287,19 @@ msgstr ""
 "\n"
 "La Short Authentication String cette session est <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4966
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Vous avez déjà vérifié l'identité de ce contact."
 
-#: ../src/dialogs.py:4972 ../src/dialogs.py:5056
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Identité du contact vérifiée"
 
-#: ../src/dialogs.py:4978
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Vérifier à nouveau..."
 
-#: ../src/dialogs.py:4983
+#: ../src/dialogs.py:5133
 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 "
@@ -8038,19 +8309,19 @@ msgstr ""
 "messages et vous en envoyer, vous devez vérifier son identité en cliquant "
 "sur le bouton en-dessous."
 
-#: ../src/dialogs.py:4986 ../src/dialogs.py:5037 ../src/dialogs.py:5050
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Identité du contact NON vérifiée"
 
-#: ../src/dialogs.py:4991
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Vérifier..."
 
-#: ../src/dialogs.py:5002
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Avez-vous vérifié l'identité du contact ?"
 
-#: ../src/dialogs.py:5003
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -8065,53 +8336,58 @@ msgstr ""
 "\n"
 "La Short Authentication String de cette session est : <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5004
+#: ../src/dialogs.py:5154
 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:5038
+#: ../src/dialogs.py:5189
 #, 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:5044
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5051
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "Une clef GPG est assignée à ce contact, mais vous <b>n'avez pas confiance en "
 "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:5057
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 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:5122
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "audio et vidéo"
 
-#: ../src/dialogs.py:5124
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "audio"
 
-#: ../src/dialogs.py:5126
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "vidéo"
 
-#: ../src/dialogs.py:5130
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -8120,12 +8396,12 @@ msgstr ""
 "%(contact)s veut démarrer un session %(type)s avec vous. Voulez-vous "
 "répondre à son appel ?"
 
-#: ../src/dialogs.py:5199
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Certificat pour le compte %s"
 
-#: ../src/dialogs.py:5199
+#: ../src/dialogs.py:5376
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -8164,37 +8440,42 @@ msgstr ""
 "<b>Empreinte</b>\n"
 "Empreinte SHA1 : %(sha1)s"
 
-#: ../src/dialogs.py:5233 ../src/dialogs.py:5250
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
 msgid "View cert..."
 msgstr "Voir cert..."
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Certificat client"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Autres"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8202,96 +8483,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:765 ../src/disco.py:1102
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 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:806 ../src/disco.py:816
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Nom de serveur invalide"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
 
-#: ../src/disco.py:914
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:1103
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1343
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Exécuter une commande"
 
-#: ../src/disco.py:1353 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanne %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Utilisateurs"
 
 # ccount). Description column
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2488
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2489
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, 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:1845 ../src/gui_interface.py:2503
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2504
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2055
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Inscrit"
 
-#: ../src/disco.py:2063
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Nœud"
 
-#: ../src/disco.py:2127
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nouvel article"
 
-#: ../src/disco.py:2133
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/disco.py:2139
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
@@ -8346,17 +8627,19 @@ msgstr "Nécessite python-dbus."
 
 #: ../src/features_window.py:61 ../src/features_window.py:69
 #: ../src/features_window.py:73 ../src/features_window.py:77
-#: ../src/features_window.py:89 ../src/features_window.py:109
-#: ../src/features_window.py:113 ../src/features_window.py:117
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Fonctionnalité indisponible sous Windows."
 
 #: ../src/features_window.py:62
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Chiffrement OpenGPG"
 
 #: ../src/features_window.py:63
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Chiffrement des messages avec des clefs GPG."
 
 #: ../src/features_window.py:64
@@ -8476,47 +8759,22 @@ msgid "Requires python2.5."
 msgstr "Nécessite python2.5"
 
 #: ../src/features_window.py:94
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:95
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Transforme les expressions LaTeX entre $$ $$."
-
-#: ../src/features_window.py:96
-msgid ""
-"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 ou ImageMagick). Vous devez définir "
-"« use_latex » à True dans l'éditeur de configuration avancée."
-
-#: ../src/features_window.py:97
-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 ""
-"Nécessite texlive-latex-base et (dvipng ou ImageMagick) (tout est dans "
-"MikTeX). Vous devez définir « use_latex » à True dans l'éditeur de "
-"configuration avancée."
-
-#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "Chiffrement des messages de bout en bout"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Chiffrement des messages de la conversation."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Nécessite python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "Générateur RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8524,130 +8782,139 @@ msgstr ""
 "Génère une sortie XHTML à partir d'un code RST (voir  http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Nécessite python-docutils."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Possibilité de démarrer une conversation audio et vidéo."
 
-#: ../src/features_window.py:108
-msgid "Requires python-farsight and gstreamer-plugins-bad."
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Requires python-farstream and gstreamer-plugins-bad."
 msgstr "Nécessite python-farsight et gstreamer-plugins-bad."
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "UPnP-IGD"
 msgstr "UPnP-IGD"
 
-#: ../src/features_window.py:111
+#: ../src/features_window.py:107
 msgid "Ability to request your router to forward port for file transfer."
 msgstr ""
 "Possibilité de demander à votre routeur de transférer le port pour le "
 "transfert de fichiers."
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:108
 msgid "Requires python-gupnp-igd."
 msgstr "Nécessite python-gupnp-igd."
 
-#: ../src/features_window.py:114
+#: ../src/features_window.py:110
 msgid "UPower"
 msgstr "UPower"
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
 msgid "Ability to disconnect properly just before suspending the machine."
 msgstr ""
 "Possibilité de se déconnecter proprement juste avant de mettre votre machine "
 "en veille."
 
-#: ../src/features_window.py:116
+#: ../src/features_window.py:112
 msgid "Requires upower and python-dbus."
 msgstr "Nécessite upower et python-dbus."
 
-#: ../src/features_window.py:124
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "?features:Disponible"
 
-#: ../src/features_window.py:131
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Fonctionnalité"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Durée"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progression"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:400
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:199
-#: ../src/history_manager.py:541
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vous"
 
-#: ../src/filetransfers_window.py:190
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:191 ../src/filetransfers_window.py:637
-#: ../src/tooltips.py:748
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enregistré dans : %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinataire : %s"
 
-#: ../src/filetransfers_window.py:239
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Message d'erreur : %s"
 
-#: ../src/filetransfers_window.py:268
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
+
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Choisissez un fichier à envoyer..."
 
-#: ../src/filetransfers_window.py:284 ../src/tooltips.py:786
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Description :"
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne peut accéder à ce fichier"
 
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Ce fichier est utilisé par un autre processus."
 
-#: ../src/filetransfers_window.py:336 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Impossible de remplacer le fichier existant \"%s\""
 
-#: ../src/filetransfers_window.py:337 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8655,54 +8922,64 @@ msgstr ""
 "Un fichier du même nom existe déjà et vous n'avez pas la permission de "
 "l'écraser."
 
-#: ../src/filetransfers_window.py:354 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:354 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:365 ../src/gtkgui_helpers.py:862
+#: ../src/filetransfers_window.py:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: ../src/filetransfers_window.py:366 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 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."
 
-#: ../src/filetransfers_window.py:377
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Enregistrer le Fichier sous..."
 
-#: ../src/filetransfers_window.py:397
+#: ../src/filetransfers_window.py:450
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ../src/filetransfers_window.py:403
+#: ../src/filetransfers_window.py:456
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: ../src/filetransfers_window.py:405
+#: ../src/filetransfers_window.py:458
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../src/filetransfers_window.py:406
+#: ../src/filetransfers_window.py:459
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Envoi du profil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Erreur de Transfert de fichier"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:469
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8710,78 +8987,119 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:562
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:605 ../src/filetransfers_window.py:608
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
-#: ../src/filetransfers_window.py:605
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Fichier : "
 
-#: ../src/filetransfers_window.py:609
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:633 ../src/tooltips.py:738
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:635 ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/filetransfers_window.py:797
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:194
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "Message :"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "É_moticônes :"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Ne le montrer que dans la liste"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Éditeur de configuration avancée"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s erreur de configuration"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "Configurer %s"
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim a besoin d'un serveur X pour démarrer. Fermeture..."
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "l'import de PyGTK a échoué : %s"
 
-#: ../src/gajim.py:237
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim a besoin de PyGTK 2.16 pour s'exécuter"
 
-#: ../src/gajim.py:238
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Gajim a besoin de PyGTK 2.16 ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:240
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim a besoin de GTK 2.16 ou supérieur"
 
-#: ../src/gajim.py:241
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim a besoin de GTK 2.16 ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:250
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim a besoin de pywin32 pour s'exécuter"
 
-#: ../src/gajim.py:251
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 msgstr "Assurez-vous que Pywin32 est installé. Vous pouvez l'obtenir ici : %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:367
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim est déjà en cours d'exécution"
 
-#: ../src/gajim.py:368
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8789,28 +9107,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.py:78
 msgid "Shows a help on specific command"
 msgstr "Afficher l'aide pour une commande"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "commande"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8818,35 +9136,37 @@ msgstr ""
 "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
 "sur une ligne séparée"
 
-#: ../src/gajim-remote.py: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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "compte"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Change l'état du ou des compte(s)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "état"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:110
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -8854,11 +9174,18 @@ msgstr ""
 "un parmi : offline, online, chat, away, xa, dnd, invisible. Si non défini, "
 "le précédant statut est utilisé"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "Message d'état"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8867,19 +9194,20 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "Change la priorité du ou des compte(s)"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "Priorité :"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "priorité que vous voulez donner au compte"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:122
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -8888,25 +9216,25 @@ msgstr ""
 "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.py:128
 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.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "L'identifiant Jabber du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
 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.py:140
 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 "
@@ -8916,29 +9244,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez seulement renseigner le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "clé pgp"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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.py:153
 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 "
@@ -8948,131 +9276,131 @@ 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.py:158
 msgid "subject"
 msgstr "sujet"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "sujet du message"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 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.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 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.py:184
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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.py:197
 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.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "touche"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Ajouter le contact à la liste"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Ajoute un nouveau contact à ce compte"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 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:242
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Renvoie le nombre de messages non-lus"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ouvre la fenêtre « Commencer une discussion »"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Commencer une discussion en utilisant ce compte"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Envoyer du XML personnalisé"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML à envoyer"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -9080,15 +9408,15 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "Modifier l'avatar"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "Image à utiliser"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -9096,71 +9424,74 @@ msgstr ""
 "Compte dans lequel l'avatar sera envoyé ; si non spécifié, l'avatar sera "
 "envoyé à tous les comptes"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 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:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "URI à gérer"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr "Compte avec lequel vous voulez le gérer"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "Contenu du message"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Joindre un groupe de discussions"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "groupe de discussion"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "JID du salon"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "pseudonyme"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "Surnom à utiliser"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "mot de passe"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "Mot de passe pour entrer dans le salon"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 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
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Montre ou cache la fenêtre ipython"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:349
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -9169,17 +9500,17 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:352
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 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:432
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -9188,25 +9519,27 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:440
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:446
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:515
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9215,7 +9548,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9224,11 +9557,11 @@ 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:539
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "Pas d'uri donnée"
 
-#: ../src/gajim-remote.py:541
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "Mauvaise adresse (URI)"
 
@@ -9254,214 +9587,221 @@ msgid "You cannot delete your current theme"
 msgstr "Vous ne pouvez pas supprimer le thème actuellement utilisé"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:179 ../src/groupchat_control.py:1567
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, 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:233
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:235
+#: ../src/groupchat_control.py:238
 #, 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:563
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: ../src/groupchat_control.py:746
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: ../src/groupchat_control.py:748
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
-#: ../src/groupchat_control.py:1225
+#: ../src/groupchat_control.py:1268
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s a changé le sujet en %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1243 ../src/groupchat_control.py:1509
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
-#: ../src/groupchat_control.py:1246
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: ../src/groupchat_control.py:1248
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "Le salon n'affiche plus les membres non-disponibles"
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1293
 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/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "L'enregistrement des conversations du salon est maintenant activé"
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "Le salon n'est plus anonyme"
 
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "Le salon est maintenant sami-anonyme"
 
-#: ../src/groupchat_control.py:1264
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s a été éjecté du salon (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1514
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: ../src/groupchat_control.py:1516
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1597
 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:1525
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1528
+#: ../src/groupchat_control.py:1606
 #, 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:1537
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1618
 #, 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:1551 ../src/groupchat_control.py:1655
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:1609 ../src/groupchat_control.py:1614
-#: ../src/groupchat_control.py:1620
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1611
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: ../src/groupchat_control.py:1616
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: ../src/groupchat_control.py:1622
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1795
 #, 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:1709
+#: ../src/groupchat_control.py:1799
 #, 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:1724
+#: ../src/groupchat_control.py:1814
 #, 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:1728
+#: ../src/groupchat_control.py:1818
 #, 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:1758
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:1763
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#: ../src/groupchat_control.py:2018
+#: ../src/groupchat_control.py:2124
 #, 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:2020
+#: ../src/groupchat_control.py:2126
 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:2024 ../src/gui_interface.py:683
-#: ../src/gui_interface.py:1321 ../src/gui_interface.py:1361
-#: ../src/gui_interface.py:1402 ../src/message_window.py:224
-#: ../src/roster_window.py:2983 ../src/roster_window.py:3661
-#: ../src/roster_window.py:4467
-msgid "_Do not ask me again"
-msgstr "_Ne plus me poser la question"
-
-#: ../src/groupchat_control.py:2058
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:2059
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:2066
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:2067
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+"L'identifiant jabber du salon de discussion contient des caractères "
+"interdits."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2098
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: ../src/groupchat_control.py:2099
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9469,22 +9809,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:2101
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2296
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:2297 ../src/groupchat_control.py:2629
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2628
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -9509,60 +9849,60 @@ msgstr "_Rapporter l'anomalie"
 msgid "Details"
 msgstr "Détails"
 
-#: ../src/gtkgui_helpers.py:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 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:392
+#: ../src/gtkgui_helpers.py:393
 #, 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:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim n'est pas le client Jabber par défaut"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 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:768
+#: ../src/gtkgui_helpers.py:769
 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:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Extension non supportée"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:131 ../src/gui_interface.py:295
-#: ../src/gui_interface.py:304 ../src/gui_interface.py:310
-#: ../src/gui_interface.py:313 ../src/gui_interface.py:316
-#: ../src/gui_interface.py:321
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9573,87 +9913,87 @@ msgstr ""
 "utilisé ou enregistré par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gui_interface.py:135
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Toujours utiliser ce pseudo en cas de conflit"
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:157
 #, 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:157
+#: ../src/gui_interface.py:160
 #, 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:200 ../src/notify.py:279
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: ../src/gui_interface.py:284
+#: ../src/gui_interface.py:287
 #, 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:296
+#: ../src/gui_interface.py:299
 #, python-format
 msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Le nombre maximal d'utilisateurs pour <b>%s</b> a été atteint"
 
-#: ../src/gui_interface.py:305
+#: ../src/gui_interface.py:308
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Vous êtes banni du salon <b>%s</b>."
 
-#: ../src/gui_interface.py:311
+#: ../src/gui_interface.py:314
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Le salon <b>%s</b> n'existe pas."
 
-#: ../src/gui_interface.py:314
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/gui_interface.py:317
+#: ../src/gui_interface.py:320
 #, python-format
 msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Votre pseudonyme enregistré doit être utilisé dans le salon <b>%s</b>."
 
-#: ../src/gui_interface.py:322
+#: ../src/gui_interface.py:325
 #, 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:415 ../src/gui_interface.py:419
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
-#: ../src/gui_interface.py:471 ../src/notify.py:281
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Requête d'Inscription"
 
-#: ../src/gui_interface.py:496
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gui_interface.py:497
+#: ../src/gui_interface.py:500
 #, 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:505
+#: ../src/gui_interface.py:508
 #, 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:506
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9661,57 +10001,71 @@ msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: ../src/gui_interface.py:527 ../src/notify.py:283
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Désinscrit(e)"
 
-#: ../src/gui_interface.py:538
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gui_interface.py:636
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:638 ../src/gui_interface.py:646
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gui_interface.py:640
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gui_interface.py:645
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Mot de passe OpenGPG est incorrect"
 
-#: ../src/gui_interface.py:658
+#: ../src/gui_interface.py:681
 msgid "Certificate Passphrase Required"
 msgstr "Mot de passe du certificat requis"
 
-#: ../src/gui_interface.py:659
+#: ../src/gui_interface.py:682
 #, python-format
 msgid "Enter the passphrase for the certificate for account %s"
 msgstr "Entrez votre mot de passe pour le certificat pour le compte %s"
 
-#: ../src/gui_interface.py:681
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "la clef GPG n'est pas une clef de confiance"
 
-#: ../src/gui_interface.py:681
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 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:694
+#: ../src/gui_interface.py:717
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
@@ -9719,7 +10073,7 @@ msgstr ""
 "Gnome Keyring est installé mais pas correctement démarré (variable "
 "d'environnement probablement mal configurée)"
 
-#: ../src/gui_interface.py:732
+#: ../src/gui_interface.py:755
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
@@ -9727,23 +10081,23 @@ msgstr ""
 "Copiez / Collez le jeton de rafraichissement du site web qui vient d'être "
 "ouvert."
 
-#: ../src/gui_interface.py:735
+#: ../src/gui_interface.py:758
 msgid "Oauth2 Credentials"
 msgstr "Certificat Oauth2"
 
-#: ../src/gui_interface.py:825
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouveau courriel sur %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:827
+#: ../src/gui_interface.py:858
 #, 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:840
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9758,51 +10112,67 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:905
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gui_interface.py:977
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Transfert de fichier terminé"
+
+#: ../src/gui_interface.py:1059
 #, 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:981
+#: ../src/gui_interface.py:1063
 #, 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:994
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr ""
+"Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
+
+#: ../src/gui_interface.py:1080
 #, 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:998
+#: ../src/gui_interface.py:1084
 #, 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:1073
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
+
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Impossible de déchiffrer le message"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: ../src/gui_interface.py:1086
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9811,20 +10181,20 @@ msgstr ""
 "entrer une nouvelle"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1147
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gui_interface.py:1150
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/gui_interface.py:1237
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: ../src/gui_interface.py:1238
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9835,15 +10205,20 @@ msgstr ""
 "serveur Jabber : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: ../src/gui_interface.py:1247
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: ../src/gui_interface.py:1272
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Validation de certificat SSL"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Erreur de certificat SSL"
 
-#: ../src/gui_interface.py:1273
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9861,34 +10236,7 @@ msgstr ""
 "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
 "certificat ?"
 
-#: ../src/gui_interface.py:1312 ../src/gui_interface.py:1356
-#: ../src/gui_interface.py:1398
-msgid "Insecure connection"
-msgstr "Connexion non-sécurisée"
-
-#: ../src/gui_interface.py:1313
-#, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) with an "
-"insecure connection. This means all your conversations will be exchanged "
-"unencrypted. This type of connection is really discouraged.\n"
-"Are you sure you want to do that?"
-msgstr ""
-"Vous êtes sur le point de vous connecter au compte %(account)s (%(server)s) "
-"avec une connexion non-sécurisée. Cela signifie que toutes vos conversations "
-"ne seront pas chiffrées. Ce type de connexion est vraiment déconseillé.\n"
-"Êtes vous sûr de vouloir faire cela ?"
-
-#: ../src/gui_interface.py:1319 ../src/gui_interface.py:1360
-#: ../src/gui_interface.py:1401
-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:1320
-msgid "Gajim will NOT connect unless you check this box"
-msgstr "Gajim ne se connectera pas si vous ne cochez pas cette case."
-
-#: ../src/gui_interface.py:1357
+#: ../src/gui_interface.py:1447
 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?"
@@ -9897,7 +10245,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:1399
+#: ../src/gui_interface.py:1489
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -9906,11 +10254,11 @@ msgstr ""
 "chiffrée. Êtes vous sûr de vouloir le faire ?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1909 ../src/gui_interface.py:1932
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Émoticônes désactivées"
 
-#: ../src/gui_interface.py:1910
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9918,7 +10266,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:1933
+#: ../src/gui_interface.py:2019
 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 "
@@ -9928,7 +10276,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:1977 ../src/roster_window.py:3828
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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 "
@@ -9936,78 +10284,81 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2364
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: ../src/gui_interface.py:2926
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/gui_interface.py:2927
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:2941
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "Clef GPG expirée"
 
-#: ../src/gui_interface.py:2942
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP 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:2951
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: ../src/gui_interface.py:2952
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Nouveau Salon de Discussion"
 
-#: ../src/gui_menu_builder.py:420
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/history_manager.py:116
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "crée le répertoire %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l'historique"
 
-#. holds jid
-#: ../src/history_manager.py:156
-msgid "Contacts"
-msgstr "Contacts"
-
 #. holds time
-#: ../src/history_manager.py:169 ../src/history_manager.py:213
-#: ../src/history_window.py:99
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:176 ../src/history_manager.py:232
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. holds message
-#: ../src/history_manager.py:185 ../src/history_manager.py:220
-#: ../src/history_window.py:107
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Message"
 
 #. holds subject
-#: ../src/history_manager.py:193 ../src/history_manager.py:226
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../src/history_manager.py:252
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -10015,7 +10366,7 @@ msgstr ""
 "Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
 "LANCÉ)"
 
-#: ../src/history_manager.py:254
+#: ../src/history_manager.py:264
 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 "
@@ -10029,100 +10380,104 @@ msgstr ""
 "\n"
 "Si vous choisissez OUI, patientez..."
 
-#: ../src/history_manager.py:259
+#: ../src/history_manager.py:269
 msgid "Database Cleanup"
 msgstr "Nettoyage de la base de données"
 
-#: ../src/history_manager.py:477
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exportation de l'historique..."
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s le %(time)s a dit: %(message)s\n"
 
-#: ../src/history_manager.py:592
+#: ../src/history_manager.py:602
 #, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
 msgstr "Voulez-vous vraiment supprimer les logs de %(jid)s ?"
 
-#: ../src/history_manager.py:596
+#: ../src/history_manager.py:606
 msgid "Do you really want to delete logs of the selected contacts?"
 msgstr "Voulez vous réellement supprimer l'historique de ces contacts ?"
 
-#: ../src/history_manager.py:598 ../src/history_manager.py:637
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Ceci est une opération irréversible."
 
-#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
 msgid "Deletion Confirmation"
 msgstr "Confirmation de la suppression"
 
-#: ../src/history_manager.py:634
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
 msgstr[1] "Voulez-vous vraiment supprimer les messages sélectionnés ?"
 
-#: ../src/history_window.py:306
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historique de conversation avec %s"
 
-#: ../src/history_window.py:356
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Erreur du disque"
 
-#: ../src/history_window.py:444
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:455
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Erreur : %s"
 
-#: ../src/history_window.py:457
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/history_window.py:459
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:462
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/htmltextview.py:522
+#: ../src/htmltextview.py:523
 msgid "Loading"
 msgstr "Chargement"
 
-#: ../src/message_window.py:222
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr "La machine se met en veille"
+
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Vous êtes sur le point de fermer plusieurs onglets"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Voulez-vous vraiment tous les fermer ?"
 
-#: ../src/message_window.py:496
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/message_window.py:498
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/message_window.py:506
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Messages"
 
@@ -10134,48 +10489,53 @@ msgstr "- les messages seront archivés"
 msgid "- messages will not be logged"
 msgstr "- les messages ne seront pas archivés"
 
-#: ../src/notify.py:322
+#: ../src/notify.py:324
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/plugins/gui.py:68
+#: ../src/plugins/gui.py:82
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../src/plugins/gui.py:162
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Bannissement de %s"
+
+#: ../src/plugins/gui.py:209
 msgid "Plugin failed"
 msgstr "Plugin échoué"
 
-#: ../src/plugins/gui.py:206
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr "Impossible de supprimer le plugin proprement"
 
 #. members not safe
-#: ../src/plugins/gui.py:214 ../src/plugins/pluginmanager.py:519
-#: ../src/plugins/pluginmanager.py:527
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
 msgid "Archive is malformed"
 msgstr "L'archive est mal-formée"
 
-#: ../src/plugins/gui.py:237 ../src/plugins/gui.py:245
-#: ../src/plugins/pluginmanager.py:535
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
 msgid "Plugin already exists"
 msgstr "Le plugin existe déjà"
 
-#: ../src/plugins/gui.py:237
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr "Remplacer ?"
 
-#: ../src/plugins/gui.py:266
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "Configuration"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:505 ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
 msgid "Archive corrupted"
 msgstr "Archive corrompue"
 
-#: ../src/plugins/pluginmanager.py:507
+#: ../src/plugins/pluginmanager.py:514
 msgid "Archive empty"
 msgstr "L'archive est vide"
 
@@ -10183,50 +10543,51 @@ msgstr "L'archive est vide"
 msgid "Retrieving profile..."
 msgstr "Récupération du profil..."
 
-#: ../src/profile_window.py:125 ../src/roster_window.py:3178
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: ../src/profile_window.py:128 ../src/roster_window.py:3181
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:142 ../src/profile_window.py:158
-#: ../src/roster_window.py:3183 ../src/roster_window.py:3194
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "Mauvais format de date"
 
-#: ../src/profile_window.py:230
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: ../src/profile_window.py:284
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Invitation reçue"
 
-#: ../src/profile_window.py:362
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Envoi du profil..."
 
-#: ../src/profile_window.py:394
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "l'information n'a PAS été publiée"
 
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/profile_window.py:402
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10234,51 +10595,52 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1031
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:1988
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1989
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:2012
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:2013
+#: ../src/roster_window.py:2084
 #, 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:2027
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:2028
+#: ../src/roster_window.py:2099
 #, 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:2055
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/roster_window.py:2056
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
-#: ../src/roster_window.py:2263 ../src/roster_window.py:3758
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2264 ../src/roster_window.py:3759
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10286,27 +10648,27 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: ../src/roster_window.py:2356
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Vraiment quitter Gajim ?"
 
-#: ../src/roster_window.py:2357
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
 
-#: ../src/roster_window.py:2358
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Toujours fermer Gajim"
 
-#: ../src/roster_window.py:2444
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "Vous des transferts de fichiers en cours"
 
-#: ../src/roster_window.py:2445
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
@@ -10314,11 +10676,11 @@ msgstr ""
 "Si vous quittez maintenant, le transfert de fichier(s) sera arrêté. Voulez-"
 "vous toujours quitter ?"
 
-#: ../src/roster_window.py:2476 ../src/roster_window.py:2897
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: ../src/roster_window.py:2477
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10326,16 +10688,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:2898
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10343,11 +10705,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:2905
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: ../src/roster_window.py:2910
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10356,13 +10718,13 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces "
 "passerelles : %s"
 
-#: ../src/roster_window.py:2978
+#: ../src/roster_window.py:3043
 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:2980
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10371,58 +10733,58 @@ msgstr ""
 "vous enverra."
 
 #. it's jid
-#: ../src/roster_window.py:3070
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: ../src/roster_window.py:3071
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: ../src/roster_window.py:3078
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: ../src/roster_window.py:3079
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: ../src/roster_window.py:3125
+#: ../src/roster_window.py:3139
 #, 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:3126
+#: ../src/roster_window.py:3140
 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:3165
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:3166
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: ../src/roster_window.py:3568
+#: ../src/roster_window.py:3635
 #, 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:3570
+#: ../src/roster_window.py:3637
 #, 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:3575
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10431,11 +10793,11 @@ msgstr ""
 "verra donc toujours déconnecté(e)."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3581
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: ../src/roster_window.py:3585
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10443,16 +10805,16 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
 "vous verra donc toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3588
+#: ../src/roster_window.py:3655
 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:3592
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: ../src/roster_window.py:3597
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10462,14 +10824,15 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3655
+#: ../src/roster_window.py:3722
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point d'envoyer un statut personnalisé. Êtes-vous sûr de "
 "vouloir continuer ?"
 
-#: ../src/roster_window.py:3657
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10478,36 +10841,37 @@ msgstr ""
 "Ce contact vous verra %(status)s, mais seulement jusqu'à ce que vous "
 "changiez votre statut. Il verra alors votre statut global."
 
-#: ../src/roster_window.py:3676
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:3677
+#: ../src/roster_window.py:3744
 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:4367
+#: ../src/roster_window.py:4456
 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:4369
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Votre serveur ne supporte pas l'enregistrement des informations de "
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: ../src/roster_window.py:4461
+#: ../src/roster_window.py:4550
 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:4463
+#: ../src/roster_window.py:4552
 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 "
@@ -10517,28 +10881,28 @@ 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:4584
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: ../src/roster_window.py:4596
+#: ../src/roster_window.py:4685
 #, 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:4731
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Envoyer %s à %s"
 
-#: ../src/roster_window.py:4742
+#: ../src/roster_window.py:4831
 #, python-format
 msgid "Make %s first contact"
 msgstr "Faire de %s le premier contact"
 
-#: ../src/roster_window.py:4745
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Faire de %s et %s des métacontacts"
@@ -10548,129 +10912,129 @@ msgstr "Faire de %s et %s des métacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5184 ../src/roster_window.py:5238
-#: ../src/roster_window.py:5247 ../src/statusicon.py:264
-#: ../src/statusicon.py:311 ../src/statusicon.py:317
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
 #. add
-#: ../src/roster_window.py:5254
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:5259
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:5298 ../src/statusicon.py:327
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les marque-pages..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5318
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:5359
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:5419 ../src/roster_window.py:5527
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:5452
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "Publier la localisation"
 
-#: ../src/roster_window.py:5457
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Configurer les Services..."
 
-#: ../src/roster_window.py:5605
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
-#: ../src/roster_window.py:5615 ../src/roster_window.py:5788
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: ../src/roster_window.py:5627
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5808
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5817
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #. Send single message
-#: ../src/roster_window.py:5872
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Envoyer un message Simple"
 
 #. Execute Command
-#: ../src/roster_window.py:5919
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5929
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
 #. Modify Transport
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
 #. Rename
-#: ../src/roster_window.py:5948
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/roster_window.py:6008
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: ../src/roster_window.py:6017
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Reconnecter"
 
-#: ../src/roster_window.py:6024
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
 #. History manager
-#: ../src/roster_window.py:6113
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:6124
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: ../src/roster_window.py:6343
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
@@ -10687,11 +11051,11 @@ msgstr "Erreur dans la forme des données reçues"
 msgid "No result"
 msgstr "Aucun résultat."
 
-#: ../src/session.py:411 ../src/session.py:470
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Confirmer ces options de session"
 
-#: ../src/session.py:413
+#: ../src/session.py:411
 #, python-format
 msgid ""
 "The remote client wants to negotiate a session with these features:\n"
@@ -10706,7 +11070,7 @@ msgstr ""
 "\n"
 "Ces options sont-elles acceptables ?"
 
-#: ../src/session.py:472
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10721,150 +11085,150 @@ msgstr ""
 "\n"
 "Continuer la session ?"
 
-#: ../src/session.py:475
+#: ../src/session.py:474
 msgid "Always accept for this contact"
 msgstr "Toujours accepter pour ce contact"
 
-#: ../src/statusicon.py:228
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/statusicon.py:342
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "Cacher la liste de contacts"
 
-#: ../src/statusicon.py:353
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../src/tooltips.py:393 ../src/tooltips.py:610
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Identifiant Jabber :"
 
-#: ../src/tooltips.py:396 ../src/tooltips.py:614
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de ce salon"
 
-#: ../src/tooltips.py:508
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [bloqué]"
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimisé]"
 
-#: ../src/tooltips.py:527 ../src/tooltips.py:783
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:571
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Dernier état : %s"
 
-#: ../src/tooltips.py:573
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " depuis %s"
 
-#: ../src/tooltips.py:591
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Déconnecté(e)"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:621
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:631
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:652
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "Inactif depuis %s"
 
-#: ../src/tooltips.py:653
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "Inactif pour %s"
 
-#: ../src/tooltips.py:704
-#, python-format
-msgid "Mood: %s"
-msgstr "Humeur : %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "Humeur :"
 
-#: ../src/tooltips.py:708
-#, python-format
-msgid "Activity: %s"
-msgstr "Activité : %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "Activité :"
 
-#: ../src/tooltips.py:712
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Ton : %s"
 
-#: ../src/tooltips.py:716
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Localisation : %s"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:747
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:754
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:758
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:782
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:765
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:767 ../src/tooltips.py:770
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:En pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:778
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:780
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:818
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Ce service n'a pas encore renvoyé d'informations détaillées"
 
-#: ../src/tooltips.py:821
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10872,43 +11236,39 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: ../src/upower_listener.py:31
-msgid "Machine going to sleep"
-msgstr "La machine se met en veille"
-
-#: ../src/vcard.py:289
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:316
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Date:Inconnue"
 
-#: ../src/vcard.py:340 ../src/vcard.py:350 ../src/vcard.py:558
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:373
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>Role :</b>"
 
-#: ../src/vcard.py:377
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: ../src/vcard.py:385
+#: ../src/vcard.py:408
 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:387
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10916,12 +11276,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "vôtre"
 
-#: ../src/vcard.py:389
+#: ../src/vcard.py:412
 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:391
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10929,19 +11289,200 @@ 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:398
+#: ../src/vcard.py:421
 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:400
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: ../src/vcard.py:405 ../src/vcard.py:459 ../src/vcard.py:581
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Afficher le profil du contact (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "L'autoriser à voir mon état"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Afficher l'_activité des contacts dans la liste des contacts"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Afficher ce que mes contacts écoutent"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Afficher l'humeur des contacts dans la liste des contacts"
+
+#~ 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"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim affichera la localisation de chaque "
+#~ "contact dans votre liste de contacts"
+
+#~ 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"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Messagerie instantanée Gajim"
+
+#~ msgid "English"
+#~ msgstr "Anglais"
+
+#~ msgid "Belarusian"
+#~ msgstr "Biélorusse"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgare"
+
+#~ msgid "Breton"
+#~ msgstr "Breton"
+
+#~ msgid "Czech"
+#~ msgstr "Tchèque"
+
+#~ msgid "German"
+#~ msgstr "Allemand"
+
+#~ msgid "Greek"
+#~ msgstr "Grec"
+
+#~ msgid "British"
+#~ msgstr "Anglais (Britannique)"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Espagnol"
+
+#~ msgid "Basque"
+#~ msgstr "Basque"
+
+#~ msgid "French"
+#~ msgstr "Français"
+
+#~ msgid "Croatian"
+#~ msgstr "Croate"
+
+#~ msgid "Italian"
+#~ msgstr "Italien"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norvégien"
+
+#~ msgid "Dutch"
+#~ msgstr "Hollandais"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norvégien"
+
+#~ msgid "Polish"
+#~ msgstr "Polonais"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugais"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Portugais brésilien"
+
+#~ msgid "Russian"
+#~ msgstr "Russe"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbe"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovaque"
+
+#~ msgid "Swedish"
+#~ msgstr "Suédois"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chinois"
+
+#~ msgid "Spelling language"
+#~ msgstr "Langue du correcteur orthographique"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Nécessite python-farsight."
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Si Activé, Gajim convertira les chaines de caractères entre $$ et $$ en "
+#~ "une image, en utilisant dvips et convert avant de l'insérer dans la "
+#~ "fenêtre de conversation."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Modifiez la valeur pour changer la taille des formules latex affichées. "
+#~ "Plus la valeur est grande, plus la taille l'est."
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Vérifiez votre connexion ou réessayer plus tard"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Erreur en exécutant « %(command)s » : %(error)s"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Impossible de débloquer le port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Il se peut qu'une autre instance de Gajim soit en cours d'exécution. Le "
+#~ "transfert de fichiers sera annulé."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transforme les expressions LaTeX entre $$ $$."
+
+#~ msgid ""
+#~ "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 ou ImageMagick). Vous devez "
+#~ "définir « use_latex » à True dans l'éditeur de configuration avancée."
+
+#~ 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 ""
+#~ "Nécessite texlive-latex-base et (dvipng ou ImageMagick) (tout est dans "
+#~ "MikTeX). Vous devez définir « use_latex » à True dans l'éditeur de "
+#~ "configuration avancée."
+
+#~ msgid "Contacts"
+#~ msgstr "Contacts"
+
+#~ msgid "Mood: %s"
+#~ msgstr "Humeur : %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "Activité : %s"
+
 #~ msgid "label"
 #~ msgstr "label"
 
@@ -11002,12 +11543,6 @@ msgstr " ressource avec la priorité "
 #~ msgid "Don't have "
 #~ msgstr "N'ai pas"
 
-#~ msgid "File Transfer Finished"
-#~ msgstr "Transfert de fichier terminé"
-
-#~ msgid "File Transfer Request "
-#~ msgstr "Requête de transfert de fichier"
-
 #~ msgid "File Transfer Started "
 #~ msgstr "Transfert de fichier commencé"
 
@@ -11066,9 +11601,6 @@ msgstr " ressource avec la priorité "
 #~ msgid "_Open chat window with user"
 #~ msgstr "_Ouvrir une fenêtre de conversation"
 
-#~ msgid "_Show event in notification area"
-#~ msgstr "Afficher les événements dans la zone de notification"
-
 #~ msgid "_Show event in roster"
 #~ msgstr "Ne le montrer que dans la _liste"
 
@@ -11283,9 +11815,6 @@ msgstr " ressource avec la priorité "
 #~ "Historiques de conversations groupées\n"
 #~ "Tous les Historiques"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Gérer les comptes"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -11673,9 +12202,6 @@ msgstr " ressource avec la priorité "
 #~ msgid "General:"
 #~ msgstr "Général :"
 
-#~ msgid "Message:"
-#~ msgstr "Message :"
-
 #~ msgid "Specific:"
 #~ msgstr "Spécifique :"
 
diff --git a/po/gl.po b/po/gl.po
index 701cb3b77..5558b9a49 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,15 +6,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -25,320 +21,313 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.2\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "E_stado"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Información persoal"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Iniciar a charla"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Entrar nun grupo de charla"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Engadir un contacto..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Descubrir os servizos"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "Executar o _comando..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Modificar conta"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir a caixa de entrada de GMail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Información persoal"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Iniciar a charla"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "E_stado"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Modificar conta"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: asistente para crear unha conta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Estase a crear a conta</b>\n"
-"\n"
-"Por favor, agarde..."
+"Precisa unha conta para se conectar\n"
+"á rede Jabber"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+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:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor, elixa unha das opcións seguintes:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor, introduza os datos para a súa conta nova</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "C_ontrasinal:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "_Gardar o contrasinal"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Usar a autenticación"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Conectar cando prema Rematar"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "ID de _Jabber: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: asistente para crear unha conta"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Usar a autenticación"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../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"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Xestionar..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Usa un nome de host e un porto personalizados"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Proxy"
+msgid "_Hostname:"
+msgstr "Nome do host:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "_Gardar o contrasinal"
+msgid "_Port:"
+msgstr "_Porto:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avanzado"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Precisa unha conta para se conectar\n"
-"á rede Jabber"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Rematar"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Nome do host:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Estase a crear a conta</b>\n"
+"\n"
+"Por favor, agarde..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "ID de _Jabber: "
+msgid "Connect when I press Finish"
+msgstr "Conectar cando prema Rematar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "C_ontrasinal:"
+msgid "Set my profile when I connect"
+msgstr "Configurar o meu perfil ao me conectar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Porto:"
+msgid "_Finish"
+msgstr "_Rematar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Varios</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ningún"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Información persoal</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Propiedades</b>"
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 #, fuzzy
-msgid "A_djust to status"
-msgstr "_Adaptar ao estado"
+msgid "Add"
+msgstr "Enderezo"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Conta"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Eliminar"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Contas"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "Listaxe de administradores"
+msgid "_Enable"
+msgstr "Activar"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Usar a autenticación"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"O recurso envíaselle ao servidor de Jabber para 'separar' o mesmo "
+"identificador en dous ou máis partes a depender do número de clientes que "
+"estiveren conectados no servidor coa mesma conta. Así pode estar conectado e "
+"empregar a mesma conta co recurso 'Casa' ou 'Traballo' ao mesmo tempo. O "
+"recurso que teña a prioridade máis alta será o que reciba os eventos (mire "
+"máis abaixo)."
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
-msgid "Auto-reconnect when connection is lost"
-msgstr "Conectar automaticamente se se perde a conexión"
+msgid "Synchronize contacts"
+msgstr "Amosar os contactos desconectados"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Navegar"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_onectar ao inicio de Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Cam_biar o contrasinal"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Prema para cambiar o contrasinal da conta"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "Listaxe de administradores"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Elixa un ficheiro para enviar..."
+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 emprega a prioridade para determinar quen obtén os acontecementos do "
+"servidor cando dous ou máis clientes están conectados e usan a mesma conta. "
+"O cliente con maior prioridade recibe os acontecementos."
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Elixir a _chave..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Adaptar ao estado"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Prema para cambiar o contrasinal da conta"
+msgid "Priority will change automatically according to your status."
+msgstr "A prioridade mudará automaticamente segundo o seu estado."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "Pr_ioridade:"
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "O nome de usuario non é válido"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "C_onectar ao inicio de Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Conexión"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Nome:"
+msgid "Resour_ce:"
+msgstr "Re_curso: "
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Navegar"
 
 #: ../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 ""
-"Se isto está marcado, o Gajim tamén emitirá algúns IP máis agás desde o seu "
-"IP, para que a súa transferencia teña máis posibilidades de funcionar."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Esta mensaxe está cifrada]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
+msgid "Client certificate"
+msgstr "O nome de usuario non é válido"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Conta"
 
 #: ../data/gui/accounts_window.ui.h:29
-#, fuzzy
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Se isto está marcado, o Gajim enviará paquetes de mantemento de actividade "
-"para previr que expire a conexión"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onectar ao inicio de Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -349,6 +338,19 @@ msgstr ""
 "Jabber con esta conta."
 
 #: ../data/gui/accounts_window.ui.h:31
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Conectar automaticamente se se perde a conexión"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Gravar as conversas para todos os contactos"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sinc_ronizar o estado da conta co estado global"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -358,188 +360,214 @@ msgstr ""
 "de combinación da parte inferior da listaxe de contactos) cambiará o estado "
 "desta conta en consecuencia"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se o porto por defecto para as mensaxes entrantes non é válido, pode "
-"seleccionar outro aquí.\n"
-"Podería considerar mudar algúns aspectos da configuración da protección."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
+msgid "Use file transfer proxies"
+msgstr "Usar proxies para as transferencias de ficheiros"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Apelido(s):"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Se isto está marcado, o Gajim tamén emitirá algúns IP máis agás desde o seu "
+"IP, para que a súa transferencia teña máis posibilidades de funcionar."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Combinar as contas"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Xeral"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Non se seleccionou ningunha chave"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Información persoal"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Xestionar..."
+
+#: ../data/gui/accounts_window.ui.h:40
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Propiedades</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Pr_ioridade:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Jabber emprega a prioridade para determinar quen obtén os acontecementos do "
-"servidor cando dous ou máis clientes están conectados e usan a mesma conta. "
-"O cliente con maior prioridade recibe os acontecementos."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "A prioridade mudará automaticamente segundo o seu estado."
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Enviar paquetes de mantemento de actividade"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_nomear"
+#: ../data/gui/accounts_window.ui.h:44
+#, fuzzy
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Se isto está marcado, o Gajim enviará paquetes de mantemento de actividade "
+"para previr que expire a conexión"
 
 #: ../data/gui/accounts_window.ui.h:45
 #, fuzzy
-msgid "Resour_ce:"
-msgstr "Re_curso: "
+msgid "Use cust_om hostname/port"
+msgstr "Usa un nome de host e un porto personalizados"
 
 #: ../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 ""
-"O recurso envíaselle ao servidor de Jabber para 'separar' o mesmo "
-"identificador en dous ou máis partes a depender do número de clientes que "
-"estiveren conectados no servidor coa mesma conta. Así pode estar conectado e "
-"empregar a mesma conta co recurso 'Casa' ou 'Traballo' ao mesmo tempo. O "
-"recurso que teña a prioridade máis alta será o que reciba os eventos (mire "
-"máis abaixo)."
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nome do host:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Gravar as conversas para todos os contactos"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porto:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Varios</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Enviar paquetes de mantemento de actividade"
+msgid "Connection"
+msgstr "Conexión"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinc_ronizar o estado da conta co estado global"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Non se seleccionou ningunha chave"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinc_ronizar o estado da conta co estado global"
+msgid "Choose _Key..."
+msgstr "Elixir a _chave..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Amosar os contactos desconectados"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Usa un nome de host e un porto personalizados"
+msgid "_Edit Personal Information..."
+msgstr "_Editar a información persoal..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Usar o porto personalizado:"
+msgid "Information about you, as stored in the server"
+msgstr "A súa información, para se gardar no servidor"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Usar proxies para as transferencias de ficheiros"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Información persoal</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Información persoal"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "_Editar a información persoal..."
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onectar ao inicio de Gajim"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Activar"
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizar o estado da conta co estado global"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Nome do host:"
+msgid "Use cust_om port:"
+msgstr "Usar o porto personalizado:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Xestionar..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Se o porto por defecto para as mensaxes entrantes non é válido, pode "
+"seleccionar outro aquí.\n"
+"Podería considerar mudar algúns aspectos da configuración da protección."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Nome:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "_Porto:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Apelido(s):"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Correo electrónico:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "ID de Jabber:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Combinar as contas"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Conta:"
+msgid "Add New Contact"
+msgstr "Engadir un contacto novo"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Permitirlle a este contacto que vexa o meu estado"
+msgid "A_ccount:"
+msgstr "_Conta:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Engadir un contacto novo"
+msgid "_Protocol:"
+msgstr "_Protocolo:"
 
-#: ../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 "Gustaríame engadilo á miña listaxe de contactos."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "ID de _usuario:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Alcume:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Permitirlle a este contacto que vexa o meu estado"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Subscrición"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 #, fuzzy
 msgid ""
 "You have to register with this transport\n"
@@ -552,7 +580,11 @@ msgstr ""
 "protocolo. Prema o botón Rexistrar\n"
 "para continuar."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Rexistrar"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -560,393 +592,195 @@ msgstr ""
 "Debe estar conectado ao transporte para poder\n"
 "engadir un contacto deste protocolo."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Alcume:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocolo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Rexistrar"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Subscrición"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "ID de _usuario:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-#, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Produciuse un erro:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Comandos ad-hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Elixa o comando para executar:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Comandos ad-hoc - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Elixa o comando para executar:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Comprobar mais unha vez"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Descrición do erro..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Por favor, agarde mentres se envía o comando..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Rematar"
+msgid "Please wait..."
+msgstr "Por favor, agarde..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Esta entidade de jabber non expón comandos."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Por favor, agarde mentres se envía o comando..."
+#, fuzzy
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Produciuse un erro:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Por favor, agarde..."
+msgid "Error description..."
+msgstr "Descrición do erro..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Esta entidade de jabber non expón comandos."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Rematar"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Editor avanzado de configuración"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Descrición</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTA:</b> Debe reiniciar o Gajim para que algúns cambios teñan efecto"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor avanzado de configuración"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtro:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Restabelecer as cores predeterminadas"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Eliminar MDD"
+msgid "Show _XML Console"
+msgstr "Amosar a consola de _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Listaxes de _privacidade"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrador"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Enviar a mensaxe do servidor"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Definir a MDD"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Define a mensaxe do día"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Amosar a consola de _XML"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Definir a MDD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Actualiza a mensaxe do día"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar a MDD"
 
-#: ../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:11
-msgid "_Administrator"
-msgstr "_Administrador"
+msgid "Delete MOTD"
+msgstr "Eliminar MDD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Enviar a mensaxe do servidor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " hai unha fiestra/separador aberto con este contacto "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Accións</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Condicións</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Accións A_vanzadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Control de notificacións avanzadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Ausente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Ocupado "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Un contacto cambiou o seu estado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contacto desconectado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Non ten "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Transferencias"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Solicitude de transferencia de ficheiro"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Detívose a transferencia do ficheiro"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Remarcado da mensaxe de grupo de charla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Recibiuse unha mensaxe de grupo de charla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Ten "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisíbel"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Enviar un comando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Non dispoñíbel"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Un ou máis estados especiais..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "En liña / Libre para falar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Reproducir un _son"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Mensaxe privada nova"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Cando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Activar o índice de urxencia do xestor de fiestras na barra de tarefas para "
-"realzar a fiestra de charla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Desactivar a apertura automática de fiestras de charla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Desactivar as fiestras emerxentes existentes"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Desactivar os sons existentes para este acontecemento"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Desactivar mostrar os eventos no roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informarme cunha fiestra emerxente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Abrir unha fiestra de charla con este usuario"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "_Mostrar o evento na listaxe de contactos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "e eu "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Contactos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "para "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "cando eu estea en"
+msgid "Deletes Message of the Day"
+msgstr "Elimina a mensaxe do día (MDD)"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ningún"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferencias"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Autoconectar"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ningún"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Preferencias"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Autoconectar"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entrada:"
+msgid "New entry received"
+msgstr "Recibiuse unha entrada nova"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Recibiu unha entrada nova:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Nome do feed:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entrada:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Última modificación:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Recibiuse unha entrada nova"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Recibiu unha entrada nova:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
@@ -954,28 +788,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Mensaxes de estado predefinidas</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -983,322 +812,318 @@ msgstr "<b>Mensaxes de estado predefinidas</b>"
 msgid "<b>Mood:</b>"
 msgstr "<b>Sons</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Insírao mais unha vez para confirmar:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Insira o contrasinal novo:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Insírao mais unha vez para confirmar:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Escriba a súa mensaxe nova de estado</b>"
+msgid "Save as Preset..."
+msgstr "Gardar como predefinido..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Activo"
+msgid "Mood:"
+msgstr "Sala:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Sala:"
+msgid "Activity:"
+msgstr "Activo"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Mensaxes predefinidas:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Gardar como predefinido..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Escriba a súa mensaxe nova de estado</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Entrar nun grupo de charla"
+msgid "_Copy Link Location"
+msgstr "_Copiar o enderezo da ligazón"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Engadir á listaxe de contactos"
+msgid "_Open Link in Browser"
+msgstr "_Abrir a ligazón no navegador"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar o enderezo"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar o enderezo da ligazón"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Abrir o editor de correo"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Abrir a ligazón no navegador"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Iniciar a charla"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "núm."
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Entrar nun grupo de charla"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Engadir á listaxe de contactos"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Engade o contacto á listaxe"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está a prestar atención á conversa"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "está a prestar atención á conversa"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "núm."
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Enviar a mensaxe"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Con_vidar"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Observadores"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr ""
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Pregunta para ver o _seu estado"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:5
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Engadir unha _notificación especial"
+msgid "MUC server"
+msgstr "Observadores"
 
-#: ../data/gui/contact_context_menu.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Asignar chave de OpenPGP"
+msgid "In_vite"
+msgstr "Con_vidar"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Executar o comando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Iniciar a charla"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Enviar unha _mensaxe..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Editar os grupos"
+msgid "Send _File..."
+msgstr "Enviar ficheiro"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Con_vidar"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Contactos"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Alternar a codificación OpenPGP"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Eliminar"
+msgid "Toggle End to End Encryption"
+msgstr "Alternar a codificación OpenPGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Envía XML personalizado"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Executar o comando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Enviar unha _mensaxe..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Renomear o contacto"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Enviar ficheiro"
+msgid "_Rename..."
+msgstr "Renomear"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Editar os grupos"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Iniciar a charla"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Asignar chave de OpenPGP"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Alternar a codificación OpenPGP"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Alternar a codificación OpenPGP"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Engadir unha _notificación especial"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Subscrición"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Permitirlle ver o meu estado"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Permitirlle a este contacto que vexa o meu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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 ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Pregunta para ver o _seu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historial"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Renomear o contacto"
+msgid "_Unignore"
+msgstr "nove"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "Renomear"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Subscrición"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Eliminar"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "nove"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historial"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Cubrir o formulario."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuración da sala"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Cubrir o formulario."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar grupos"
@@ -1312,60 +1137,51 @@ msgstr "<b>Descrición</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Características dos servidores"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Listaxe de transferencias activas, rematadas e detidas"
+msgid "File Transfers"
+msgstr "Transferencias"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Cancelar a transferencia"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr "Amosa unha listaxe de transferencias entre vostede e outra persoa"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Cancela a transferencia seleccionada do ficheiro"
+msgid "file transfers list"
+msgstr "listaxe de transferencias"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Cancela a transferencia seleccionada do ficheiro e elimina o ficheiro "
-"incompleto"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Limpar"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notificarme cando rematar unha transferencia"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Transferencias"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+"Cando unha transferencia se completar, amosa unha notificación emerxente"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Oculta a fiestra"
+#, fuzzy
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Elimina da listaxe as transferencias rematadas, canceladas e erradas"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias da listaxe"
 
 #: ../data/gui/filetransfers.ui.h:9
-#, fuzzy
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Elimina da listaxe as transferencias rematadas, canceladas e erradas"
-
-#: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr "Amosa unha listaxe de transferencias entre vostede e outra persoa"
-
-#: ../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"
@@ -1373,83 +1189,110 @@ msgstr ""
 "Esta acción elimina transferencias da listaxe. Se a transferencia estiver "
 "activa, detense primeiro e elimínase despois"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Limpar"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pausa"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
-"Cando unha transferencia se completar, amosa unha notificación emerxente"
+"Cancela a transferencia seleccionada do ficheiro e elimina o ficheiro "
+"incompleto"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continuar"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Cancelar a transferencia"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notificarme cando rematar unha transferencia"
+msgid "Cancels the selected file transfer"
+msgstr "Cancela a transferencia seleccionada do ficheiro"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Abrir un cartafol de contido"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Oculta a fiestra"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pausa"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Continuar"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "listaxe de transferencias"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Abrir un cartafol de contido"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Cores do separador para os estados da charla</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Conta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Negra"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contacto"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "A compor"
+msgid "Gajim Themes Customization"
+msgstr "Personalización de temas do Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contacto"
+msgid "Text _color:"
+msgstr "_Cor do texto:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Estilo:"
+msgid "_Background:"
+msgstr "_Fondo"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalización de temas do Gajim"
+msgid "Text _font:"
+msgstr "_Letra do texto:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Marchei"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+msgid "Font style:"
+msgstr "Estilo:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inactivo"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Negra"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Itálica"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pausado"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "A compor"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inactivo"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Cores do separador para os estados da charla</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Marchei"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1457,7 +1300,7 @@ msgstr ""
 "MUC\n"
 "Mensaxes"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1465,22 +1308,6 @@ msgstr ""
 "Mensaxes dirixidas\n"
 "ás salas"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pausado"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Cor do texto:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Letra do texto:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Fondo"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1488,91 +1315,101 @@ msgstr "Cambiar o _alcume"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Xestionar os marcadores"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Cambiar o _tema"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Configurar a sala"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Engadir esta sala aos marcadores"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Descrición: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Xestionar os marcadores"
+msgid "_Request Voice"
+msgstr "_Voz"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Engadir esta sala aos marcadores"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derador"
+msgid "_Send Private Message"
+msgstr "_Enviar unha mensaxe privada"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Enviar ficheiro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Accións"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Enviar ficheiro"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Engadir á listaxe de contactos"
+msgid "_Voice"
+msgstr "_Voz"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derador"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Deshabilitar"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Propietario"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Membro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Propietario"
+msgid "_Ban"
+msgstr "_Deshabilitar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Enviar unha mensaxe privada"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voz"
+msgid "_Add to Roster"
+msgstr "_Engadir á listaxe de contactos"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Engadir esta sala aos marcadores"
+msgid "Show a list of formattings"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cambiar o _alcume"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Cambiar o _alcume"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Engadir esta sala aos marcadores"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1584,11 +1421,29 @@ msgid "From:"
 msgstr "De:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
+msgid "Gajim History Logs Manager"
+msgstr "Xestor do Historial de Gajim"
+
+#: ../data/gui/history_manager.ui.h:2
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Xestor do Historial de Gajim"
+
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:6
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1605,200 +1460,187 @@ msgstr ""
 "con que estiver\n"
 "a falar neste momento."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Eliminar"
+#: ../data/gui/history_manager.ui.h:8
+msgid "_Search Database"
+msgstr "_Buscar na base de datos"
 
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:9
 msgid "Export"
 msgstr "Exportar"
 
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Xestor do Historial de 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"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
-msgid "_Search Database"
-msgstr "_Buscar na base de datos"
-
 #: ../data/gui/history_window.ui.h:1
 #, fuzzy
-msgid "All Chat Histories"
-msgstr "Historias antigas"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Historial de conversas"
-
-#: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Nome de contacto"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Grupos de charla"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Historias antigas"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Historial de conversas"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Rexistrar os cambios de estado dos contactos"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
+msgid "otr"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
+msgid "concede"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Configurar o meu perfil ao me conectar"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Sala:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Alcume:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Recentemente:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Contrasinal: "
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recentemente:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Configurar o meu perfil ao me conectar"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Sala:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Engadir esta sala aos marcadores"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Servidor:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Engadir esta sala aos marcadores"
+msgid "Bro_wse Rooms"
+msgstr "_Navegar"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Entrar"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Autoconectar"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Xestionar os marcadores"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Título:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Amosar o estado:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Autoconectar"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Título:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1811,104 +1653,107 @@ msgid "_Configure"
 msgstr "_Continuar"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Propiedades</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Conectar con HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Configuración</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Conectar con HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Xestionar os perfís do proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Contrasinal: "
+#, fuzzy
+msgid "_Name:"
+msgstr "_Nome: "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy"
+msgid "<b>Properties</b>"
+msgstr "<b>Propiedades</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Porto:"
+msgid "Use HTTP prox_y"
+msgstr "_Usar proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Usar proxy"
+msgid "_BOSH URL:"
+msgstr "_URL"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usar a autenticación"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Nome de usuario:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL"
+msgid "Pass_word:"
+msgstr "_Contrasinal: "
 
 #: ../data/gui/manage_proxies_window.ui.h:13
 #, fuzzy
-msgid "_Name:"
-msgstr "_Nome: "
+msgid "Proxy _Host:"
+msgstr "Proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
+msgid "Proxy _Port:"
+msgstr "_Porto:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Nome de usuario:"
+msgid "<b>Settings</b>"
+msgstr "<b>Configuración</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Xestionar as contas"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Contrasinal"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torizar"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "En liñ_a"
+msgid "Version:"
+msgstr "Versión de GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Continuar"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Descrición: %s"
+msgid "Authors:"
+msgstr "Au_torizar"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1916,39 +1761,32 @@ msgid "Homepage:"
 msgstr "Páxina web:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Atascado"
+msgid "Description:"
+msgstr "Descrición: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Continuar"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Atascado"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1962,516 +1800,504 @@ msgid "Event desc"
 msgstr "Eventos"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor de configuración avanzada</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Programas</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Accións</b>"
+msgid "All chat states"
+msgstr "Todos os estados"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Accións</b>"
+msgid "Composing only"
+msgstr "A compor"
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Editar unha regra</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Desactivado"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Cores do separador para os estados da charla</b>"
+msgid "Never"
+msgstr "_Nunca"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notificacións visuais</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Condicións</b>"
+msgid "Always"
+msgstr "Ausente"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Emerxer"
 
-#. 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>Personalizado</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificarmo"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Sons</b>"
+msgid "Show only in roster"
+msgstr "Amosar só na _listaxe de contactos"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opcións de GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Mensaxes de estado predefinidas</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Listaxe de privacidade</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Mensaxes de estado predefinidas</b>"
+msgid "Last state"
+msgstr "Último estado: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Preferencias"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Propiedades</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Engadir unha regra</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+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:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notificacións visuais</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Avanzado"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Avanzado"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+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:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Todos os estados"
+msgid "Sort contacts by status"
+msgstr "Ordenar os contacto_s polo estado"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Permitir o envío de información sobre o sistema operativo"
+#, fuzzy
+msgid "in _roster"
+msgstr "Non está na listaxe"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Permitir o envío de información sobre o sistema operativo"
+msgid "in _group chats"
+msgstr "Entrar nun grupo de charla"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
-"ocupado ou invisíbel."
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Ausente"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Preguntar a mensaxe de estado cando estea: "
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticonas:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Unha soa fiestra de conversa"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, 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:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "Men_saxe de estado:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
+msgid "_Highlight misspelled words"
+msgstr "_Marcar os erros ortográficos"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "A compor"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Configurar as cores e as fontes da interface"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Amosar _listaxe"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Men_saxe de estado:"
+msgid "Show icon when your messages are received"
+msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Nome de contacto"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Personalizado</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Editar unha regra</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Cando se reciba un acontecemento novo"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notificar cando un contacto: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar cando un contacto: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
+"pantalla cando un contacto se desconectar"
 
-#: ../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:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
+"ocupado ou invisíbel."
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid "Notify on new _GMail email"
+msgstr "Notificar de novos correos de _GMail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Amosar os detalles _extra nos correos electrónicos"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid "Display _extra email details"
+msgstr "Amosar os detalles _extra nos correos electrónicos"
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+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:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opcións de GMail</b>"
 
 #: ../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"
+msgid "Show notification area icon:"
+msgstr "Usar a icona na á_rea de notificación"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notificacións visuais</b>"
 
 #: ../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 ""
-"O Gajim pode enviar e recibir metainformación relacionada cunha charla que "
-"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
-"quere que se amosen nas fiestras."
+msgid "Play _sounds"
+msgstr "Reproducir _sons"
 
 #: ../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 ""
-"O Gajim pode enviar e recibir metainformación relacionada cunha conversa que "
-"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
-"quere enviarlle á outra persoa."
+msgid "Ma_nage..."
+msgstr "Xestio_nar..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 msgstr ""
-"O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
-"pantalla cando un contacto se desconectar"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sons</b>"
 
 #: ../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."
+msgid "Notifications"
+msgstr "Modificar a conta"
 
 #: ../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"
+"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 ""
+"O Gajim pode enviar e recibir metainformación relacionada cunha charla que "
+"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
+"quere que se amosen nas fiestras."
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
-"de correos electrónicos novos"
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Notificacións de estado nas charlas:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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 ""
+"O Gajim pode enviar e recibir metainformación relacionada cunha conversa que "
+"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
+"quere enviarlle á outra persoa."
 
 #: ../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 ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Notificacións de estado nas charlas:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificacións visuais</b>"
 
 #: ../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 ""
-"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"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Información persoal"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
+msgid "_Away after:"
+msgstr "Pór _ausente despois de:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 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:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
+msgid "_Not available after:"
+msgstr "Pór _non dispoñíbel despois de:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 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: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 ""
+msgid "minutes"
+msgstr "minutos"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Marque esta opción só se alguén que non ten na listaxe está a molestalo. "
-"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: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:72
-#, fuzzy
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"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: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, "
-"etc...)"
-msgstr ""
-"Se isto está marcado, o Gajim empregará iconas específicas para o protocolo- "
-"(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: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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"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:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Accións</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Unha soa fiestra de conversa"
+msgid "Ask status message when I:"
+msgstr "Preguntar a mensaxe de estado cando estea: "
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Xestio_nar..."
+msgid "Sign _in"
+msgstr "Conectar"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Nunca"
+msgid "Sign _out"
+msgstr "_Desconectar"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Modificar a conta"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Notificar cando un contacto: "
+msgid "<b>Status Messages</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Notificar cando un contacto: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notificarmo"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Estado"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notificar de novos correos de _GMail"
+msgid "Use system _default"
+msgstr "Usar o pre_definido do sistema"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Men_saxe de estado:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Información persoal"
+msgid "<b>Font</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Reproducir _sons"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "_Usar as iconas do transporte"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Emerxer"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se isto está marcado, o Gajim empregará iconas específicas para o protocolo- "
+"(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:89
-msgid "Preferences"
-msgstr "Preferencias"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Conxunto de _iconas de estado por defecto:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Configurar as cores e as fontes da interface"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "Te_ma:"
 
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Servidor:"
+msgid "<b>Themes</b>"
+msgstr "<b>Propiedades</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Usar a icona na á_rea de notificación"
+msgid "Contact's nickname:"
+msgstr "Nome de contacto"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Amosar só na _listaxe de contactos"
+msgid "Your nickname:"
+msgstr "Ant_es do alcume:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Conectar"
+msgid "_Status message:"
+msgstr "Men_saxe de estado:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Desconectar"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Restabelecer as cores predeterminadas"
 
 #: ../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 ""
-"Algunhas mensaxes poden incluír un contido adornado (formato, cores etc). Se "
-"isto está marcado, o Gajim amosará a mensaxe en bruto."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Men_saxe de estado:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "Ordenar os contacto_s polo estado"
+msgid "Your message:"
+msgstr "Mensaxe de erro: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Estado"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Remarcado da mensaxe de grupo de charla"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Conxunto de _iconas de estado por defecto:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Cores do separador para os estados da charla</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2479,570 +2305,583 @@ msgid "Style"
 msgstr "Atascado"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "Te_ma:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Accións</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "_Usar as iconas do transporte"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Engadir unha regra</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Usar o pre_definido do sistema"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Cando se reciba un acontecemento novo"
+msgid "<b>Connection</b>"
+msgstr "<b>Condicións</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Mensaxe de erro: %s"
+msgid "_File manager:"
+msgstr "A_dministrador de ficheiros:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Ant_es do alcume:"
+msgid "_Mail client:"
+msgstr "_Cliente de correo:"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Pór _ausente despois de:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegador:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Notificacións de estado nas charlas:"
+msgid "<b>Custom</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Emoticonas:"
+msgid "<b>Applications</b>"
+msgstr "<b>Programas</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "A_dministrador de ficheiros:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Marcar os erros ortográficos"
+#, fuzzy
+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 ""
+"Marque esta opción só se alguén que non ten na listaxe está a molestalo. "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr ""
-"_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Permitir o envío de información sobre o sistema operativo"
 
 #: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ignorar o contido adornado en mensaxes entrantes"
+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:128
-msgid "_Log status changes of contacts"
-msgstr "_Rexistrar os cambios de estado dos contactos"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Permitir o envío de información sobre o sistema operativo"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Cliente de correo:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Pór _non dispoñíbel despois de:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Abrir..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Restabelecer as cores predeterminadas"
-
-#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Notificacións de estado nas charlas:"
+msgid "Allow my _idle time to be sent"
+msgstr "Permitir o envío de información sobre o sistema operativo"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "Men_saxe de estado:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Listaxe de privacidade</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Rexistrar os cambios de estado dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "in _group chats"
-msgstr "Entrar nun grupo de charla"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Non está na listaxe"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minutos"
+msgid "_Open..."
+msgstr "_Abrir..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor de configuración avanzada</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listaxes de privacidade:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Engadir / Editar unha regra</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Listaxe de privacidade"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Listaxe de regras</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Listaxe de privacidade</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Activo para esta sesión"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Activo en cada inicio"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Listaxe de regras</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Todos"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Engadir / Editar unha regra</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "todos por subscrición"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "todos no grupo"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Orde:"
+msgid "all by subscription"
+msgstr "todos por subscrición"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Listaxe de privacidade"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Todos"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "todos por subscrición"
+msgid "to send me messages"
+msgstr "para me enviar mensaxes"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "todos no grupo"
+msgid "to send me queries"
+msgstr "para me enviar preguntas"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Ambos"
+msgid "to view my status"
+msgstr "para ver o meu estado"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "De"
+msgid "to send me status"
+msgstr "para me enviar o estado"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "unha"
+msgid "All (including subscription)"
+msgstr "todos por subscrición"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dúas"
+msgid "Order:"
+msgstr "Orde:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "para me enviar mensaxes"
+#, fuzzy
+msgid "none"
+msgstr "unha"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "para me enviar preguntas"
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "para me enviar o estado"
-
-#: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "para ver o meu estado"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Engadir unha regra</b>"
+msgid "from"
+msgstr "De"
 
-#: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Imaxe:"
+msgid "to"
+msgstr "dúas"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Aniversario:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Personalizado</b>"
+msgid "<b>Family:</b>"
+msgstr "Familia:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Personalizado</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Engadir unha regra</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Departamento:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "Correo electrónico:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Propiedades</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Segundo enderezo:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familia:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Personalizado</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Configuración</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Páxina web:"
+msgid "<b>State:</b>"
+msgstr "<b>Configuración</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Segundo enderezo:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Engadir unha regra</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Código postal:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Personalizado</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Alcume:"
+msgid "<b>Address</b>"
+msgstr "<b>Engadir unha regra</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Teléfono:"
+msgid "<b>Homepage:</b>"
+msgstr "Páxina web:"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Condicións</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Código postal:"
+msgid "<b>Nickname:</b>"
+msgstr "Alcume:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Propiedades</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Teléfono:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Aniversario:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Configuración</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "Correo electrónico:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Configuración</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Imaxe:"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Prema para definir a súa circunstancia"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Información persoal"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Personalizado</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Acerca de"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Condicións</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Prema para definir a súa circunstancia"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Departamento:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Información persoal"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Traballo"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Que quere facer?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Acerca de"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminar a conta do Gajim e do _servidor"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Que quere facer?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Eliminar"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Engadir un contacto..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Accións"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Características dos servidores"
+msgid "Add _Contact..."
+msgstr "_Engadir un contacto..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Transferencias"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Preguntas frecuentes (en liña)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Contas"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Axuda en liña"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Perfil, Ima_xe"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Ver"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Amosar os contactos desconectados"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Amosar os trans_portes"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Amosar os contactos desconectados"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Amosar _listaxe"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Contas"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Transferencias"
 
-#. 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 "_Accións"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Axuda"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Editar"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Axuda en liña"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Axuda"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Enviar unha _mensaxe..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Preguntas frecuentes (en liña)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
+msgid "Fea_tures"
+msgstr "Características dos servidores"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Buscar"
 
+#: ../data/gui/search_window.ui.h:2
+#, fuzzy
+msgid "Please wait while retrieving search form..."
+msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
+
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Engadir un _contacto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -3062,42 +2901,37 @@ msgstr "Rexistrar en"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Responder esta mensaxe:"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "A:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Enviar"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Enviar a mensaxe"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Enviar a mensaxe e pechar a fiestra"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Responder"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "A:"
+msgid "Reply to this message"
+msgstr "Responder esta mensaxe:"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Responder"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Enviar e pechar"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Enviar a mensaxe e pechar a fiestra"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torizar"
+msgid "Subscription Request"
+msgstr "Solicitude de subscrición"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-#, fuzzy
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autorizar o contacto para que poida saber cando estou conectado"
+msgid "_Deny"
+msgstr "_Denegar"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
@@ -3108,278 +2942,290 @@ msgstr ""
 "Denegar a autorización do contacto para que non poida saber cando estou "
 "conectado"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Solicitude de subscrición"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torizar"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Denegar"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizar o contacto para que poida saber cando estou conectado"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Amosar os contactos desconectados"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Sen sons"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Enviar mensaxe"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Amosar todos os _eventos pendentes"
-
-#: ../data/gui/systray_context_menu.ui.h:4
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Grupos de charla"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Accións</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Enviar mensaxe"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Personalizado</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Amosar todos os _eventos pendentes"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Configuración</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Sen sons"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Información"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID de Jabber:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Recurso:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Configuración</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Descrición</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Personalizado</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Comentarios"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Configuración</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>User avatar:</b>"
+msgstr "Imaxe:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Configurar a sala"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Contacto"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrición</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Información"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Accións</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Máis"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Imaxe:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Contacto"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Sons</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Comentarios"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfico de Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Entrada de XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Consulta"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sons</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IC"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Consulta"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presenza"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presenza"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Entrada de XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Modificar a conta..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "JID local"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Persoal"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un cliente de Jabber de GTK"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Persoal"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Mensaxaría Instantánea Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Un cliente de Jabber de GTK"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Información"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "A entrada non é válida"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Comandos ad-hoc - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inactivo"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 #, fuzzy
 msgid "Integer"
 msgstr "No grupo"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Nome da opción"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ningún)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Oculta"
 
@@ -3390,246 +3236,178 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Recibiu unha entrada nova:"
 msgstr[1] "Recibiu unha entrada nova:"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Inglés"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Belarusian"
-msgstr "Búlgaro"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Breton"
-msgstr "Bretón"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Checo"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Alemán"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Grego"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "British"
-msgstr "Bretón"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Español"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Basque"
-msgstr "Éuscaro"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francés"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Croata"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiano"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Norwegian (b)"
-msgstr "Noruegués b"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandés"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Norwegian"
-msgstr "Noruegués"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polaco"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Portugués do Brasil"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruso"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Serbian"
-msgstr "Alemán"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Eslovaco"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Sueco"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Chinés (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Idioma do corrector"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "nove"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Alcume"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Letra:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Información"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Cifrado activado"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Listaxe de transferencias activas, rematadas e detidas"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "A mensaxe de estado de non autodispoñíbel"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Enviar ficheiro"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
@@ -3637,66 +3415,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3704,260 +3482,622 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Transferencias"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Tamaño: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Aceptar"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Rematou a transferencia do ficheiro"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Convite a grupo de charla"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina o contacto da listaxe"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro ao ler o ficheiro:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Detívose a transferencia do ficheiro"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Cancelouse a transferencia do ficheiro"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Non se puido estabelecer a conexión co cliente."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uso: /%s, oculta os botóns de charla."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uso: /%s, oculta os botóns de charla."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "Non se encontrou %s"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Ausente"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "En liñ_a"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uso: /%s, limpa o texto da fiestra."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Alternar a codificación OpenPGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Enviarlle un ficheiro a un contacto"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Prema aquí para ver as charlas anteriores con este contacto"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Non está dispoñíbel ningunha conexión"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Conexión non dispoñíbel"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Cambiar o _alcume"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "O nome de usuario non é válido"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Non se achou o alcume: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Está expulsado deste grupo de charla."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "O nome de usuario non é válido"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Afiliación:"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Non se atopa o argumento \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "a crear un directorio %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Información"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre para falar"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "nove"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Non molestar."
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrición do erro..."
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Novo grupo de charla"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Xa está na sala %s"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d mensaxe sen ler"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "%d mensaxe sen ler"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e o notificador Daemon para amosar as notificacións"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutos, despois de cambiar a ausente"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por inactividade"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutos, despois de cambiar a non dispoñíbel"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non dispoñíbel por inactividade"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "texto da mensaxe de estado"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Mostrar o evento na listaxe de contactos"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Mostrar o evento na listaxe de contactos"
+
+#. red
+#: ../src/common/config.py:104
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Solicitude de transferencia de ficheiro"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Cancelouse a transferencia do ficheiro"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr ""
+"Cando unha transferencia se completar, amosa unha notificación emerxente"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Convite a grupo de charla"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Cambiando o alcume"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "texto da mensaxe de estado"
 
 # duda sobre collapsed
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Idioma que emprega o corrector"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3967,7 +4107,7 @@ msgstr ""
 "'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca amosar a hora."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3978,18 +4118,18 @@ msgstr ""
 "0 para desactivar o fuzzyclock. 1 é o reloxo máis preciso, 4 o menos "
 "preciso. So se emprega se está conectado print_time 'ás veces'"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen "
 "eliminar * *"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3999,7 +4139,7 @@ msgstr ""
 "Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
 "seleccionado (se quere usalo, instale o docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -4007,7 +4147,7 @@ msgstr ""
 "Carácter para engadir despois do alcume cando se usa o completado de alcume "
 "(tab) nos grupos de charla."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -4015,57 +4155,73 @@ msgstr ""
 "Carácter para propor para engadir logo do alcume desexado cando alguén está "
 "a empregalo no grupo de conversa."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Engadir * e [n] no título da listaxe?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Cantas liñas quere lembrar da última charla cando se volve abrir un "
 "separador/fiestra de charla"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Cantos minutos debe durar a última liña da conversa anterior."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4073,11 +4229,11 @@ msgstr ""
 "Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como o "
 "cliente de Mirabilis ICQ)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4086,12 +4242,12 @@ msgstr ""
 "URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
 "significa usar o wiktionary"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se está marcado, o Gajim pode controlarse remotamente ao usar o gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4103,14 +4259,14 @@ msgstr ""
 "posto en Falso e sincronicen co estado global) baseados no estado daconexión "
 "da rede."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4118,7 +4274,7 @@ msgstr ""
 "As notificacións de estado móstranse nas fiestras de conversa. Poden ser "
 "todo, só_compor ou desactivado."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4126,33 +4282,35 @@ msgstr ""
 "Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
 "cada x minutos."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Preguntar sempre antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Non preguntar nunca antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4161,30 +4319,36 @@ msgstr ""
 "Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
 "tradución do enderezo ou o redirección de portos."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica acontecementos na área de notificación."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Quere amosar o separador cando só hai unha conversa?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 "Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4192,18 +4356,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
 "de charla."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4213,13 +4377,13 @@ msgstr ""
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
 "notificación. "
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Se é verdadeiro, o Gajim rexistra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4227,7 +4391,7 @@ msgstr ""
 "Se for verdadeiro, o Gajim amosará unha icona en cada separador que conteña "
 "mensaxes sen ler. A depender do tema, esta icona pode ser animada."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4235,11 +4399,11 @@ msgstr ""
 "Se é verdadeiro, o Gajim amosará a mensaxe de estado, se non está baleiro, "
 "para cada contacto baixo o seu nome de contacto na fiestra da listaxe."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4248,7 +4412,7 @@ msgstr ""
 "non tivo unha circunstancia a última vez ou se ten gardada unha demasiada "
 "antiga."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4256,10 +4420,10 @@ msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4271,30 +4435,34 @@ msgstr ""
 "mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e as "
 "saídas no grupo de conversa."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fondo para os contactos que acaban de se conectar."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fondo para os contactos que acaban de se desconectar."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se é verdadeiro, as mensaxes restauradas usarán unha fonte máis pequena que "
 "a predefinida."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Non amosar a circunstancia para o transporte en si mesmo"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Non amosar a listaxe na barra de tarefas."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4303,7 +4471,7 @@ msgstr ""
 "Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
 "2.8, resalta a fiestra cando hai eventos pendentes."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4314,7 +4482,7 @@ msgstr ""
 "envío de información SHA no grupo de charla."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4323,7 +4491,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Controla a fiestra onde se colocan as novas mensaxes.\n"
@@ -4335,33 +4503,41 @@ msgstr ""
 "envíase a unha fiestra específica. Nota: cambie esta opción require "
 "reiniciar o Gajim para que os cambios teñan efecto."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Se é verdadeiro, ao premer a tecla escape pecha unha fiestra/separador."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta os ocupantes nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4369,17 +4545,17 @@ msgstr ""
 "Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
 "persoa a que enviou a última mensaxe."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4388,13 +4564,13 @@ msgstr ""
 "Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
 "charla."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab conduce ao próximo separador de composición cando ningún está sen "
 "ler."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4402,7 +4578,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4411,7 +4587,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4420,7 +4596,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -4431,115 +4607,129 @@ msgstr ""
 "fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
 "prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4547,84 +4737,97 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4632,141 +4835,188 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s quere enviarlle un ficheiro."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Usar a autenticación"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Usar a autenticación"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 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:447
-msgid "all or space separated status"
-msgstr "estado separado por espazos ou all"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'si', 'non' ou 'ambos'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A traballar"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Fóra"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4775,27 +5025,184 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "ultramariño"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "mariño"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "A"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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 ""
+"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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "solicitude de eliminación de subscrición de %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Eliminouse a autorización"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "A ID de Jabber non é válida"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "produciuse un erro mentres se enviaba %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Mensaxe nova"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Mensaxe nova de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Mensaxe privada nova"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova mensaxe privada desde o grupo de charlas %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Mensaxe nova de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Mensaxe nova"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Mensaxe nova de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s cambiou o seu estado"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Un contacto cambiou o seu estado"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s conectouse"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contacto conectado"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s desconectouse"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contacto desconectado"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Non se pode cargar o módulo inactivo"
@@ -4805,215 +5212,193 @@ msgstr "Non se pode cargar o módulo inactivo"
 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:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Rexistrar %s"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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: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 ""
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5022,180 +5407,190 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Non se pode conectar a \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Non se pode conectar a \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 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:1400
+#: ../src/common/connection.py:1574
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 #, fuzzy
 msgid "Not in roster"
 msgstr "Non está na listaxe"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "As ligazóns D-Bus de python non se achan neste computador"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
@@ -5211,7 +5606,7 @@ msgstr ""
 "O servizo non está dispoñíbel: o Gajim non se está a executar, ou "
 "remote_control está en Falso"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
 
@@ -5396,267 +5791,294 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Non dispoñíbel"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Invisíbel"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Non foi posíbel cargar a imaxe"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Non foi posíbel cargar a imaxe"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración da sala"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5668,111 +6090,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Mensaxes de estado por defecto"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Tamaño: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Ficheiro: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "verde"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "erro: non se pode abrir %s para lectura"
+msgid "Error: cannot open %s for reading"
+msgstr "Erro: non se pode abrir %s para lectura"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
@@ -6474,52 +6910,134 @@ msgstr ""
 msgid "Writing"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Por defecto"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "mariño"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "A expulsar %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "País:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Conta"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Descrición"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Erro de Avahi"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "unha"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr ""
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Non se pode conectar ao porto %s."
-
-#: ../src/common/socks5.py:92
-#, fuzzy
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"É posíbel que outra instancia do Gajim estea a se executar. A transferencia "
-"cancelarase."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6528,46 +7046,45 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, 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:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6580,26 +7097,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensaxes de estado por defecto"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6608,72 +7125,72 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Quere reconectarse agora?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se quere que se apliquen todos os cambios instantaneamente, debe "
 "reconectarse."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Acontecementos sen ler"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Comezou unha charla coa conta %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar o nome da conta, debe ler o resto de\n"
 "acontecementos pendentes"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "O nome da conta xa está en uso"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6681,148 +7198,149 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "O nome da conta non é válido"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Xestionar as contas"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, 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:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 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:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6830,11 +7348,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6842,11 +7360,11 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6855,11 +7373,11 @@ msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6867,7 +7385,7 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6884,116 +7402,112 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Fallou a conexión"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Que quere facer?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrese de cubrir os campos de servidor e de sala ou elimine "
 "este marcador."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "O nome de usuario non é válido"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -7003,34 +7517,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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7040,7 +7554,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7048,82 +7562,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Continuar"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Acontecemento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Recibiuse a primeira mensaxe"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Recibiuse a primeira mensaxe"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Nome de contacto"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Recibiuse un correo de GMail"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7132,136 +7663,136 @@ 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:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Onte"
 msgstr[1] "Onte"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Extensión non admitida"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "No grupo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Chave ID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nome de contacto"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7269,108 +7800,109 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Enderezo de AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Enderezo de MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Enderezo de Yahoo!:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Un cliente de Jabber en GTK"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Un cliente de Jabber de GTK"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7381,110 +7913,162 @@ 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:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Conexión"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "_Do not ask me again"
+msgstr "_Non me preguntar outra vez"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Host errado"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Isto non é un grupo de charla"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "O nome da conta non é válido"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, 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:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non é o nome dun grupo de charla."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 #, 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:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7493,168 +8077,138 @@ msgstr ""
 "enviar unha mensaxe de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contacto conectado"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Contacto desconectado"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Mensaxe nova"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Mensaxe nova"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Mensaxe privada nova"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../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:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Un contacto cambiou o seu estado"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Atascado"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7662,193 +8216,188 @@ msgid ""
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Engadir un _contacto"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Engadir un _contacto"
+msgstr[1] "Engadir un _contacto"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Elimina o contacto da listaxe"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Elimina o contacto da listaxe"
+msgstr[1] "Elimina o contacto da listaxe"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, 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:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condición"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "cando estea "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7856,38 +8405,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7897,77 +8446,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "para a conta %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "O nome de usuario non é válido"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7975,477 +8562,492 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "Executar o _comando..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Descrición"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "O marcador xa se definiu"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" xa está nos seus marcadores."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "O marcador engadiuse con éxito"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Comandos: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Cifrado OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Mens_axe entrante:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Historial"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Modificar a conta"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Adaptar ao estado"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Cifrado OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Mens_axe entrante:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Xeral"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "En líña"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Características dos servidores"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vostede"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Remitente: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Rematou a transferencia do ficheiro"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Cancelouse a transferencia do ficheiro"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Non se puido estabelecer a conexión co cliente."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Detívose a transferencia do ficheiro"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Elixa un ficheiro para enviar..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "O Gajim non pode acceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Outro proceso está a usar este ficheiro."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Ficheiro: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Descrición: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s quere enviarlle un ficheiro:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, 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:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Gardar o ficheiro como..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Ficheiro: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Descrición: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s quere enviarlle un ficheiro:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "A enviar o perfil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Produciuse un erro na transferencia do ficheiro"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8453,70 +9055,107 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "O ficheiro non é válido"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "mensaxe"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Emoticonas:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Amosar só na _listaxe de contactos"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor avanzado de configuración"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Configuración da sala"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim precisa o Xserver para funcionar. A abortar..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "O Gajim precisa un GTK 2.6 ou superior"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa un pywin32 para funcionar"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8525,12 +9164,11 @@ msgstr ""
 "Por favor, asegúrese de que Pywin32 está instalado no seu sistema. Pode "
 "obtelo en %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "O Gajim xa está a se executar"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8538,29 +9176,29 @@ msgstr ""
 "Outra instancia dO Gajim semella estar xa en execución\n"
 "Quere executar unha outra?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Amosa axuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8569,53 +9207,57 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "conta"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "estado"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensaxe"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8624,20 +9266,48 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia o estado dunha ou de varias contas"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Pr_ioridade:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quero _rexistrar unha conta nova de Jabber"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8647,34 +9317,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8684,139 +9349,136 @@ msgstr ""
 "OpenPGP como a conta son optativas. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "ficheiro"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Engade o contacto á listaxe"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 #, 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
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre o diálogo de iniciar charla"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Iniciar unha charla con esta conta"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8824,49 +9486,99 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Un contacto cambiou o seu estado"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Non se achou o alcume: %s"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for 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.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "contido da mensaxe"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "room"
+msgid "?CLI:room"
 msgstr "De"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "Room JID"
+msgstr "Sala:"
+
+#: ../src/gajim-remote.py:290
 #, fuzzy
-msgid "nick"
+msgid "?CLI:nick"
 msgstr "Alcume"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:290
 #, fuzzy
-msgid "password"
+msgid "Nickname to use"
+msgstr "Non se achou o alcume: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "Contrasinal: "
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Os contrasinais non coinciden"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 #, 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
+#: ../src/gajim-remote.py:301
 #, 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8875,168 +9587,42 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Modo de uso: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Host errado"
-
-#: ../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 de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
-"ocupado, invisíbel"
-
-#: ../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: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 ""
-"Devolve a mensaxe de estado actual (o global se non se especificar unha "
-"conta)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Un contacto cambiou o seu estado"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Non se achou o alcume: %s"
-
-#: ../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 ""
-"Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
-"a todas as contas"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "contido da mensaxe"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Sala:"
-
-#: ../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 to enter the room"
-msgstr "Os contrasinais non coinciden"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9045,7 +9631,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9054,10 +9640,15 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Host errado"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -9081,204 +9672,239 @@ msgid "You cannot delete your current theme"
 msgstr "Non pode eliminar o tema actual"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s coñéceselle como %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s foi expulsado por %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
+#: ../src/groupchat_control.py:2199
+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."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
@@ -9302,66 +9928,60 @@ msgstr "_Informar do erro"
 msgid "Details"
 msgstr "Detalles"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9372,194 +9992,180 @@ msgstr ""
 "ocupante. \n"
 "Por favor, especifique outro alcume abaixo:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "É necesario usar o alcume rexistrado."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "É necesario o contrasinal"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Introduza o contrasinal GPG para a conta %s"
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Hai un correo novo en %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9569,103 +10175,88 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Elimina o contacto da listaxe"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-#, fuzzy
-msgid "Error opening file"
-msgstr "Erro ao ler o ficheiro:"
+msgid "File Transfer Failed"
+msgstr "Transferencias"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En cada _mensaxe"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9673,15 +10264,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Engadir unha notificación especial para %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9692,32 +10288,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 "Vai crear un metacontacto. Está seguro de que quere continuar?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9725,102 +10302,105 @@ msgid ""
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Selección da chave de OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "a crear un directorio %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Contactos"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Alcume"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Mensaxe"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9828,7 +10408,7 @@ msgstr ""
 "Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ EN "
 "EXECUCIÓN)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9842,98 +10422,110 @@ msgstr ""
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "A exportar o historial..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: ../src/history_manager.py: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] ""
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr ""
 "Está seguro de que quere eliminar o historial do contacto que seleccionou?"
-msgstr[1] ""
-"Está seguro de que quere eliminar o historial dos contactos que seleccionou?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Esta é unha operación irreversíbel"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Información"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historial de conversas con %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Non foi posíbel cargar a imaxe"
+msgid "Loading"
+msgstr "A compor"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Mensaxes"
 
@@ -9945,103 +10537,114 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s cambiou o seu estado"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "nove"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s conectouse"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s desconectouse"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "A expulsar %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Fallou a conexión"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova mensaxe privada desde o grupo de charlas %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Este ficheiro xa existe"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "nove"
+msgid "Configuration"
+msgstr "Configuración da sala"
 
-#: ../src/profile_window.py:58
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Camiño do ficheiro"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Información"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "A enviar o perfil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Información NON publicada"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Fallou a publicación da vCard"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10049,51 +10652,52 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Enviouse a autorización"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 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:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10101,39 +10705,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar a transferencia"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10142,16 +10746,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -10159,11 +10763,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10172,69 +10776,69 @@ msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
 "%s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 #, 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10243,12 +10847,12 @@ msgstr ""
 "ela sempre o/a verá desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10256,16 +10860,16 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10275,46 +10879,46 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 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:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -10325,24 +10929,29 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Facer %s e %s metacontactos"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Facer %s e %s metacontactos"
@@ -10352,138 +10961,138 @@ msgstr "Facer %s e %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "á conta %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "a usar a conta %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Xestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "para a conta %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descubrir os servizos..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Editar os grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Enviar mensaxe"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Executar o comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Renomear"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto desconectado"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historial"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
@@ -10500,31 +11109,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Asunto: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10534,149 +11133,154 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Está o OpenPGP activado para este contacto?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Cambiar a mensaxe de estado..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s deste grupo de charla"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Conexión"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Subscrición: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Sala:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Activo"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Modificar a conta"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Detido"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servizo non respondeu aínda con información detallada"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10684,34 +11288,34 @@ msgstr ""
 "Este servizo podería non responder con información detallada.\n"
 "Posibelmente é antigo ou está roto"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10719,7 +11323,7 @@ msgstr ""
 "Este contacto está interesado na información da súa presenza, mais vostede "
 "non o está na súa"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10727,14 +11331,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10742,19 +11346,369 @@ msgstr ""
 "Non está interesado na presenza do contacto e el/ela tampouco o está en "
 "vostede"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Elixa un ficheiro para enviar..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " hai unha fiestra/separador aberto con este contacto "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Accións</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Condicións</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Accións A_vanzadas"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Control de notificacións avanzadas"
+
+#~ msgid "All statuses"
+#~ msgstr "Todos os estados"
+
+#~ msgid "Busy "
+#~ msgstr "Ocupado "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Un contacto cambiou o seu estado"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contacto desconectado"
+
+#~ msgid "Don't have "
+#~ msgstr "Non ten "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Detívose a transferencia do ficheiro"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Remarcado da mensaxe de grupo de charla"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Recibiuse unha mensaxe de grupo de charla"
+
+#~ msgid "Have "
+#~ msgstr "Ten "
+
+#~ msgid "Launch a command"
+#~ msgstr "Enviar un comando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Un ou máis estados especiais..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "En liña / Libre para falar"
+
+#~ msgid "Play a sound"
+#~ msgstr "Reproducir un _son"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Mensaxe privada nova"
+
+#~ msgid "When "
+#~ msgstr "Cando"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activar o índice de urxencia do xestor de fiestras na barra de tarefas "
+#~ "para realzar a fiestra de charla"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Desactivar a apertura automática de fiestras de charla"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Desactivar as fiestras emerxentes existentes"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Desactivar os sons existentes para este acontecemento"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Desactivar mostrar os eventos no roster"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Desactivar mostrar os eventos no roster"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informarme cunha fiestra emerxente"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Abrir unha fiestra de charla con este usuario"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Mostrar o evento na listaxe de contactos"
+
+#~ msgid "and I "
+#~ msgstr "e eu "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contactos"
+
+#~ msgid "for "
+#~ msgstr "para "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupo"
+
+#~ msgid "when I'm in"
+#~ msgstr "cando eu estea en"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Engade o contacto á listaxe"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Permitirlle ver o meu estado"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Descrición: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Avanzado"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+#~ "listaxe e nos grupos de charla"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+#~ "listaxe e nos grupos de charla"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+#~ "listaxe e nos grupos de charla"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Enviar unha _mensaxe..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Imaxe:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Mensaxaría Instantánea Gajim"
+
+#~ msgid "English"
+#~ msgstr "Inglés"
+
+#, fuzzy
+#~ msgid "Belarusian"
+#~ msgstr "Búlgaro"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
+
+#, fuzzy
+#~ msgid "Breton"
+#~ msgstr "Bretón"
+
+#~ msgid "Czech"
+#~ msgstr "Checo"
+
+#~ msgid "German"
+#~ msgstr "Alemán"
+
+#~ msgid "Greek"
+#~ msgstr "Grego"
+
+#, fuzzy
+#~ msgid "British"
+#~ msgstr "Bretón"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Español"
+
+#, fuzzy
+#~ msgid "Basque"
+#~ msgstr "Éuscaro"
+
+#~ msgid "French"
+#~ msgstr "Francés"
+
+#~ msgid "Croatian"
+#~ msgstr "Croata"
+
+#~ msgid "Italian"
+#~ msgstr "Italiano"
+
+#, fuzzy
+#~ msgid "Norwegian (b)"
+#~ msgstr "Noruegués b"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
+
+#, fuzzy
+#~ msgid "Norwegian"
+#~ msgstr "Noruegués"
+
+#~ msgid "Polish"
+#~ msgstr "Polaco"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Portugués do Brasil"
+
+#~ msgid "Russian"
+#~ msgstr "Ruso"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Alemán"
+
+#~ msgid "Slovak"
+#~ msgstr "Eslovaco"
+
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chinés (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Idioma do corrector"
+
+#~ msgid "all or space separated status"
+#~ msgstr "estado separado por espazos ou all"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'si', 'non' ou 'ambos'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'si', 'non' ou ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Comprobe a súa conexión ou probe máis tarde"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "erro: non se pode abrir %s para lectura"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Non se pode conectar ao porto %s."
+
+#, fuzzy
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "É posíbel que outra instancia do Gajim estea a se executar. A "
+#~ "transferencia cancelarase."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Un cliente de Jabber en GTK"
+
+#~ msgid "Condition"
+#~ msgstr "Condición"
+
+#~ msgid "when I am "
+#~ msgstr "cando estea "
+
+#, fuzzy
+#~ 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"
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Modo de uso: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Contactos"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Asunto: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Sala:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Activo"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Desactivar mostrar os eventos na área de notificación"
 
@@ -10772,30 +11726,12 @@ msgstr " recurso con prioridade "
 #~ 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"
 
@@ -10882,9 +11818,6 @@ msgstr " recurso con prioridade "
 #~ "Contacto\n"
 #~ "Báner"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Xestionar as contas"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Eliminar"
@@ -10991,9 +11924,6 @@ msgstr " recurso con prioridade "
 #~ "Non está conectado ou está invisíbel aos máis. A súa mensaxe non se puido "
 #~ "enviar "
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Esta mensaxe está cifrada]"
-
 #~ msgid "%i days ago"
 #~ msgstr "hai %i días"
 
@@ -11006,12 +11936,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Commands: %s"
 #~ msgstr "Comandos: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uso: /%s, limpa o texto da fiestra."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uso: /%s, oculta os botóns de charla."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -11020,10 +11944,6 @@ msgstr " recurso con prioridade "
 #~ "Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
 #~ "terceira persoa. (por exemplo /%s berra.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uso: /%s, oculta os botóns de charla."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Non hai información de axuda para /%s"
 
@@ -11040,10 +11960,6 @@ msgstr " recurso con prioridade "
 #~ msgstr "%(contact_jid)s convidouse a %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Non se achou o alcume: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -11054,13 +11970,6 @@ msgstr " recurso con prioridade "
 #~ "JID está actualmente no grupo de charla, el/ela será tamén expulsado. NON "
 #~ "se admiten espazos no alcume."
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
@@ -11102,9 +12011,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr "Uso: /%s [tema], amosa ou actualiza o asunto actual da sala."
@@ -11137,10 +12043,6 @@ msgstr " recurso con prioridade "
 #~ msgid "_Host:"
 #~ msgstr "_Porto:"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Amosar _listaxe"
-
 #~ msgid "Modify Account"
 #~ msgstr "Modificar conta"
 
@@ -11235,9 +12137,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquio"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Prema aquí para ver as charlas anteriores con este contacto"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "Vista _compacta    Alt+C"
 
@@ -11250,9 +12149,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Query Builder..."
 #~ msgstr "Construtor de consultas..."
 
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Recibiuse un convite"
 
@@ -11347,9 +12243,6 @@ msgstr " recurso con prioridade "
 #~ msgid "The auto away status message"
 #~ msgstr "A mensaxe de estado de autoausencia"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "A mensaxe de estado de non autodispoñíbel"
-
 #~ 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 "
@@ -11386,9 +12279,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Company:"
 #~ msgstr "Empresa:"
 
-#~ msgid "Country:"
-#~ msgstr "País:"
-
 #~ msgid "Given:"
 #~ msgstr "Nome:"
 
diff --git a/po/he.po b/po/he.po
index 93a718b95..50d3fe985 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-27 10:18+0300\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2013-08-27 19:26+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n"
 "Language-Team: Rahut\n"
@@ -189,8 +189,8 @@ msgstr "_סיים"
 #: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
 #: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
-#: ../src/dialogs.py:536 ../src/roster_window.py:3149
-#: ../src/roster_window.py:3155 ../src/roster_window.py:3160
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
 msgid "None"
 msgstr "ללא"
 
@@ -211,7 +211,7 @@ msgid "Delete"
 msgstr "מחק"
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5794
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
 msgid "Re_name"
 msgstr "_שנה שם"
 
@@ -381,8 +381,8 @@ msgstr ""
 #. General group cannot be changed
 #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41
 #: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
-#: ../src/roster_window.py:3091 ../src/roster_window.py:4217
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
 msgid "General"
 msgstr "כללית"
 
@@ -777,8 +777,8 @@ msgstr "אנשי קשר חסומים"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5813
-#: ../src/roster_window.py:5940 ../src/roster_window.py:6073
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_בטל חסימה"
 
@@ -988,8 +988,8 @@ msgstr "שליחת _קובץ..."
 #. Invite to
 #. Invite to Groupchat
 #: ../data/gui/contact_context_menu.ui.h:4
-#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5749
-#: ../src/roster_window.py:5908
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "ה_זמן אל"
 
@@ -1006,8 +1006,8 @@ msgstr "הפעל הצפנת Open_PGP"
 msgid "Toggle End to End Encryption"
 msgstr "הפעל הצפנת קצה אל קצה"
 
-#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759
-#: ../src/roster_window.py:5997
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "שלח מצב חיבור מו_תאם"
 
@@ -1056,8 +1056,8 @@ msgid "_Forbid contact to see my status"
 msgstr "_מנע מאיש קשר מלראות את המצב שלי"
 
 #: ../data/gui/contact_context_menu.ui.h:21
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5821
-#: ../src/roster_window.py:5946 ../src/roster_window.py:6076
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
 msgid "_Block"
 msgstr "_חסום"
 
@@ -1076,7 +1076,7 @@ msgstr "הס_ר"
 #: ../data/gui/contact_context_menu.ui.h:26
 #: ../data/gui/gc_control_popup_menu.ui.h:9
 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
-#: ../src/roster_window.py:6147
+#: ../src/roster_window.py:6145
 msgid "_History"
 msgstr "_היסטוריה"
 
@@ -1177,7 +1177,7 @@ msgstr "הסתרת החלון"
 msgid "_Continue"
 msgstr "ה_משך"
 
-#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3350
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
 #: ../src/filetransfers_window.py:213
 msgid "_Open Containing Folder"
 msgstr "_פתח תיקיה מכילה"
@@ -1339,7 +1339,7 @@ msgstr "א_סור"
 msgid "_Add to Roster"
 msgstr "הו_סף אל רשימה"
 
-#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1722
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 msgid "Show a list of formattings"
 msgstr "הצגת רשימת עיצובים"
 
@@ -1548,7 +1548,7 @@ msgstr "שרת:"
 msgid "Bro_wse Rooms"
 msgstr "_עיון ברשימת חדרים"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3385
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
 #: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_כנס"
@@ -2381,6 +2381,10 @@ msgstr "<b>עורך תצורה מתקדם</b>"
 msgid "Advanced"
 msgstr "מתקדם"
 
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "רשימות פרטיות:"
+
 #: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
 msgid "Privacy List"
 msgstr "רשימת פרטיות"
@@ -2471,10 +2475,6 @@ msgstr "מן"
 msgid "to"
 msgstr "אל"
 
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "רשימות פרטיות:"
-
 #. Family Name
 #: ../data/gui/profile_window.ui.h:3
 #: ../data/gui/vcard_information_window.ui.h:17
@@ -2639,8 +2639,8 @@ msgstr "<b>מה ברצונך לעשות?</b>"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5831
-#: ../src/roster_window.py:5956 ../src/roster_window.py:6086
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "הס_ר"
 
@@ -2757,7 +2757,7 @@ msgid "_Add contact"
 msgstr "הוסף _איש קשר"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6098
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_מידע"
 
@@ -3078,17 +3078,17 @@ msgstr "שם העדפה"
 msgid "Value"
 msgstr "ערך"
 
-#: ../src/advanced_configuration_window.py:122
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "טיפוס"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:177
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(אין)"
 
 # Needs to be tested
-#: ../src/advanced_configuration_window.py:303
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "מוסתר"
 
@@ -3147,79 +3147,79 @@ msgstr "האם באמת לשלוח קובץ?"
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את כתובתך (מזהה Jabber) המלאה."
 
-#: ../src/chat_control.py:1664 ../src/chat_control.py:2248
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 msgid "OpenPGP encryption enabled"
 msgstr "הצפנת OpenPGP מאופשרת"
 
-#: ../src/chat_control.py:1726
+#: ../src/chat_control.py:1727
 msgid "Formattings are not available when GPG is active"
 msgstr "עיצובים אינם נתמכים כאשר GPG הינו פעיל"
 
-#: ../src/chat_control.py:1729
+#: ../src/chat_control.py:1730
 msgid "This contact does not support HTML"
 msgstr "איש קשר זה לא תומך HTML"
 
 #. Add to roster
-#: ../src/chat_control.py:1734 ../src/common/contacts.py:152
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67
 #: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
 #: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
-#: ../src/gui_menu_builder.py:265 ../src/gui_menu_builder.py:420
-#: ../src/roster_window.py:771 ../src/roster_window.py:1734
-#: ../src/roster_window.py:1736 ../src/roster_window.py:2084
-#: ../src/roster_window.py:3620 ../src/roster_window.py:3647
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "לא ברשימה"
 
 #. change tooltip text for audio and video buttons if python-farstream is
 #. not installed
-#: ../src/chat_control.py:1759
+#: ../src/chat_control.py:1760
 #: ../src/command_system/implementation/standard.py:215
 msgid "Toggle audio session"
 msgstr "הפעלת סשן שמע"
 
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1761
 #: ../src/command_system/implementation/standard.py:225
 msgid "Toggle video session"
 msgstr "הפעלת סשן וידאו"
 
-#: ../src/chat_control.py:1762
+#: ../src/chat_control.py:1763
 msgid "Feature not available, see Help->Features"
 msgstr "תכונה זו לא זמינה, ראו עזרה->תכונות."
 
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1767
 msgid "Feature not supported by remote client"
 msgstr "תכונה אינה נתמכת על ידי לקוח מרוחק"
 
-#: ../src/chat_control.py:1779
+#: ../src/chat_control.py:1780
 msgid "Send files"
 msgstr "שליחת קבצים"
 
-#: ../src/chat_control.py:1784
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "איש קשר זה אינו תומך בהעברת קבצים."
 
-#: ../src/chat_control.py:1787
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "יש צורך לדעת את הכתובת המממשת (JID) של איש הקשר כדי לשלוח אליו או אליה קובץ."
 
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s מצב : %(state)s, סיבה: %(reason)s"
 
-#: ../src/chat_control.py:2097
+#: ../src/chat_control.py:2098
 #, 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:2228 ../src/dialogs.py:5194
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
 msgid "No OpenPGP key assigned"
 msgstr "לא הוקצה מפתח OpenPGP"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2230
 msgid ""
 "No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
 "with OpenPGP."
@@ -3227,50 +3227,50 @@ msgstr ""
 "אין מפתח OpenPGP אשר מוקצה לאיש קשר זה. כך שאין אין באפשרותך להצפין הודעות "
 "באמצעות OpenPGP."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2239
 msgid "OpenPGP encryption disabled"
 msgstr "הצפנת OpenPGP מנוטרלת"
 
-#: ../src/chat_control.py:2264
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "הסשן יירשם"
 
-#: ../src/chat_control.py:2266
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "הסשן לא יירשם"
 
 #. encryption %s active
-#: ../src/chat_control.py:2283
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "הינה"
 
-#: ../src/chat_control.py:2283
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "אינה"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2285
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "יירשם"
 
-#: ../src/chat_control.py:2285
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "לא יירשם"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2289
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "והינה מאומת"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2293
+#: ../src/chat_control.py:2294
 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:2300
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3279,70 +3279,69 @@ msgstr ""
 "הצפנת %(type)s %(status)s מופעלת %(authenticated)s.\n"
 "סשן שיחתך %(logged)s ברשומות ההיסטוריה."
 
-#: ../src/chat_control.py:2438
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "משא ומתן סשן בוטל"
 
-#: ../src/chat_control.py:2448
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "סשן זה יושם בארכיון על שרת"
 
-#: ../src/chat_control.py:2450
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "סשן זה לא יושם בארכיון על שרת"
 
-#: ../src/chat_control.py:2459
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "סשן זה הינו מוצפן"
 
-#: ../src/chat_control.py:2462
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " ויירשם"
 
-#: ../src/chat_control.py:2464
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " ולא יירשם"
 
-#: ../src/chat_control.py:2469
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "זהות איש קשר מרוחק לא מאומתת. לחץ על לחצן המגן עבור פרטים נוספים."
 
-#: ../src/chat_control.py:2471
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "הצפנת E2E מנוטרלת כעת"
 
-#: ../src/chat_control.py:2519 ../src/chat_control.py:2533
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "ההודעה הבאה לא הוצפנה"
 
-#: ../src/chat_control.py:2525
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "ההודעה הבאה הוצפנה"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2796
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "זה עתה קיבלת הודעה חדשה מן \"%s\""
 
-#: ../src/chat_control.py:2798
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "אם כרטיסייה זו תיסגר ובמידה ורשימת היסטוריה מנוטרלת אצלך. הודעה זו תאבד."
 
-#: ../src/chat_control.py:2966 ../src/common/connection.py:523
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
 #: ../src/common/connection_handlers.py:1145
-#: ../src/common/connection_handlers.py:1269
-#: ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
 #: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "שגיאת מסד נתונים"
 
-#: ../src/chat_control.py:2967
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3351,7 +3350,7 @@ msgstr ""
 "קובץ מסד הנתונים (%s) לא ניתן לקריאה. נסה לתקנו או להסירו (כל ההיסטוריה "
 "תאבד)."
 
-#: ../src/chat_control.py:3204 ../src/gui_interface.py:1161
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3360,52 +3359,52 @@ msgstr ""
 "אין אפשרות לפענח הודעה מאת %s\n"
 "ייתכן כי הודעה זו נפגמה."
 
-#: ../src/chat_control.py:3261
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s מצוי/ה כעת במצב %(status)s"
 
-#: ../src/chat_control.py:3320
+#: ../src/chat_control.py:3321
 msgid "File transfer"
 msgstr "העברת קובץ"
 
-#: ../src/chat_control.py:3323
+#: ../src/chat_control.py:3324
 msgid "Size"
 msgstr "גודל"
 
-#: ../src/chat_control.py:3325
+#: ../src/chat_control.py:3326
 msgid "_Accept"
 msgstr "_קבל"
 
-#: ../src/chat_control.py:3346 ../src/filetransfers_window.py:211
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
 msgid "File transfer completed"
 msgstr "העברת קובץ הושלמה"
 
-#: ../src/chat_control.py:3382 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
 #: ../src/gui_interface.py:646 ../src/notify.py:278
 msgid "Groupchat Invitation"
 msgstr "הזמנה אל שיחת קבוצה"
 
-#: ../src/chat_control.py:3404 ../src/gui_interface.py:1019
-#: ../src/roster_window.py:1993
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
 msgid "Remote contact stopped transfer"
 msgstr "ההעברה הופסקה על ידי איש קשר מרוחק"
 
-#: ../src/chat_control.py:3406 ../src/gui_interface.py:1022
-#: ../src/roster_window.py:1995
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
 msgid "Error opening file"
 msgstr "שגיאה בפתיחת הקובץ"
 
-#: ../src/chat_control.py:3408 ../src/filetransfers_window.py:247
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
 msgid "File transfer stopped"
 msgstr "העברת קובץ נעצרה"
 
-#: ../src/chat_control.py:3411 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:233
 msgid "File transfer cancelled"
 msgstr "העברת קובץ בוטלה"
 
-#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:234
 msgid "Connection with peer cannot be established."
 msgstr "חיבור עם עמית לא היה אפשרי לביסוס."
@@ -3761,8 +3760,8 @@ msgstr "בחירת שיחות קבוצה אשר ברצונך לעזוב"
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:216 ../src/common/contacts.py:131
 #: ../src/common/helpers.py:67 ../src/roster_window.py:824
-#: ../src/roster_window.py:1738 ../src/roster_window.py:1740
-#: ../src/roster_window.py:2623 ../src/roster_window.py:5716
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "שיחות קבוצה"
 
@@ -3933,7 +3932,7 @@ msgstr "רשימה (רווח מפריד) של שורות (חשבונות וקב�
 #. sorted alphanum
 #: ../src/common/config.py:117 ../src/common/config.py:533
 #: ../src/common/optparser.py:295 ../src/common/optparser.py:491
-#: ../src/common/optparser.py:525 ../src/gui_interface.py:2790
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "ברירת מחדל"
 
@@ -5003,6 +5002,209 @@ msgstr "ימי"
 msgid "Tor"
 msgstr ""
 
+#: ../src/common/connection_handlers_events.py:370
+#, 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. זו לא תוסף אל רשימתך. ניתן להשתמש בכלי ניהול רשימה "
+"(roster management tools) כגון http://jru.jabberstudio.org כדי להסירה"
+
+#: ../src/common/connection_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "בקשת ביטול הרשמה מאת %s"
+
+# BUG: spawning dialog
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "שגיאת כתיבת כונן"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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) או להסירו (כל ההיסטוריה תאבד)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "החדר הוחרב"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "באפשרותך להצטרף אל חדר זה במקום: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "מזהה Jabber שגוי"
+
+# זכתה להתעלמות מן הצד/הקצה שלך
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "התקבלה הודעה מן JID אשר איננה תקפה, Gajim התעלם מן הודעה זו."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "שגיאה בעת שליחת %(message)s ‏( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr "‏URL:"
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "שגיאת SSL לא מוכרת: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "הודעה בודדת חדשה"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "התקבלה הודעה בודדת חדשה מאת %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "הודעה פרטית חדשה"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "הודעה פרטית חדשה מן שיחת קבוצה %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+# [09:02:34 PM] Rodensky: "התקבלה הודעה מ"
+# [09:08:28 PM] Myself: אני חושב שזה: המסר נשלח על-ידי...
+# [09:08:39 PM] Rodensky: לא
+# [09:08:46 PM] Rodensky: זה "התקבלה הודעה מ"
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "התקבלה הודעה מאת %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "הודעה חדשה"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "הודעה חדשה מאת %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "המצב של %(nick)s שונה"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s מצוי/ה כעת במצב %(status)s "
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "איש קשר שינה מצב חיבור"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s התחבר/ה"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "איש קשר התחבר"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s התנתק/ה"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "איש קשר התנתק"
+
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+msgid "Unable to load idle module"
+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:135
+msgid "Registration succeeded"
+msgstr "רישום בוצע בהצלחה"
+
+#: ../src/common/connection_handlers.py:136
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "רישום עם סוכן %s בוצע בהצלחה"
+
+#: ../src/common/connection_handlers.py:145
+msgid "Registration failed"
+msgstr "רישום נכשל"
+
+# BUG: with errors
+# BUG: with an error
+# Needs to be tested
+#: ../src/common/connection_handlers.py:146
+#, 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:591 ../src/common/connection.py:1770
+msgid "Invisibility not supported"
+msgstr "מצב בלתי נראה אינו נתמך"
+
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr "חשבון %s לא תומך במצב בלתי נראה."
+
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "ברצוני להוסיפך אל הרשימה שלי."
+
 #: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "אין אפשרות לקבל תעודת מנפיק"
@@ -5139,14 +5341,6 @@ msgstr "שימוש מפתח לא כולל חתימת תעודה"
 msgid "Application verification failure"
 msgstr "כשל אימות פניה"
 
-#: ../src/common/connection.py:270 ../src/common/connection.py:280
-#: ../src/common/connection_handlers_events.py:1027
-#: ../src/common/connection_handlers_events.py:1070 ../src/config.py:2157
-#: ../src/config.py:2166 ../src/config.py:2236 ../src/config.py:3680
-#: ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
-msgid "Invalid Jabber ID"
-msgstr "מזהה Jabber שגוי"
-
 #: ../src/common/connection.py:271 ../src/common/connection.py:281
 #: ../src/dialogs.py:3245
 #, python-format
@@ -5177,27 +5371,6 @@ msgstr ""
 "נושא: %(subject)s\n"
 "%(message)s"
 
-# BUG: spawning dialog
-#: ../src/common/connection.py:520 ../src/common/connection_handlers.py:343
-#: ../src/common/connection_handlers.py:1143
-#: ../src/common/connection_handlers.py:1267
-#: ../src/common/connection_handlers_events.py:910
-#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
-msgid "Disk Write Error"
-msgstr "שגיאת כתיבת כונן"
-
-#: ../src/common/connection.py:524 ../src/common/connection_handlers.py:1146
-#: ../src/common/connection_handlers.py:1270
-#: ../src/common/connection_handlers_events.py:914
-#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
-#, 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.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
@@ -5329,15 +5502,6 @@ msgstr ""
 "רשימת הפרטיות %s לא הוסרה. ייתכן וזו פעילה באחד ממשאביך אשר מחוברים כעת. בטל "
 "את פעילותה ונסה שוב."
 
-#: ../src/common/connection.py:1771 ../src/common/connection_handlers.py:592
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "חשבון %s לא תומך במצב בלתי נראה."
-
-#: ../src/common/connection.py:1770 ../src/common/connection_handlers.py:591
-msgid "Invisibility not supported"
-msgstr "מצב בלתי נראה אינו נתמך"
-
 #: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
@@ -5361,171 +5525,6 @@ msgstr "ביטול רישום נכשל"
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "אי רישום בתוך שרת %(server)s נכשל: %(error)s"
 
-#: ../src/common/connection_handlers.py:92
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-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:135
-msgid "Registration succeeded"
-msgstr "רישום בוצע בהצלחה"
-
-#: ../src/common/connection_handlers.py:136
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "רישום עם סוכן %s בוצע בהצלחה"
-
-#: ../src/common/connection_handlers.py:145
-msgid "Registration failed"
-msgstr "רישום נכשל"
-
-# BUG: with errors
-# BUG: with an error
-# Needs to be tested
-#: ../src/common/connection_handlers.py:146
-#, 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:1945
-msgid "I would like to add you to my roster."
-msgstr "ברצוני להוסיפך אל הרשימה שלי."
-
-#: ../src/common/connection_handlers_events.py:370
-#, 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. זו לא תוסף אל רשימתך. ניתן להשתמש בכלי ניהול רשימה "
-"(roster management tools) כגון http://jru.jabberstudio.org כדי להסירה"
-
-#: ../src/common/connection_handlers_events.py:825
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "בקשת ביטול הרשמה מאת %s"
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:935
-msgid "Room has been destroyed"
-msgstr "החדר הוחרב"
-
-#: ../src/common/connection_handlers_events.py:943
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "באפשרותך להצטרף אל חדר זה במקום: %s"
-
-# זכתה להתעלמות מן הצד/הקצה שלך
-#: ../src/common/connection_handlers_events.py:1028
-#: ../src/common/connection_handlers_events.py:1071
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "התקבלה הודעה מן JID אשר איננה תקפה, Gajim התעלם מן הודעה זו."
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1102
-#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "שגיאה בעת שליחת %(message)s ‏( %(error)s )"
-
-#: ../src/common/connection_handlers_events.py:1298
-msgid "URL:"
-msgstr "‏URL:"
-
-#: ../src/common/connection_handlers_events.py:1599
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "שגיאת SSL לא מוכרת: %d"
-
-#: ../src/common/connection_handlers_events.py:2202 ../src/dialogs.py:2917
-#: ../src/notify.py:266
-msgid "New Single Message"
-msgstr "הודעה בודדת חדשה"
-
-#: ../src/common/connection_handlers_events.py:2204
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "התקבלה הודעה בודדת חדשה מאת %(nickname)s"
-
-#: ../src/common/connection_handlers_events.py:2208 ../src/dialogs.py:2918
-#: ../src/notify.py:267
-msgid "New Private Message"
-msgstr "הודעה פרטית חדשה"
-
-#: ../src/common/connection_handlers_events.py:2210
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "הודעה פרטית חדשה מן שיחת קבוצה %s"
-
-#: ../src/common/connection_handlers_events.py:2213
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr ""
-
-# [09:02:34 PM] Rodensky: "התקבלה הודעה מ"
-# [09:08:28 PM] Myself: אני חושב שזה: המסר נשלח על-ידי...
-# [09:08:39 PM] Rodensky: לא
-# [09:08:46 PM] Rodensky: זה "התקבלה הודעה מ"
-#: ../src/common/connection_handlers_events.py:2216
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "התקבלה הודעה מאת %(nickname)s"
-
-#: ../src/common/connection_handlers_events.py:2220 ../src/dialogs.py:2917
-#: ../src/notify.py:266
-msgid "New Message"
-msgstr "הודעה חדשה"
-
-#: ../src/common/connection_handlers_events.py:2222
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "הודעה חדשה מאת %(nickname)s"
-
-#: ../src/common/connection_handlers_events.py:2366
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "המצב של %(nick)s שונה"
-
-#: ../src/common/connection_handlers_events.py:2368
-#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
-#: ../src/history_window.py:455
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s מצוי/ה כעת במצב %(status)s "
-
-#: ../src/common/connection_handlers_events.py:2372 ../src/dialogs.py:2929
-#: ../src/notify.py:280
-msgid "Contact Changed Status"
-msgstr "איש קשר שינה מצב חיבור"
-
-#: ../src/common/connection_handlers_events.py:2374
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s התחבר/ה"
-
-#. default value
-#: ../src/common/connection_handlers_events.py:2378 ../src/dialogs.py:2913
-#: ../src/notify.py:262
-msgid "Contact Signed In"
-msgstr "איש קשר התחבר"
-
-#: ../src/common/connection_handlers_events.py:2380
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s התנתק/ה"
-
-#: ../src/common/connection_handlers_events.py:2384 ../src/dialogs.py:2915
-#: ../src/notify.py:264
-msgid "Contact Signed Out"
-msgstr "איש קשר התנתק"
-
 #: ../src/common/contacts.py:129 ../src/common/helpers.py:67
 #: ../src/gui_interface.py:485
 msgid "Observers"
@@ -5534,9 +5533,9 @@ msgstr "משקיפים"
 #: ../src/common/contacts.py:133 ../src/common/contacts.py:361
 #: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
 #: ../src/disco.py:1554 ../src/roster_window.py:863
-#: ../src/roster_window.py:1616 ../src/roster_window.py:1730
-#: ../src/roster_window.py:1732 ../src/roster_window.py:1894
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "מובילים"
 
@@ -6187,8 +6186,8 @@ msgstr "מערכת חלונות X (ללא Xv)"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:203
-#: ../src/gtkgui_helpers.py:219
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "שגיאה: אין אפשרות לפתוח את %s לקריאה"
@@ -7591,7 +7590,7 @@ msgstr "הודעת שיחת קבוצה אשר התקבלה"
 msgid "GMail Email Received"
 msgstr "דוא״ל GMail אשר התקבל"
 
-#: ../src/conversation_textview.py:474 ../src/conversation_textview.py:492
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
 #, python-format
 msgid ""
 "<b>Message was corrected. Last message was:</b>\n"
@@ -7600,7 +7599,7 @@ msgstr ""
 "<b>הודעה תוקנה. הודעה אחרונה היתה:</b>\n"
 "  %s"
 
-#: ../src/conversation_textview.py:645
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -7610,7 +7609,7 @@ msgstr ""
 "התקבלה על ידי הקצה המרוחק. אם צלמית זו\n"
 "נותרת למשך זמן ממושך, סביר כי ההודעה אבדה."
 
-#: ../src/conversation_textview.py:664
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -7618,44 +7617,44 @@ msgstr ""
 "תמליל תחת שורה זו הוא דברים אשר נרשמו מאז הפעם\n"
 "האחרונה בה הסבת את צומת לבך אל שיחת קבוצה זו"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_צטט"
 
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_פעולות עבור \"%s\""
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "עיין ערך _ויקיפדיה"
 
-#: ../src/conversation_textview.py:809
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "חפש בתוך _מילון"
 
-#: ../src/conversation_textview.py:826
+#: ../src/conversation_textview.py:835
 #, 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:839
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "לכתובת URL של חיפוש ברשת חסר \"%s\""
 
-#: ../src/conversation_textview.py:842
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_חפש ברשת"
 
-#: ../src/conversation_textview.py:848
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "פתח בתור _קישור"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1377
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7663,7 +7662,7 @@ msgstr[0] "אתמול"
 msgstr[1] "לפני %(nb_days)i ימים"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1427 ../src/history_window.py:488
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "נושא: %s\n"
@@ -7869,8 +7868,8 @@ msgstr ""
 "\n"
 "הדגשת מילים אשר לא אויתו כראוי לא תנוצל"
 
-#: ../src/dialogs.py:1845 ../src/gui_interface.py:1444
-#: ../src/gui_interface.py:1486
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
 msgid "Insecure connection"
 msgstr "חיבור לא מאובטח"
 
@@ -7893,8 +7892,8 @@ msgstr ""
 "מוצפנות. רצוי להימנע מחיבורים מטיפוס זה.\n"
 "האם אתה בטוח כי ברצונך לעשות כן?"
 
-#: ../src/dialogs.py:1852 ../src/gui_interface.py:1448
-#: ../src/gui_interface.py:1489
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
 msgid "Yes, I really want to connect insecurely"
 msgstr "כן, ברצוני להתחבר בשיטה לא בטוחה"
 
@@ -7903,10 +7902,10 @@ msgid "Gajim will NOT connect unless you check this box"
 msgstr "‏Gajim לא יתחבר אלא אם כן תיבה זו תסומן"
 
 #: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
-#: ../src/gui_interface.py:706 ../src/gui_interface.py:1449
-#: ../src/gui_interface.py:1490 ../src/message_window.py:222
-#: ../src/roster_window.py:3050 ../src/roster_window.py:3730
-#: ../src/roster_window.py:4558
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
 msgid "_Do not ask me again"
 msgstr "אל ת_שאל אותי שוב"
 
@@ -7932,7 +7931,7 @@ msgstr "בקשת הרשמה עבור חשבון %(account)s מאת %(jid)s"
 msgid "Subscription request from %s"
 msgstr "בקשת הרשמה מאת %s"
 
-#: ../src/dialogs.py:2364 ../src/gui_interface.py:2054
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "הינך כבר בתוך שיחת קבוצה %s"
@@ -7981,11 +7980,11 @@ msgstr "אנא הזן מזהה Jabber של שיחת הקבוצה בתור חדר
 msgid "The group chat Jabber ID contains invalid characters."
 msgstr "מזהה Jabber של שיחת קבוצה מכילה תווים אסורים."
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:2036
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "זוהי אינה שיחת קבוצה"
 
-#: ../src/dialogs.py:2629 ../src/gui_interface.py:2037
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "‫%s אינו שם של שיחת קבוצה."
@@ -8518,6 +8517,11 @@ msgstr ""
 msgid "View cert..."
 msgstr "הצג תעודה"
 
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "תעודת לקוח"
+
 #: ../src/disco.py:120
 msgid "Others"
 msgstr "אחרים"
@@ -8607,20 +8611,20 @@ msgstr "תיאור"
 msgid "Id"
 msgstr "כתובת"
 
-#: ../src/disco.py:1877 ../src/gui_interface.py:2572
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "סימנייה כבר הוגדרה"
 
-#: ../src/disco.py:1878 ../src/gui_interface.py:2573
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "שיחת קבוצה \"%s\" כבר קיימת בסימניותייך."
 
-#: ../src/disco.py:1887 ../src/gui_interface.py:2587
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "סימנייה הוספה בהצלחה"
 
-#: ../src/disco.py:1888 ../src/gui_interface.py:2588
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "באפשרותך לנהל את הסימניות שלך דרך תפריט 'פעולות' אשר מצוי בתוך הרשימה שלך."
@@ -8978,22 +8982,22 @@ msgid "This file is being used by another process."
 msgstr "קובץ זה מצוי בשימוש בידי תהליך אחר."
 
 # להחליף
-#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "אין אפשרות לכתוב על קובץ קיים \"%s\""
 
-#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "קובץ בשם זה כבר קיים ואין ולא עומדת לרשותך הרשאה לכתוב עליו."
 
-#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "קובץ זה כבר קיים"
 
-#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "What do you want to do?"
 msgstr "מה ברצונך לעשות?"
 
@@ -9001,12 +9005,12 @@ 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:418 ../src/gtkgui_helpers.py:862
+#: ../src/filetransfers_window.py:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "המדור \"%s\" אינו נתון לכתיבה"
 
-#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "אין לך הרשאות ליצור קבצים במדור זה."
 
@@ -9085,6 +9089,100 @@ msgstr "ממען: "
 msgid "Pause"
 msgstr "הפסקה"
 
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "cli"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "cli"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+#, fuzzy
+msgid "Show this help message and exit"
+msgstr "cli"
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "cli"
+
+#: ../src/gajim.py:143
+#, fuzzy
+msgid "Print xml stanzas and other debug information"
+msgstr "cli"
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "cli"
+
+#: ../src/gajim.py:147
+msgid "Set configuration directory"
+msgstr "cli"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "cli"
+
+#: ../src/gajim.py:211
+#, fuzzy
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "cli"
+
+#: ../src/gajim.py:213
+#, fuzzy, python-format
+msgid "importing PyGTK failed: %s"
+msgstr "cli"
+
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
+msgstr "cli"
+
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+msgstr "cli"
+
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
+msgstr "cli"
+
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+msgstr "cli"
+
+#: ../src/gajim.py:269
+#, fuzzy
+msgid "Gajim needs pywin32 to run"
+msgstr "cli"
+
+# component
+#: ../src/gajim.py:270
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr "אנא ודא כי הרכיב Pywin32 מותקן במערכתך. באפשרותך להשיגו אצל %s"
+
+#: ../src/gajim.py:410
+msgid "Gajim is already running"
+msgstr "‏Gajim כבר מורץ כעת"
+
+#: ../src/gajim.py:411
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"נראה כי תהליך אחר של Gajim מורץ כעת\n"
+"האם ברצונך להריץ בכל זאת?"
+
 #: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
@@ -9580,100 +9678,6 @@ msgstr "cli"
 msgid "Wrong uri"
 msgstr "cli"
 
-#: ../src/gajim.py:135 ../src/history_manager.py:73
-#, fuzzy
-msgid "Usage:"
-msgstr "cli"
-
-#: ../src/gajim.py:137 ../src/history_manager.py:75
-#, fuzzy
-msgid "Options:"
-msgstr "cli"
-
-#: ../src/gajim.py:139 ../src/history_manager.py:77
-#, fuzzy
-msgid "Show this help message and exit"
-msgstr "cli"
-
-#: ../src/gajim.py:141
-#, fuzzy
-msgid "Show only critical errors"
-msgstr "cli"
-
-#: ../src/gajim.py:143
-#, fuzzy
-msgid "Print xml stanzas and other debug information"
-msgstr "cli"
-
-#: ../src/gajim.py:145
-#, fuzzy
-msgid "Use defined profile in configuration directory"
-msgstr "cli"
-
-#: ../src/gajim.py:147
-msgid "Set configuration directory"
-msgstr "cli"
-
-#: ../src/gajim.py:149
-#, fuzzy
-msgid "Configure logging system"
-msgstr "cli"
-
-#: ../src/gajim.py:211
-#, fuzzy
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "cli"
-
-#: ../src/gajim.py:213
-#, fuzzy, python-format
-msgid "importing PyGTK failed: %s"
-msgstr "cli"
-
-#: ../src/gajim.py:256
-#, fuzzy
-msgid "Gajim needs PyGTK 2.22 or above"
-msgstr "cli"
-
-#: ../src/gajim.py:257
-#, fuzzy
-msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
-msgstr "cli"
-
-#: ../src/gajim.py:259
-#, fuzzy
-msgid "Gajim needs GTK 2.22 or above"
-msgstr "cli"
-
-#: ../src/gajim.py:260
-#, fuzzy
-msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
-msgstr "cli"
-
-#: ../src/gajim.py:269
-#, fuzzy
-msgid "Gajim needs pywin32 to run"
-msgstr "cli"
-
-# component
-#: ../src/gajim.py:270
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr "אנא ודא כי הרכיב Pywin32 מותקן במערכתך. באפשרותך להשיגו אצל %s"
-
-#: ../src/gajim.py:410
-msgid "Gajim is already running"
-msgstr "‏Gajim כבר מורץ כעת"
-
-#: ../src/gajim.py:411
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"נראה כי תהליך אחר של Gajim מורץ כעת\n"
-"האם ברצונך להריץ בכל זאת?"
-
 # ערכאת נושא
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
@@ -9780,7 +9784,7 @@ msgstr "החדר הינו אנונימי לחלוטין"
 
 # in or to?
 #: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
-#: ../src/gui_interface.py:605 ../src/roster_window.py:3325
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s הוזמן/ה אל חדר זה"
@@ -9943,12 +9947,12 @@ msgstr "באפשרותך להזין זירה אלטרנטיבית:"
 msgid "Kicking %s"
 msgstr "בעיטת ‫%s"
 
-#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2742
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "באפשרותך לציין סיבה למטה:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2741
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "אסירת ‫%s"
@@ -9974,46 +9978,46 @@ msgstr "_דווחו על בעיה"
 msgid "Details"
 msgstr "פרטים"
 
-#: ../src/gtkgui_helpers.py:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "שגיאה בקריאת הקובץ:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "שגיאה בניתוח הקובץ:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:392
+#: ../src/gtkgui_helpers.py:393
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "לא היתה אפשרות לכתוב אל %s. תמיכה עבור ניהול סשן לא תעבוד"
 
 # ‏Gajim אינו הלקוח המשתמט עבור Jabber
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "‏Gajim אינו לקוח Jabber ברירת המחדל"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "האם ברצונך להפוך את Gajim ללקוח Jabber ברירת המחדל?"
 
-#: ../src/gtkgui_helpers.py:768
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "בדוק תמיד אם Gajim הינו לקוח Jabber ברירת המחדל בעת הפעלה"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "הרחבה לא נתמכת"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "שמירת תמונה בשם..."
 
@@ -10332,12 +10336,17 @@ msgstr ""
 msgid "Ignore this error for this certificate."
 msgstr "התעלם משגיאה זו עבור תעודה זו."
 
-#: ../src/gui_interface.py:1372
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "הוכחת תקפות של תעודת SSL"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "שגיאת תעודת SSL"
 
 # ישנה
-#: ../src/gui_interface.py:1373
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -10353,7 +10362,7 @@ msgstr ""
 "\n"
 "האם עדיין יש ברצונך להתחבר ולעדכן את טביעת האצבע של התעודה?"
 
-#: ../src/gui_interface.py:1445
+#: ../src/gui_interface.py:1447
 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?"
@@ -10361,7 +10370,7 @@ msgstr ""
 "הינך על סף שליחת סיסמתך על פני חיבור לא מאובטח. עליך להתקין PyOpenSSL בכדי "
 "למנוע זאת. האם אתה בטוח כי ברצונך להתחבר?"
 
-#: ../src/gui_interface.py:1487
+#: ../src/gui_interface.py:1489
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -10370,17 +10379,17 @@ msgstr ""
 "כי ברצונך לעשות זאת?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1993 ../src/gui_interface.py:2016
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "רגשונים נוטרלו"
 
-#: ../src/gui_interface.py:1994
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "מוטיב הרגשונים אשר הגדרת לא נמצא, ומשכך רגשונים נוטרלו."
 
-#: ../src/gui_interface.py:2017
+#: ../src/gui_interface.py:2019
 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 "
@@ -10390,42 +10399,42 @@ msgstr ""
 "של הקובץ emoticons.py. לפרטים נוספים, ראו http://trac.gajim.org/wiki/"
 "Emoticons."
 
-#: ../src/gui_interface.py:2061 ../src/roster_window.py:3897
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2448
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "לא היתה אפשרות לשמור את ההגדרות וההעדפות שלך"
 
-#: ../src/gui_interface.py:3038
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "נדרשת מימרת סיסמה"
 
-#: ../src/gui_interface.py:3039
+#: ../src/gui_interface.py:3044
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "הזן מימרת סיסמה של מפתח OpenPGP עבור מפתח %(keyid)s (חשבון %(account)s)."
 
-#: ../src/gui_interface.py:3053
+#: ../src/gui_interface.py:3058
 msgid "OpenPGP key expired"
 msgstr "מפתח OpenPGP פקע"
 
-#: ../src/gui_interface.py:3054
+#: ../src/gui_interface.py:3059
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "מפתח OpenPGP פקע, התחברותך אל %s תתקיים ללא OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3063
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "מימרת סיסמה שגויה"
 
-#: ../src/gui_interface.py:3064
+#: ../src/gui_interface.py:3069
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "אנא הקלד מחדש מימרת סיסמה OpenPGP או לחץ על ביטול."
 
@@ -10433,7 +10442,7 @@ msgstr "אנא הקלד מחדש מימרת סיסמה OpenPGP או לחץ על
 msgid "_New Group Chat"
 msgstr "שיחת קבוצה _חדשה"
 
-#: ../src/gui_menu_builder.py:435
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "ברצוני להוסיפך אל הרשימה שלי"
 
@@ -10612,35 +10621,35 @@ msgstr "התעלמות"
 msgid "Plugin"
 msgstr "תוספת"
 
-#: ../src/plugins/gui.py:149
+#: ../src/plugins/gui.py:151
 #, python-format
 msgid "Warning: %s"
 msgstr "אזהרה: %s"
 
-#: ../src/plugins/gui.py:207
+#: ../src/plugins/gui.py:209
 msgid "Plugin failed"
 msgstr "כשל תוספת"
 
-#: ../src/plugins/gui.py:252
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr "אין אפשרות להסיר את התוספת באופן רגיל"
 
 #. members not safe
-#: ../src/plugins/gui.py:260 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
 #: ../src/plugins/pluginmanager.py:534
 msgid "Archive is malformed"
 msgstr "ארכיון הינו פגום"
 
-#: ../src/plugins/gui.py:284 ../src/plugins/gui.py:292
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
 #: ../src/plugins/pluginmanager.py:542
 msgid "Plugin already exists"
 msgstr "תוספת כבר קיימת"
 
-#: ../src/plugins/gui.py:284
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr "להחליף?"
 
-#: ../src/plugins/gui.py:314
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "תצורה"
 
@@ -10658,18 +10667,18 @@ msgstr "ארכיון ריק"
 msgid "Retrieving profile..."
 msgstr "מאחזר כעת דיוקן..."
 
-#: ../src/profile_window.py:129 ../src/roster_window.py:3194
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "קובץ ריק"
 
-#: ../src/profile_window.py:132 ../src/roster_window.py:3197
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "קובץ לא קיים"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:146 ../src/profile_window.py:163
-#: ../src/roster_window.py:3199 ../src/roster_window.py:3210
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "לא היתה אפשרות להטעין תמונה"
 
@@ -10713,48 +10722,48 @@ msgstr "אירעה שגיאה במהלך פרסום המידע האישי שלך
 msgid "Merged accounts"
 msgstr "חשבונות ממוזגים"
 
-#: ../src/roster_window.py:2061
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "הרשאה נשלחה"
 
-#: ../src/roster_window.py:2062
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "מעתה מצבך יהיה גלוי עבור \"%s\"."
 
-#: ../src/roster_window.py:2085
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "בקשת הרשמה נשלחה"
 
-#: ../src/roster_window.py:2086
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "אם בקשתך תתקבל על ידי \"%s\" מצב החיבור שלו או שלה יהיה גלוי בפניך."
 
-#: ../src/roster_window.py:2100
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "הרשאה הוסרה"
 
-#: ../src/roster_window.py:2101
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "מעתה מצבך ייראה בתור לא מקוון עבור \"%s\"."
 
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:2126
 msgid "OpenPGP is not usable"
 msgstr "הצפנת OpenPGP אינה שמישה"
 
-#: ../src/roster_window.py:2129
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "התחברותך אל %s תתבצע ללא OpenPGP."
 
-#: ../src/roster_window.py:2336 ../src/roster_window.py:3827
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "הינך משתתף בשיחת קבוצה אחת או יותר"
 
 # יוביל, יביא לידי
-#: ../src/roster_window.py:2337 ../src/roster_window.py:3828
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10762,42 +10771,42 @@ msgstr ""
 "שינוי מצב החיבור שלך אל בלתי נראה ינבע בניתוקך מתוך שיחות קבוצה אלו. האם אתה "
 "בטוח כי ברצונך להפוך את מצבך אל בלתי נראה?"
 
-#: ../src/roster_window.py:2363
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "לא מסונכרן"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "באמת לצאת מן Gajim?"
 
 # לסגור את
-#: ../src/roster_window.py:2430
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "האם אתה בטוח כי ברצונך לצאת מתוך Gajim?"
 
-#: ../src/roster_window.py:2431
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "סגור את Gajim תמיד"
 
-#: ../src/roster_window.py:2521
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "נותרו העברות קבצים פעילות"
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 "אם תצא עכשיו, הקובץ או הקבצים אשר מועברים כעת יופסקו. האם עדיין ברצונך לצאת?"
 
-#: ../src/roster_window.py:2553 ../src/roster_window.py:2990
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "נותרו הודעות אשר לא נקראו"
 
 # BUG: and (A or THE) contact
 # קיימת לרשותך
 # היסטוריה מאופשרת
-#: ../src/roster_window.py:2554
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10805,16 +10814,16 @@ msgstr ""
 "הודעות יהיו זמינות לקריאה מאוחרת רק אם אפשרת רישום היסטוריה ואיש הקשר מצוי "
 "ברשימה שלך."
 
-#: ../src/roster_window.py:2991
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "עליך לקרוא אותן טרם הסרת מוביל זה."
 
-#: ../src/roster_window.py:2994
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "המוביל \"%s\" יוסר"
 
-#: ../src/roster_window.py:2995
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10822,13 +10831,13 @@ msgstr ""
 "לא תעמוד עוד לרשותך האפשרות לקבל ולשלוח הודעות מתוך אנשי קשר באמצעות מוביל "
 "זה."
 
-#: ../src/roster_window.py:2998
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "המובילים יוסרו"
 
 # הטרנספורטים שלהלן
 # הטרנספורטים הללו
-#: ../src/roster_window.py:3003
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10839,13 +10848,13 @@ msgstr ""
 
 # Needs to be tested
 # you have chose to
-#: ../src/roster_window.py:3045
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "בחרת לחסום איש קשר. האם אתה בטוח כי ברצונך להמשיך?"
 
 # BUG: HE and SHE
 # על ידו או על ידה
-#: ../src/roster_window.py:3047
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10854,59 +10863,59 @@ msgstr ""
 "יישלחו אליך ממנו."
 
 #. it's jid
-#: ../src/roster_window.py:3086
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "שינוי שם איש קשר"
 
-#: ../src/roster_window.py:3087
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "הזן שם כינוי חדש עבור איש קשר %s"
 
-#: ../src/roster_window.py:3094
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "שינוי שם קבוצה"
 
-#: ../src/roster_window.py:3095
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "הזן שם חדש עבור קבוצת %s"
 
-#: ../src/roster_window.py:3140
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "הסרת קבוצה"
 
-#: ../src/roster_window.py:3141
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "האם ברצונך להסיר את קבוצת %s מתוך הרשימה?"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "בנוסף הסר גם את כל אנשי הקשר אשר בקבוצה זו מתוך הרשימה"
 
-#: ../src/roster_window.py:3181
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "הקצאת מפתח OpenPGP"
 
 # BUG: the word OpenPGP should be written
 # להחלה
 # לאיש קשר זה
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "בחר מפתח ליישום עבור איש הקשר"
 
-#: ../src/roster_window.py:3637
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "איש קשר \"%s\" יוסר מתוך רשימתך"
 
-#: ../src/roster_window.py:3639
+#: ../src/roster_window.py:3637
 #, 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:3644
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10915,11 +10924,11 @@ msgstr ""
 "במצב לא מקוון באופן תמידי."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3650
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "האם ברצונך להמשיך?"
 
-#: ../src/roster_window.py:3654
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10928,16 +10937,16 @@ msgstr ""
 "יראה אותך במצב לא מקוון באופן תמידי."
 
 # לאחר כעבור
-#: ../src/roster_window.py:3657
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "ברצוני שאיש קשר זה יהיה מיודע באשר אל מצב החיבור שלי עובר הסרה"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3661
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "אנשי קשר יוסרו מן הרשימה שלך"
 
-#: ../src/roster_window.py:3666
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10946,12 +10955,12 @@ msgstr ""
 "בהסירך את אנשי קשר אלו:%s\n"
 "אתה גם תסיר הרשאה דבר אשר יביא לכך שהם תמיד יראו אותך במצב לא מקוון."
 
-#: ../src/roster_window.py:3724
+#: ../src/roster_window.py:3722
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "בחרת לשלוח מצב חיבור מותאם. האם אתה בטוח כי ברצונך להמשיך?"
 
-#: ../src/roster_window.py:3726
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10960,20 +10969,20 @@ msgstr ""
 "איש קשר זה יראה אותך באופן זמני במצב %(status)s, אך רק עד אשר תשנה את המצב "
 "שלך. אחרי כן הוא/היא יראו את מצב החיבור הגלובלי שלך."
 
-#: ../src/roster_window.py:3745
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "אין חשבון זמין"
 
 # לפני שתעמוד לרשותך האפשרות לשוחח
-#: ../src/roster_window.py:3746
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr "עליך ליצור חשבון טרם תהיה באפשרותך לשוחח עם אנשי קשר אחרים."
 
-#: ../src/roster_window.py:4458
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "אחסון אנשי־קשר-מוצמדים לא נתמך על ידי שרתך"
 
-#: ../src/roster_window.py:4460
+#: ../src/roster_window.py:4458
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -10981,12 +10990,12 @@ msgstr ""
 "שרתך לא תומך באחסון מידע אנשי־קשר-מוצמדים. לכן מידע זה לא יישמר בהתחברות "
 "הבאה."
 
-#: ../src/roster_window.py:4552
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "בחרת ליצור איש־קשר-מוצמד. האם אתה בטוח כי ברצונך להמשיך?"
 
-#: ../src/roster_window.py:4554
+#: ../src/roster_window.py:4552
 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 "
@@ -10996,28 +11005,28 @@ msgstr ""
 "כללי זו בשימוש כאשר אותה האישיות מחזיקה במספר חשבונות Jabber או חשבונות "
 "מוביל."
 
-#: ../src/roster_window.py:4675
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "כתובת URI של קובץ שגויה:"
 
-#: ../src/roster_window.py:4687
+#: ../src/roster_window.py:4685
 #, 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:4822
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "שלח את %s אל %s"
 
-#: ../src/roster_window.py:4833
+#: ../src/roster_window.py:4831
 #, python-format
 msgid "Make %s first contact"
 msgstr "הפוך את %s לאיש קשר ראשון"
 
-#: ../src/roster_window.py:4836
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "הפוך את %s וגם את %s לאנשי־קשר-מוצמדים"
@@ -11027,131 +11036,131 @@ msgstr "הפוך את %s וגם את %s לאנשי־קשר-מוצמדים"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5296 ../src/roster_window.py:5350
-#: ../src/roster_window.py:5359 ../src/statusicon.py:277
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
 #: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "באמצעות חשבון %s"
 
 #. add
-#: ../src/roster_window.py:5366
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "אל חשבון %s"
 
 #. disco
-#: ../src/roster_window.py:5371
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "באמצעות חשבון %s"
 
-#: ../src/roster_window.py:5410 ../src/statusicon.py:340
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_ניהול סימניות..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5430
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "של חשבון %s"
 
-#: ../src/roster_window.py:5471
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "עבור חשבון %s"
 
-#: ../src/roster_window.py:5531 ../src/roster_window.py:5639
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_שנה הודעת מצב"
 
-#: ../src/roster_window.py:5564
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "פרסם לחן"
 
-#: ../src/roster_window.py:5566
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "פרסם מיקום"
 
-#: ../src/roster_window.py:5569
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "הגדרת שירותים..."
 
 # restore
-#: ../src/roster_window.py:5717
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "ה_גדל את כולם"
 
-#: ../src/roster_window.py:5727 ../src/roster_window.py:5900
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "שלח הודעת _אשכול"
 
-#: ../src/roster_window.py:5735
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "אל כל המשתמשים"
 
-#: ../src/roster_window.py:5739
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "אל כל המשתמשים המקוונים"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5920
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_נהל אנשי קשר"
 
 #. Edit Groups
-#: ../src/roster_window.py:5929
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "ערוך _קבוצות"
 
 #. Send single message
-#: ../src/roster_window.py:5984
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "שלח הודעה בודדת"
 
 #. Execute Command
-#: ../src/roster_window.py:6031
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "הרצת פקודה..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:6041
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_נהל מוביל"
 
 #. Modify Transport
-#: ../src/roster_window.py:6050
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "ה_תאם מוביל"
 
 #. Rename
-#: ../src/roster_window.py:6060
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_שנה שם"
 
 # Restore שחזר
-#: ../src/roster_window.py:6120
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "ה_גדל"
 
-#: ../src/roster_window.py:6129
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "הת_חבר מחדש"
 
-#: ../src/roster_window.py:6136
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "הת_נתק"
 
 #. History manager
-#: ../src/roster_window.py:6230
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "מנהל היסטוריה"
 
-#: ../src/roster_window.py:6245
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "ה_צטרף אל שיחת קבוצה חדשה"
 
-#: ../src/roster_window.py:6473
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "שינוי הודעת מצב..."
 
diff --git a/po/hr.po b/po/hr.po
index e6ad7cb2d..eb48fb99e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,15 +6,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-10-31 20:49+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -25,306 +21,297 @@ msgstr ""
 "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"
 
-#: ../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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Osobni Događaji"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Novi Razgovor..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Grupni Razgovori..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Dodaj Kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Otkrivanje Usluga"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Izvrši Naredbu..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Izmjeni Račun"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Otvori Gmail Sandučić"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Osobni Događaji"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Novi Razgovor..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "_Izmjeni Račun"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Čarobnjak za Stvaranje Računa"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Povezivanje na poslužitelj</b>\n"
-"\n"
-"Molim pričekajte..."
+"Morate imati račun kako bi se mogli spojiti\n"
+"na Jabber mrežu."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Želim se _registrirati novi račun"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Molim odaberite jednu od opcija ispod:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Molim popunite podatke za vaš postojeći korisnički račun</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Molim odaberite poslužitelj</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Lozinka:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Dodaj ovaj certifikat na listu povjerljivih certifikata.\n"
-"SHA1 potpis certifikata:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Snimi lo_zinku"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_imna autentifikacija"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Spoji se kada pritisnem Završi"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Čarobnjak za Stvaranje Računa"
+msgid "Anon_ymous authentication"
+msgstr "Anon_imna autentifikacija"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Molim odaberite poslužitelj</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Poslužitelj:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Uredi..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Koristi vlastito ime poslužitelja/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "_Ime poslužitelja:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Snimi lo_zinku"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Postavi moj profil pri spajanju"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Napredno"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Morate imati račun kako bi se mogli spojiti\n"
-"na Jabber mrežu."
+"Dodaj ovaj certifikat na listu povjerljivih certifikata.\n"
+"SHA1 potpis certifikata:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Završi"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Ime poslužitelja:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Povezivanje na poslužitelj</b>\n"
+"\n"
+"Molim pričekajte..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Spoji se kada pritisnem Završi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Lozinka:"
+msgid "Set my profile when I connect"
+msgstr "Postavi moj profil pri spajanju"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Završi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Poslužitelj:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Ostalo</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ništa"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Korisnički Račun"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Osobne informacije</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Obriši"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Ure_di prema statusu"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Pre_imenuj"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Korisnički račun"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Omogući"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Korisnički Račun"
+msgid "Anonymous authentication"
+msgstr "Anonimna autentifikacija"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administratorski postupci"
+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 ""
+"Resurs se šalje Jabber poslužitelju kako bi se razlikovao isti JID kod 2 ili "
+"više klijenata spojena u isto vrijeme na isti server sa istim računom. "
+"Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
+"najvišim prioritetom dobivat će obavijesti o događajima"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonimna autentifikacija"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatsko ponovno spajanje kada je veza izgubljena"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Sinkroniziraj kontakte"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Pregled"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Kliknite da zatražite autorizaciju svih kontakata drugog računa"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Sp_oji se prilikom pokretanja Gajima"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "P_romijeni Lozinku"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Kliknite za promjenu lozinke korisničkog računa"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Označite ovo kako bi vas Gajim obavijestio prije slanja vaše lozinke preko "
-"nesigurne veze."
+msgid "Administration operations"
+msgstr "Administratorski postupci"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Odabir Datoteke za Slanje..."
+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 ""
+"Prioritet se u Jabberu koristi kako bi se odredilo tko dobiva događaje sa "
+"jabber poslužitelja kada su spojena 2 ili više klijenta koristeći isti "
+"račun; klijent sa najvišim prioritetom dobiva te događaje"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Odaberi _Ključ"
+msgid "A_djust to status"
+msgstr "Ure_di prema statusu"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Kliknite za promjenu lozinke korisničkog računa"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet će biti automatski promijenjen prema vašem statusu."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Kliknite da zatražite autorizaciju svih kontakata drugog računa"
+msgid "Priori_ty:"
+msgstr "Priori_tet:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Osobno potpisan certifikat"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Sp_oji se prilikom pokretanja Gajima"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Veza"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Ime:"
+msgid "Resour_ce:"
+msgstr "Resur_s:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Pregled"
 
 #: ../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 ""
-"Ako je označeno, Gajim će odašiljati još neke IP adrese osim vaše, kako bi "
-"prijenosi datoteka imali veću šansu uspjeha."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certifikat odbijen"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ako je označeno, Gajim će preuzeti lozinku od GPG agenta kao seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Osobno potpisan certifikat"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Korisnički račun"
 
 #: ../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 ""
-"Ako je označeno, Gajim će slati \"keep-alive\" pakete kako bi održao "
-"konekciju i spriječio prekid veze."
+msgid "C_onnect on Gajim startup"
+msgstr "Sp_oji se prilikom pokretanja Gajima"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -335,6 +322,18 @@ msgstr ""
 "koristeći ovaj račun"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatsko ponovno spajanje kada je veza izgubljena"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Spremaj _povijest razgovora za sve kontakte"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sink_roniziraj status računa sa globalnim statusom"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -343,175 +342,204 @@ msgstr ""
 "Ako je označeno, svaka promjena globalnog statusa (koji se mjenja padajućim "
 "izbornikom na dnu prozora kontaktne liste) promjenit će status i ovog računa"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ako je pretpostavljeni port koji se koristi za dolazne poruke neprikladan za "
-"vaše postavke, ovdje možete odabrati neki drugi.\n"
-"Mogli bi ste uzeti u obzir mogućnost izmjene postavki vatrozida."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Koristi proxy za prijenos datoteka"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Prezime:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ako je označeno, Gajim će odašiljati još neke IP adrese osim vaše, kako bi "
+"prijenosi datoteka imali veću šansu uspjeha."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Spoji račune"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Općenito"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Niti jedan ključ nije odabran"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_koristi HTTP__PROXY varijablu okruženja"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Osobne Informacije"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Uredi..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tet:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Upozori prije korištenja nesigurne veze"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritet se u Jabberu koristi kako bi se odredilo tko dobiva događaje sa "
-"jabber poslužitelja kada su spojena 2 ili više klijenta koristeći isti "
-"račun; klijent sa najvišim prioritetom dobiva te događaje"
+"Označite ovo kako bi vas Gajim obavijestio prije slanja vaše lozinke preko "
+"nesigurne veze."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritet će biti automatski promijenjen prema vašem statusu."
+msgid "Send _keep-alive packets"
+msgstr "Šalji _keep-alive pakete"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Pre_imenuj"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Ako je označeno, Gajim će slati \"keep-alive\" pakete kako bi održao "
+"konekciju i spriječio prekid veze."
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Resur_s:"
+msgid "Use cust_om hostname/port"
+msgstr "Koristi vlastit_o ime poslužitelja/port"
 
 #: ../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 ""
-"Resurs se šalje Jabber poslužitelju kako bi se razlikovao isti JID kod 2 ili "
-"više klijenata spojena u isto vrijeme na isti server sa istim računom. "
-"Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
-"najvišim prioritetom dobivat će obavijesti o događajima"
+msgid "_Hostname: "
+msgstr "_Ime poslužitelja:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Spremaj _povijest razgovora za sve kontakte"
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Ostalo</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Šalji _keep-alive pakete"
+msgid "Connection"
+msgstr "Veza"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sink_roniziraj status računa sa globalnim statusom"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Niti jedan ključ nije odabran"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinkroni_ziraj status računa sa globalnim statusom"
+msgid "Choose _Key..."
+msgstr "Odaberi _Ključ"
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Sinkroniziraj kontakte"
+msgid "Use G_PG Agent"
+msgstr "Koristi G_PG Agent"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Ako je označeno, Gajim će preuzeti lozinku od GPG agenta kao seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Koristi G_PG Agent"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Koristi vlastit_o ime poslužitelja/port"
+msgid "_Edit Personal Information..."
+msgstr "_Izmjeni Osobne Informacije..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Koristi vlas_titi port:"
+msgid "Information about you, as stored in the server"
+msgstr "Informacije o vama, kako stoji na poslužitelju"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Koristi proxy za prijenos datoteka"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Osobne informacije</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Osobne Informacije"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Izmjeni Osobne Informacije..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Sp_oji se prilikom pokretanja Gajima"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Omogući"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinkroni_ziraj status računa sa globalnim statusom"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Ime poslužitelja:"
+msgid "Use cust_om port:"
+msgstr "Koristi vlas_titi port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Uredi..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Ako je pretpostavljeni port koji se koristi za dolazne poruke neprikladan za "
+"vaše postavke, ovdje možete odabrati neki drugi.\n"
+"Mogli bi ste uzeti u obzir mogućnost izmjene postavki vatrozida."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Ime:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Prezime:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Upozori prije korištenja nesigurne veze"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_koristi HTTP__PROXY varijablu okruženja"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Spoji račune"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Račun:"
+msgid "Add New Contact"
+msgstr "Dodaj Novi Kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "D_ozvoli njemu/njoj da vidi moj status"
+msgid "A_ccount:"
+msgstr "_Račun:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Dodaj Novi Kontakt"
+msgid "_Protocol:"
+msgstr "_Protokol:"
 
-#: ../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 "Želio bih Vas dodati na moju listu kontakata."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ID Korisnika:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Nadimak:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupa:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "D_ozvoli njemu/njoj da vidi moj status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Pretplata"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -523,7 +551,11 @@ msgstr ""
 "protokola. Kliknite na gumb registracije za\n"
 "nastavak."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "Re_gistracija"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -531,594 +563,373 @@ msgstr ""
 "Morate biti spojeni na transport da bi ste mogli\n"
 "dodavati kontakte sa ovog protokola."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupa:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Nadimak:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "Re_gistracija"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Pretplata"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ID Korisnika:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Želio bih Vas dodati na moju listu kontakata."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Pojavila se greška:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Naredbe - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Izaberite naredbu za izvršiti:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Pričekajte dok se odvija primanje liste naredbi..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Naredbe - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Izaberite naredbu za izvršiti:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Provjeri još jednom"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Opis greške..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Pričekajte dok se odvija slanje naredbe..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Završi"
+msgid "Please wait..."
+msgstr "Molim pričekajte..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Pričekajte dok se odvija primanje liste naredbi..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Ovaj jabber entitet ne izlaže nikakve naredbe."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Pričekajte dok se odvija slanje naredbe..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Pojavila se greška:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Molim pričekajte..."
+msgid "Error description..."
+msgstr "Opis greške..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Ovaj jabber entitet ne izlaže nikakve naredbe."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Završi"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Napredni Uređivač Postavki"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NAPOMENA:</b> Trebali bi ste ponovno pokrenuti gajim da bi neke postavke "
 "postale aktivne"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Napredni Uređivač Postavki"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Vrati predefinirane boje"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Izbriši MOTD"
+msgid "Show _XML Console"
+msgstr "Prikaži _XML Konzolu"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Izmjeni Liste _Privatnosti..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Pošalji Poslužiteljsku Poruku..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Postavi MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Postavlja Poruku Dana (Message of the Day)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Prikaži _XML Konzolu"
+msgid "Set MOTD..."
+msgstr "Postavi MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Osvježi MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Osvježi MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Izbriši MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Pošalji Poslužiteljsku Poruku..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " otvaranje prozora/kartice sa tim kontaktom "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Akcije</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Uvjeti</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Zvuci</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Napredne Akcije"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Napredno Upravljanje Obavijestima"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Svi statusi"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Odsutan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Zauzet "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt Promjenio Status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt Odspojen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Nemam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Prijenosi Datoteka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Zahtjev Razmjene Datoteka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Razmjena Datoteka Zaustavljena"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Označavanje Poruke Grupnog Razgovora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Primljena Poruka Grupnog Razgovora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Imam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Nevidljiv"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Pokrenite naredbu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nedostupan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Jedan ili više posebnih statusa..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Spojen / Slobodan za Razgovor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Odsviraj zvuk"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nova Privatna Poruka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kada "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktivacija opcije upravitelja prozora za bljeskanje prozora razgovora u "
-"taskbaru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Onemogući automatsko otvaranje prozora razgovora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Onemogući postojeći iskočni prozor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-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
-#, 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 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"
-msgstr "_Obavijesti me sa iskočnim prozorom"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Otvori prozor za razgovor sa korisnikom"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "Prikaži događaj u _listi kontakata"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "i ja "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontakti"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "za"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupe"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "kada sam u"
+msgid "Deletes Message of the Day"
+msgstr "Briše Poruku Dana"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ništa"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Postavke"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Automatsko spajanje"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ništa"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Postavke"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Automatsko spajanje"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Unos:"
+msgid "New entry received"
+msgstr "Primljen novi unos"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Primili ste novi unos:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Ime članaka:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Unos:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Posljednja izmjena:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Primljen novi unos"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Primili ste novi unos:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Poruka:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Postavi Aktivnost"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Poruka:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Poruka:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Promijeni Password"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Ponovite unos za potvrdu:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Unesite novu lozinku:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Ponovite unos za potvrdu:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Upišite vašu novu statusnu poruku</b>"
+msgid "Save as Preset..."
+msgstr "Spremi kao Predefiniranu..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivnost:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivnost:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Predefinirane poruke:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Spremi kao Predefiniranu..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Upišite vašu novu statusnu poruku</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "_Grupni Razgovori"
+msgid "_Copy Link Location"
+msgstr "_Kopiraj Lokaciju Linka"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Dodaj na Listu..."
+msgid "_Open Link in Browser"
+msgstr "_Otvori Link u Pregledniku"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiraj JID/Email Adresu"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiraj Lokaciju Linka"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Otvori Sastavljanje Emaila"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otvori Link u Pregledniku"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Započni Razgovor"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "_Grupni Razgovori"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Dodaj na Listu..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prikaži popis emoticona (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaj kontakt na listu (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Pregledaj povijest razgovora (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Prikaži izbornik naprednih mogućnosti (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Pošalji poruku"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Pošalji"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Po_zovi"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozovi Prijatelje!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC poslužitelj"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Molim odaberite MUC poslužitelj."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1126,119 +937,136 @@ msgstr ""
 "Započeti će te MUC razgovor.\n"
 "Odaberite kontakte koje želite pozvati"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Traži njegov/njezin status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Molim odaberite MUC poslužitelj."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Dodaj Posebnu _Obavijest..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC poslužitelj"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Pridruži Open_PGP Ključ..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Po_zovi"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "I_zvrši Naredbu..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Započni _Razgovor"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Uredi _Grupe..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Pošalji Jednu _Poruku..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Pošalji _Datoteku..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Uklo_ni"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Uključi/Isključi Open_PGP Enkripciju"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Uključi/Isključi End to End Enkripciju"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Postavi Prila_gođeni Status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "I_zvrši Naredbu..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Pošalji Jednu _Poruku..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Uredi Kontakt"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Pošalji _Datoteku..."
+msgid "_Rename..."
+msgstr "_Preimenuj..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Postavi Prilagođeni _Avatar..."
+msgid "Edit _Groups..."
+msgstr "Uredi _Grupe..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Započni _Razgovor"
+msgid "Assign Open_PGP Key..."
+msgstr "Pridruži Open_PGP Ključ..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Uključi/Isključi End to End Enkripciju"
+msgid "Set Custom _Avatar..."
+msgstr "Postavi Prilagođeni _Avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Uključi/Isključi Open_PGP Enkripciju"
+msgid "Add Special _Notification..."
+msgstr "Dodaj Posebnu _Obavijest..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Pretplata"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Dozvoli njemu/njoj da vidi moj status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "D_ozvoli 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr "_Blokiraj"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Traži njegov/njezin status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Povijest razgovora"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignoriraj"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blokiraj"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Uredi Kontakt"
+msgid "_Unignore"
+msgstr "_Prestani Ignorirati"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Preimenuj..."
+msgid "_Ignore"
+msgstr "_Ignoriraj"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Pretplata"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Uklo_ni"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Prestani Ignorirati"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Povijest razgovora"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Ispunite formular."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracija Sobe"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Ispunite formular."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Izmjeni Grupe"
@@ -1251,56 +1079,48 @@ msgstr "(<b>ESession</b> informacije)"
 msgid "_Verify"
 msgstr "_Provjeri"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Mogućnosti"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Popis eventualnih Gajim mogućnosti:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Mogućnosti"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
+msgid "File Transfers"
+msgstr "Prijenosi Datoteka"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Prekini transfer datoteke"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Prikazuje listu prijenosa datoteka između vas i ostalih"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Prekini transfer odabrane datoteke"
+msgid "file transfers list"
+msgstr "lista prijenosa datoteka"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Prekini transfer odabrane datoteke i izbriši nekompletnu datoteku"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Počist_i"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Obavijesti me kada se završi prijenos datoteka"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Prijenosi Datoteka"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Prikaži obavijest kada završi prijenos datoteka"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Skriva prozor"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr ""
+"Ukloni završene, zaustavljene ili neuspjele prijenose datoteka sa liste"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Ukloni prijenos datoteka sa liste"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr ""
-"Ukloni završene, zaustavljene ili neuspjele prijenose datoteka sa liste"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Prikazuje listu prijenosa datoteka između vas i ostalih"
-
-#: ../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"
@@ -1308,82 +1128,108 @@ msgstr ""
 "Ova akcija uklanja prijenos datoteke sa liste. Ako je prijenos aktivan, prvo "
 "se zaustavlja i onda uklanja"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Počist_i"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Stanka"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Prikaži obavijest kada završi prijenos datoteka"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Prekini transfer odabrane datoteke i izbriši nekompletnu datoteku"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Nastaviti"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Prekini transfer datoteke"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Obavijesti me kada se završi prijenos datoteka"
+msgid "Cancels the selected file transfer"
+msgstr "Prekini transfer odabrane datoteke"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Otvaranje Mape Sadržaja"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Skriva prozor"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Stanka"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Nastaviti"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista prijenosa datoteka"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Otvaranje Mape Sadržaja"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Boje Statusa (kartice)</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Korisnički račun"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Podebljano"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Pisanje"
+msgid "Gajim Themes Customization"
+msgstr "Personalizacija Gajim Tema"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "Boj_a teksta:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Stil fonta:"
+msgid "_Background:"
+msgstr "_Pozadina:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalizacija Gajim Tema"
+msgid "Text _font:"
+msgstr "_Font Teksta:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Otišao"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupa"
+msgid "Font style:"
+msgstr "Stil fonta:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktivno"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Podebljano"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Ukošeno"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pauza"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Pisanje"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Neaktivno"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Boje Statusa (kartice)</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Otišao"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1391,7 +1237,7 @@ msgstr ""
 "MUC\n"
 "Poruke"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1399,105 +1245,98 @@ msgstr ""
 "MUC Usmjerene\n"
 "Poruke"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pauza"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Boj_a teksta:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Font Teksta:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Pozadina:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Promijeni _Nadimak..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Upravljanje sobom"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Promijeni _Temu..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Podešavanje _Sobe..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Postavi Oznaku"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Uništi Sobu"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Upravljanje sobom"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimiziraj kod izlaza"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Glas"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Postavi Oznaku"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "_Send Private Message"
+msgstr "_Pošalji Privatnu Poruku"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Akcije Prisutnih"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Pošalji _Datoteku"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Akcije Prisutnih"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Dodaj na Listu"
+msgid "_Voice"
+msgstr "_Glas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Član"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Zabrani"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Vlasnik"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Izbaci"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Član"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Vlasnik"
+msgid "_Ban"
+msgstr "_Zabrani"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Pošalji Privatnu Poruku"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Glas"
+msgid "_Add to Roster"
+msgstr "_Dodaj na Listu"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Prikaži popis formata"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Promijeni nadimak (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1509,40 +1348,19 @@ msgid "From:"
 msgstr "Od:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../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."
-msgstr ""
-"<b>UPOZORENJE:</b>\n"
-"Ako planirate raditi veća uklanjanja, osigurajte da Gajim nije pokrenut. "
-"Općenito izbjegavajte uklanjanja vezana uz kontakte sa kojima trenutno "
-"razgovarate."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim Upravitelj Zapisima"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Obriši"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Izvoz"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim Upravitelj Zapisima"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1557,173 +1375,200 @@ msgstr ""
 "Koristite ovaj program za brisanje ili izvoz zapisa. Zapise izaberite u "
 "lijevom stupcu a bazu možete pretraživati u formi ispod."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>UPOZORENJE:</b>\n"
+"Ako planirate raditi veća uklanjanja, osigurajte da Gajim nije pokrenut. "
+"Općenito izbjegavajte uklanjanja vezana uz kontakte sa kojima trenutno "
+"razgovarate."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Pretraži Bazu Podataka"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Svi statusi"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Povijest razgovora"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Izvoz"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Ime kontakta"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Grupni Razgovori"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Svi statusi"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Povijest razgovora"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Pretraga:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Pamti promjene statusa kontakata"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Vruć"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Vruć"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Pridruži se ovoj sobi automatski kada se povežem"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Soba:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Nedavno:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Nedavno:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Pridruži se ovoj sobi automatski kada se povežem"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Soba:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Postavi knjižnu oznaku za sobu"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Poslužitelj:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Postavi knjižnu oznaku za sobu"
+msgid "Bro_wse Rooms"
+msgstr "_Pregled"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Pridruživanje"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automatsko spajanje"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Podešavanje Knjižnih Oznaka"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimiziraj kod Automatskog Ulaska"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Naslov:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Ispis statusa:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatsko spajanje"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Naslov:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimiziraj kod Automatskog Ulaska"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1734,100 +1579,103 @@ msgid "_Configure"
 msgstr "_Postavi"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Karakteristike</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Spoj\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Postavke</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Spoj\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Podešavanje Proxy Profila"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Vrsta:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Lo_zinka:"
+msgid "_Name:"
+msgstr "_Ime:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxy _Računalo:"
+msgid "<b>Properties</b>"
+msgstr "<b>Karakteristike</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgid "Use HTTP prox_y"
+msgstr "Koristi HTTP prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Koristi HTTP prox_y"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Koristi proxy aut_entifikaciju"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Korisničko ime:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "Lo_zinka:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Ime:"
+msgid "Proxy _Host:"
+msgstr "Proxy _Računalo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Vrsta:"
+msgid "Proxy _Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Korisničko ime:"
+msgid "<b>Settings</b>"
+msgstr "<b>Postavke</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Podešavanje Računa"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Lozinka"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Odobri"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Dostupan"
+msgid "Version:"
+msgstr "GTK+ Verzija:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Postavi"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Opis: "
+msgid "Authors:"
+msgstr "_Odobri"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1835,39 +1683,32 @@ msgid "Homepage:"
 msgstr "<b>Osobna Stranica:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Zaustavljeno"
+msgid "Description:"
+msgstr "Opis: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Postavi"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Zaustavljeno"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1881,218 +1722,288 @@ msgid "Event desc"
 msgstr "Događaji"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Napredni Uređivač Postavki</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Uvijek koristi OS/X predefinirane aplikacije"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikacije</b>"
+msgid "Custom"
+msgstr "Osobni"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Akcije</b>"
+msgid "All chat states"
+msgstr "Svi statusi"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatski Status</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Pisanje"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Izgled Razgovora</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Onemogućeno"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Boja Razlomaka Razgovora</b>"
+#, fuzzy
+msgid "Never"
+msgstr "_Nikada"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Vizualne Obavijesti o Statusu</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikad\n"
+"Samo kod događaja na čekanju\n"
+"Uvijek"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Uvjeti</b>"
+msgid "Always"
+msgstr "Odsutan"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Iskoči ga"
 
-#. 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>Osobne</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Obavijesti me o tome"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Prikaži samo u _listi kontakata"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Mogućnosti</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Predefinirane Statusne Poruke</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<i>Privatnost</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Izgled Liste Kontakata</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Zadnji status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Statusne Poruke</b>"
+msgid "Preferences"
+msgstr "Postavke"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Teme</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Prikaži a_vatare kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Srednje:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Vizualne Obavijesti</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Prikaži statusne _poruke kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Napredno"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Prikaži _raspoloženje kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Napredno..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Svi statusi"
+msgid "Sort contacts by status"
+msgstr "Sortiranje kontakata po statusu"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Dozvoli slanje podataka o _OS-u"
+msgid "in _roster"
+msgstr "na _listi"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Dozvoli slanje podataka o _OS-u"
+msgid "in _group chats"
+msgstr "u _grupnim razgovorima"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Dozvoli obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Izgled Liste Kontakata</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Dozvoli zvuk kada sam _zauzet"
+msgid "_Window behavior:"
+msgstr "_Ponašanje Prozora"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Odsutan"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Zatraži statusnu poruku kada se:"
+msgid "_Emoticons:"
+msgstr "_Emotikoni:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Na_pravi prozore sa razgovorom kompaktnim"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Sakrij dugmad u prozoru razgovora."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignoriraj bogati sadržaj u dolaznim porukama"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Poruka:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Pri pokretanju provjeri ako je Gajim _zadani Jabber klijent"
+msgid "_Highlight misspelled words"
+msgstr "_Istakni pogrešno napisane riječi"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Pisanje"
+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 ""
+"Ako je označeno, Gajim će označavati pravopisne pogreške u poljima za unos "
+"teksta prozora za razgovor. Ako niti jedan jezik nije izričito naveden "
+"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:38
-msgid "Configure color and font of the interface"
-msgstr "Postavi boje i font sučelja"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Prikaži _listu kontakata"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Poruka:"
+msgid "Show icon when your messages are received"
+msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Ime kontakta"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Osobni"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Izgled Razgovora</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Kod novih događaja:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Obavijesti me o kontaktima koji se _prijave"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Obavijesti me o kontaktima koji se _odjave"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Onemogućeno"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Dozvoli obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Prikaži _aktivnost kontakata na listi"
+msgid "Notify on new _GMail email"
+msgstr "Obavijesti o novoj _Gmail e-pošti"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Prikaži dodatne email _detalje"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Ako je označeno, Gajim će obavještavati o novim e-mail porukama primljenim "
+"preko GMail"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Prikaži _raspoloženje kontakata na listi"
+msgid "Display _extra email details"
+msgstr "Prikaži dodatne email _detalje"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Prikaži _glazbu kontakata na listi"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Prikaži a_vatare kontakata na listi"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Mogućnosti</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Prikaži _raspoloženje kontakata na listi"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Koristi t_ray ikonu"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Prikaži statusne _poruke kontakata na listi"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizualne Obavijesti</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Dozvoli _zvukove"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Izmje_ni..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Dozvoli zvuk kada sam _zauzet"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Zvuci</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Obavijesti"
+
+#: ../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 "
@@ -2102,7 +2013,11 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u "
 "prozorima razgovora."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Prikaži obavijesti o statusu razgovora:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2112,801 +2027,742 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
 "drugoj osobi."
 
-#: ../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 će vas obavijestiti o kontaktima koji su se upravo odjavili sa malim "
-"prozorom u donjem desnom kutu ekrana"
-
-#: ../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:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
-"koristite"
-
-#: ../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: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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Ako je označeno, Gajim će promjeniti status u Nedostupan kad se računalo ne "
-"koristi još duže."
+msgid "_Send chat state notifications:"
+msgstr "_Šalji obavijesti o statusu razgovora"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
-"u grupnim razgovorima"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Vizualne Obavijesti o Statusu</b>"
 
 #: ../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 ""
-"Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
-"kontakta u listi kontakata i u grupnim razgovorima"
+msgid "Personal Events"
+msgstr "Osobni Događaji"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Odsutan automatski nakon:"
 
 #: ../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"
+"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: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"
+msgid "_Not available after:"
+msgstr "_Nedostupan automatski nakon:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Ako je označeno, Gajim će prikazivati glazbu koju slušaju kontakti na listi"
+"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: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 ""
-"Ako je označeno, Gajim će označavati pravopisne pogreške u poljima za unos "
-"teksta prozora za razgovor. Ako niti jedan jezik nije izričito naveden "
-"desnim klikom miša na polje za unos teksta, zadani jezik će se koristiti za "
-"dani kontakt ili grupni razgovor."
+msgid "minutes"
+msgstr "minuta"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Ako je označeno, Gajim će ignorirati sve poruke koje vam šalje netko van "
-"vaše liste. Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi "
-"van vaše liste kontakata"
-
-#: ../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 ""
-"Ako je označeno, Gajim će spremati zapise kriptiranih poruka. Imajte na umu "
-"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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Ako je označeno, Gajim će obavještavati o novim e-mail porukama primljenim "
-"preko GMail"
+"Statusna poruka kod automatske odsutnosti. Ukoliko je prazno Gajim neće "
+"promjeniti trenutnu statusnu poruku\n"
+"$S će biti zamjenjen sa prijašnjom porukom$T će biti zamjenjen sa auto-away "
+"vremenskim ograničenjem"
 
 #: ../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, "
-"etc...)"
-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:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
-"odabrana predefinirana poruka."
-
-#: ../data/gui/preferences_window.ui.h:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
-"ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
+"Statusna poruka kod automatske nedostupnosti. Ukoliko je prazno Gajim neće "
+"promjeniti trenutnu statusnu poruku\n"
+"$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:76
-msgid "Log _encrypted chat session"
-msgstr "Spremaj _kriptirane razgovore"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatski Status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Na_pravi prozore sa razgovorom kompaktnim"
+msgid "Ask status message when I:"
+msgstr "Zatraži statusnu poruku kada se:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Izmje_ni..."
+msgid "Sign _in"
+msgstr "_Prijavim"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Nikada"
+msgid "Sign _out"
+msgstr "_Odjavim"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Obavijesti"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
+"odabrana predefinirana poruka."
 
 #: ../data/gui/preferences_window.ui.h:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Obavijesti me o kontaktima koji se _prijave"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Statusne Poruke</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Obavijesti me o kontaktima koji se _odjave"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Predefinirane Statusne Poruke</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Obavijesti me o tome"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Obavijesti o novoj _Gmail e-pošti"
+msgid "Use system _default"
+msgstr "Definirano _sustavom"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Nikad\n"
-"Samo kod događaja na čekanju\n"
-"Uvijek"
+msgid "Chat message:"
+msgstr "Poruka:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Osobni Događaji"
+msgid "<b>Font</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Dozvoli _zvukove"
+msgid "Use _transports icons"
+msgstr "Različite _ikone za prijenose"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Iskoči ga"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+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:89
-msgid "Preferences"
-msgstr "Postavke"
+msgid "Status _iconset:"
+msgstr "Statusne _ikone:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Postavi boje i font sučelja"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Tema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Poslužitelj:"
+msgid "<b>Themes</b>"
+msgstr "<b>Teme</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Koristi t_ray ikonu"
+msgid "Contact's nickname:"
+msgstr "Ime kontakta"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Prikaži samo u _listi kontakata"
+msgid "Your nickname:"
+msgstr "Nadimak:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Prijavim"
+msgid "_Status message:"
+msgstr "_Statusna poruka:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Odjavim"
+msgid "_URL highlight:"
+msgstr "_URL isticanje:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Vrati predefinirane boje"
 
 #: ../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 ""
-"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je "
-"označeno, Gajim će prikazati samo čisti tekst poruke."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Poruka:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sortiranje kontakata po statusu"
+#, fuzzy
+msgid "Your message:"
+msgstr "Poruka Greške: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Označavanje Poruke Grupnog Razgovora"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Statusne _ikone:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Boja Razlomaka Razgovora</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Izgled"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Tema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akcije</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"Statusna poruka kod automatske odsutnosti. Ukoliko je prazno Gajim neće "
-"promjeniti trenutnu statusnu poruku\n"
-"$S će biti zamjenjen sa prijašnjom porukom$T će biti zamjenjen sa auto-away "
-"vremenskim ograničenjem"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"Statusna poruka kod automatske nedostupnosti. Ukoliko je prazno Gajim neće "
-"promjeniti trenutnu statusnu poruku\n"
-"$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:110
-msgid "Use _transports icons"
-msgstr "Različite _ikone za prijenose"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+msgid "<b>Video</b>"
+msgstr "<b>Srednje:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Definirano _sustavom"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Poslužitelj:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Uvjeti</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "Kod novih događaja:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Poruka Greške: %s"
+msgid "_File manager:"
+msgstr "_Upravitelj datotekama:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Nadimak:"
+msgid "_Mail client:"
+msgstr "_Mail klijent:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Odsutan automatski nakon:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Preglednik:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Prikaži obavijesti o statusu razgovora:"
+msgid "<b>Custom</b>"
+msgstr "<b>Osobne</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emotikoni:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikacije</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Upravitelj datotekama:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Istakni pogrešno napisane riječi"
+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 ""
+"Ako je označeno, Gajim će ignorirati sve poruke koje vam šalje netko van "
+"vaše liste. Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi "
+"van vaše liste kontakata"
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Dozvoli slanje podataka o _OS-u"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignoriraj bogati sadržaj u dolaznim porukama"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
+"koristite"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Pamti promjene statusa kontakata"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Dozvoli slanje podataka o _OS-u"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Mail klijent:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
+"koristite"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Nedostupan automatski nakon:"
+msgid "Log _encrypted chat session"
+msgstr "Spremaj _kriptirane razgovore"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Otvori..."
+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 ""
+"Ako je označeno, Gajim će spremati zapise kriptiranih poruka. Imajte na umu "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "_Vrati predefinirane boje"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Dozvoli slanje podataka o _OS-u"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "_Šalji obavijesti o statusu razgovora"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Statusna poruka:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "_URL isticanje:"
+msgid "<b>Privacy</b>"
+msgstr "<i>Privatnost</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Ponašanje Prozora"
+msgid "_Log status changes of contacts"
+msgstr "_Pamti promjene statusa kontakata"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "u _grupnim razgovorima"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "na _listi"
+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:139
-msgid "minutes"
-msgstr "minuta"
+msgid "_Open..."
+msgstr "_Otvori..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Napredni Uređivač Postavki</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste Privatnosti:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Dodaj / Izmjeni pravilo</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Lista Privatnosti"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista pravila</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista Privatnosti</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktivno za ovu sesiju"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktivno pri svakom pokretanju"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista pravila</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Svi"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Dodaj / Izmjeni pravilo</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Sve (uključujući pretplatu)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Odbij"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "sve u grupi"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Poredak:"
+msgid "all by subscription"
+msgstr "sve prema pretplati"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Lista Privatnosti"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Svi"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "sve prema pretplati"
+msgid "to send me messages"
+msgstr "da mi šalje poruke"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "sve u grupi"
+msgid "to send me queries"
+msgstr "da mi šalje upite"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Oboje"
+msgid "to view my status"
+msgstr "da vidi moj status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Od"
+msgid "to send me status"
+msgstr "da mi prikaže status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "jedan"
+msgid "All (including subscription)"
+msgstr "Sve (uključujući pretplatu)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dva"
+msgid "Order:"
+msgstr "Poredak:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "da mi šalje poruke"
+#, fuzzy
+msgid "none"
+msgstr "jedan"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "da mi šalje upite"
+#, fuzzy
+msgid "both"
+msgstr "Oboje"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "da mi prikaže status"
+#, fuzzy
+msgid "from"
+msgstr "Od"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "da vidi moj status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresa</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "dva"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Rođendan:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Grad:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Prezime:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Tvrtka:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Zemlja:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Srednje:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Odjel:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefiks:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Dodatna Adresa:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Djevojačko:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Prezime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Dodatak:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Puno Ime</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Ulica:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Djevojačko:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Grad:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Osobna Stranica:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Država:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Dodatna Adresa:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Srednje:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Poštanski broj:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Ime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Zemlja:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Nadimak:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresa</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Broj Telefona:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Osobna Stranica:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Pozicija:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Ime:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Poštanski broj:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Nadimak:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Broj Telefona:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: GGGG-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Uloga:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Rođendan:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Država:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Ulica:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Kliknite za postavljanje avatara"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Dodatak:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Osobne Informacije"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Tvrtka:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "O meni"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Pozicija:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Kliknite za postavljanje avatara"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Odjel:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: GGGG-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Uloga:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Osobne Informacije"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Posao"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Što želite učiniti?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "O meni"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Ukloni račun sam_o iz Gajima"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Ukloni račun iz Gajima i sa po_služitelja"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Što želite učiniti?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Ukloni"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Razmjena Artikla Sa Liste Kontakata"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 msgstr ""
 "<b>netko@negdje.com</b> želi da <b>dodate</b> neke kontakte na vašu listu."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Tijelo Poruke <trenutno neiskorišteno, pa je skriveno>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Razmjena Artikla Sa Liste Kontakata"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Uredu"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Dodaj _Kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Tijelo Poruke <trenutno neiskorišteno, pa je skriveno>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "Mogućnos_ti Poslužitelja"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Akcije"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Prijenosi _Datoteka"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Dodaj _Kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Često Postavljana Pitanja (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Online Pomoć"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Korisnički Računi"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Prikaz"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Prikaži _Odspojene Kontakte"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Prikaži _Prijenose"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Prikaži _Odspojene Kontakte"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Prikaži _Listu Kontakata"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Korisnički Računi"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Prijenosi _Datoteka"
 
-#. 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 "_Akcije"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Pomoć"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Uredi"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Online Pomoć"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_Česta pitanja"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "_Slanje Jedne Poruke..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Često Postavljana Pitanja (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Prikaz"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Pričekajte dok se odvija primanje forme za pretragu..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Mogućnos_ti Poslužitelja"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Pretraga"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Pričekajte dok se odvija primanje forme za pretragu..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Dodaj kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informacije"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2926,41 +2782,37 @@ msgstr "Registriraj na"
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Odgovori na ovu poruku"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Za:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "P_ošalji"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Pošalji poruku"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Pošalji poruku i zatvori prozor"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Odgovor"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Za:"
+msgid "Reply to this message"
+msgstr "Odgovori na ovu poruku"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Odgovor"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Pošalji i Zatvori"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Pošalji poruku i zatvori prozor"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Odobri"
+msgid "Subscription Request"
+msgstr "Zahtjev za Pretplatom"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Dozvoli kontaktu da može vidjeti kada sam spojen"
+msgid "_Deny"
+msgstr "_Odbij"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2968,262 +2820,274 @@ msgid ""
 "connected"
 msgstr "Odbija autorizaciju kontaktu kako nebi mogao vidjeti kada ste spojeni"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Zahtjev za Pretplatom"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Odobri"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Odbij"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Dozvoli kontaktu da može vidjeti kada sam spojen"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Sinkroniziraj kontakte"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Označite račun sa kojim želite sinkronizirati"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Označite kontakte sa kojima želite sinkronizirati"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sinkroniziraj : označi kontakte"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Onemogući Zvukove"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Pošalji Jednu _Poruku"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Prikaži Sve _Događaje na Čekanju"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Označite kontakte sa kojima želite sinkronizirati"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Grupni Razgovor"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Pitaj:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Pošalji Jednu _Poruku"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klijent:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Vrijeme kontakta:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Onemogući Zvukove"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informacije Kontakta"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Pretplata:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klijent:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Sustav:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentar"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Vrijeme kontakta:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Podešeni avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Pretplata:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informacije Kontakta"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Pitaj:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Više"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Korisnički Avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Font</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentar"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Promet</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Unos</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Upit"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IU"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Upit"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Prisutnost"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Prisutnost"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Unos</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Izmjeni Račun..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokalni jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Osobno"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Resurs"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klijent"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Osobno"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klijent"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klijent"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Otkaži potvrdu"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neispravna soba"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Servis je poslao neispravne podatke"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Servis je promjenio identifikator sesije."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Naredbe - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Servis je odgovorio sa greškom."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktivno"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Neaktivno"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Cijeli broj"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Ime Postavke"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Vrijednost"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Vrsta"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Nema)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Skrivena"
 
@@ -3235,240 +3099,183 @@ msgstr[0] "Primili ste nove unose (i %(count)d nije prikazano):"
 msgstr[1] "Primili ste nove unose (i %(count)d nije prikazano):"
 msgstr[2] "Primili ste nove unose (i %(count)d nije prikazano):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Engleski"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Bjeloruski"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bugarski"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretonski"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Češki"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Njemački"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Grčki"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Britanski"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Španjolski"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Baskijski"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francuski"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Hrvatski"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Talijanski"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norveški (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Nizozemski"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norveški"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Poljski"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugalski"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazilski Portugalski"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruski"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Srpski"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovački"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Švedski"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Kineski (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Jezik pravopisa"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Greška."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Podcrtaj"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Precrtaj"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Očisti oblikovanje"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Zaista pošalji datoteku?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Mogućnost nije dostupna za Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Pošalji _Datoteku"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "GPG ključ nije dodjeljen"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Niti jedan GPG ključ nije dodjeljen ovom kontaktu. Nije moguće kriptirati "
 "poruke sa GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti sačuvana"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti sačuvana"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "i autentičan"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3477,57 +3284,57 @@ msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Pregovaranje o sesiji neuspješno"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesija NEĆE biti sačuvana"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Ova razgovor je kriptiran"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "i biti ĆE sačuvana"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti sačuvana"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 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:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Ova poruka NIJE kriptirana"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Ova poruka je kriptirana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3535,13 +3342,14 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3550,171 +3358,476 @@ 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Nemoguće dekriptirati poruke od %s\n"
+"Možda ih je netko izmjenio."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Prijenosi Datoteka"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "veličina: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Prihvati"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Prijenos datoteka završen"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Poziv na Grupni Razgovor"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Druga strana je prekinula prijenos"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Greška pri čitanju datoteke"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Razmjena datoteka zaustavljena"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Prijenos datoteka otkazan"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Vezu nije moguće ostvariti."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uporaba: /%s, sakriva dugmadi."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uporaba: /%s, šalje poruku kontaktu"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nije pronađen"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Odsutan"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Dostupan"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uporaba: /%s, prazni tekstualni prozor"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Uključi/Isključi Open_PGP Enkripciju"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Uporaba: /%s, šalje ping kontaktu"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Naredba nije podržana za zeroconf račun."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Pritisnite za pregled prošlih razgovora sa ovim kontaktom"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s nije ispravna razina zapisnika (loglevel)"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Promijeni nadimak (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Neispravan nadimak"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Nadimak nije pronađen: %s "
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Pitaj prije zatvaranja kartice/prozora razgovora grupe."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Poslati %s prema %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Pozvani ste na grupni razgovor"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Neispravan poslužitelj"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "pripadnost promjenjena"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uporaba: /%s , prikazuje imena učesnika u grupnom razgovoru."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Nedostaje argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram %s direktorij"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Izmjeni informacije o statusu"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Promjeni status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Postavi tip i opis prisustva"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Spojen"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Produženo odsustvo"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Ne uznemiravaj"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Neumreženo - prekid veze"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Opis prisustva:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Status je promjenjen."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s u %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Niste se  pridružili grupnom razgovoru"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Izaberite grupne razgovore koje želite napustiti"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Grupni Razgovori"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sljedeći grupni razgovor:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Proslijedi nepročitane poruke"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su proslijeđene."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Proslijedi nepročitane poruke"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Odsviraj zvuk kad je korisnik zauzet"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i Notification-Daemon za prikazivanje obavijesti"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Prikaži samo dostupne i slobodne kontakte na listi."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Odsutan kao rezultat mirovanja dužeg od $T min)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "odsutnosti."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posljedica mirovanja dužeg od $T min)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "produžene nedostupnosti."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
@@ -3722,63 +3835,119 @@ msgstr ""
 "Kada prikazati ikonu u traci radne površine. Može biti 'never', 'on_event', "
 "'always'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Boja dolaznog nadimka."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Boja odlaznog nadimka."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Boja dolaznog teksta."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Boja odlaznog teksta."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Boja teksta statusne poruke."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Prikaži događaj u _listi kontakata"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Prikaži događaj u _listi kontakata"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Zahtjev Razmjene Datoteka"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Prijenos datoteka otkazan"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Prikaži obavijest kada završi prijenos datoteka"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Poziv na Grupni Razgovor"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Font dolaznog nadimka."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Boja odlaznog nadimka."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Font dolaznog teksta."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Font odlaznog teksta."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Font teksta statusne poruke."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "predefinirano"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3788,7 +3957,7 @@ msgstr ""
 "'sometimes' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n"
 "'never' - nikada ne ispisuj vrijeme."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3799,18 +3968,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje _vremena na "
 "'ponekad'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Koristi * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je Aktivno, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
 "omeđeno sa * *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3820,7 +3989,7 @@ msgstr ""
 "odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html (Ako ovo želite koristiti, instalirajte docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3828,7 +3997,7 @@ msgstr ""
 "Znak za dodavanje nakon nadimka pri korištenju dopune nadimka (tipka tab) u "
 "grupnom razgovoru"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3836,7 +4005,13 @@ msgstr ""
 "Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
 "razgovoru već koristi željeni nadimak"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3847,48 +4022,55 @@ msgstr ""
 "Pogledati python dokumentaciju za strftime za kompletan opis: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/kartica "
 "razgovora ponovno otvori."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta trebaju trajati linije iz prošlog razgovora."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
 "razgovoru."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
 "razgovoru."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3896,7 +4078,12 @@ msgstr ""
 "Koliko sekundi čekati za ponovni pokušaj pridruživanja konferenciji sa koje "
 "ste isključeni. Postavite na 0 da bi onemogućili automatsko pridruživanje."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3904,11 +4091,11 @@ msgstr ""
 "Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. "
 "(Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija se sprema za Ctrl+TipkaGORE"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3917,11 +4104,11 @@ msgstr ""
 "Ili je osobni url koji sadrži %s, gdje je %s riječ ili fraza ili "
 "'WIKTIONARY' - što znači da koristi wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolirati preko gajim-remote-a."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3932,14 +4119,14 @@ msgstr ""
 "računa (ako nemaju listen_to_network_manager postavljen na Neaktivno i "
 "sinkroniziraju se sa globalnim statusom) ovisno o statusu mrežnog spoja."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3947,7 +4134,7 @@ msgstr ""
 "Prikazane obavijesti o statusu u prozoru razgovora. Može biti jedno od svi, "
 "samo_sastavljanje, onemogućeno."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3955,36 +4142,39 @@ msgstr ""
 "Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
 "ga svakih x minuta"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj prije zatvaranja kartice/prozora razgovora grupe."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Uvijek pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmakom odjeljenoj listi jid-ova grupnog razgovora."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nikad ne pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmacima podjeljenoj listi jid-ova grupnog razgovora."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Pitaj prije zatvaranja prozora za razgovor koji ima kartice, ako postoje "
 "neki koji mogu izgubiti podatke (razgovor, privatni razgovor, grupni "
 "razgovor koji neće biti minimizirani)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3992,28 +4182,34 @@ msgstr ""
 "Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim "
 "sučeljima, za prijenos datoteka u slučaju prosljeđivanja."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, 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
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži karticu ako je otvoren samo jedan razgovor?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaži granicu notesa sa karticama u prozorima razgovora?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Prikaži gumb za zatvaranje u kartici?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4025,18 +4221,18 @@ msgstr ""
 "Veći brojevi su sigurniji, ali im treba duže vremena za izračunavanje kod "
 "pokretanja sesije."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
 "razgovorima."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4045,14 +4241,14 @@ msgstr ""
 "Ako je Aktivno, Gajim se završava kad je pritisnut X gumb. Ova postavka je "
 "upotrebljena samo ako je \"trayicon\" u upotrebi."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ako je Aktivno, Gajim će provjeriti da li je zadani jabber klijent pri "
 "svakom pokretanju."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4060,7 +4256,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazvati ikonu na svakoj kartici koja sadrži "
 "nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4068,11 +4264,11 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
 "svaki kontakt pod imenom kontakta na listi."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Definiraj poziciju avatara na listi. Mogu biti lijevo ili desno"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4080,7 +4276,7 @@ msgstr ""
 "Ako je Aktivno, će Gajim poslati upit za avatar svaki kontakt, koji nije "
 "imao avatar ili je onaj u memoriji prestar"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4088,9 +4284,10 @@ msgstr ""
 "Ako je Neaktivno, više nećete vidjeti statusnu poruku u razgovorima, kada "
 "kontakt promjeni svoj status i/ili statusnu poruku."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4102,29 +4299,33 @@ msgstr ""
 "prikazivati sve statusne poruke. Ako je \"in_and_out\" Gajim će prikazivati "
 "samo poruke tipa FOO je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakata u trenu prijave."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakata u trenu odjave."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ako je Aktivno, vraćene poruke će koristiti manji font od predefiniranog."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u programskoj traci."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4134,7 +4335,7 @@ msgstr ""
 "će bljeskati (pretpostavljeno ponašanje u većini Window Manager-a) kod novih "
 "događaja."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4145,7 +4346,8 @@ msgstr ""
 "u grupnim razgovorima."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4153,7 +4355,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Upravlja prozorom u koji se smještaju nove poruke.\n"
@@ -4165,31 +4367,39 @@ msgstr ""
 "'pertype' - Svaki tip poruke (npr., razgovori i grupni razgovori) se šalje u "
 "vezani prozor."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako je Neaktivno, nećete više vidjeti avatar u prozoru razgovora."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je Aktivno, pritisak na 'esc' tipku zatvara karticu/prozor."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Skriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Skriva baner u prozoru razgovora dviju osoba"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skriva listu učesnika u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4197,15 +4407,15 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku reda samo kada se ne radi o istoj "
 "osobi koja je pričala i u prošloj poruci."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko pomicanje kroz poruke u prozorima razgovora."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4213,11 +4423,11 @@ msgstr ""
 "Lista boja, odvojenih sa \":\", koje će biti korištene za bojanje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab idi na sljedeću karticu kada nema nepročitanih."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4225,7 +4435,7 @@ msgstr ""
 "Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
 "niz znači da nikada ne prikazujemo upit."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4233,7 +4443,7 @@ msgstr ""
 "Treba li prikazati upit za potvrdu blokiranja kontakata ili ne? Prazan niz "
 "znači da nikada ne prikazujemo upit."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4241,7 +4451,7 @@ msgstr ""
 "Treba li prikazati upit za potvrdu osobnog statusa ili ne? Prazan niz znači "
 "da nikada ne prikazujemo upit."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4252,7 +4462,7 @@ msgstr ""
 "prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
 "poslužitelja."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4260,7 +4470,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
 "pohranio lozinke računa."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4268,7 +4478,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti KDE Wallet (ako je kwalletcli dostupan) "
 "da bi pohranio lozinke računa."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4276,7 +4486,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
 "redovima za račune i grupe."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4284,7 +4494,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne "
 "poruke kao da su izabrane vrste"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4292,20 +4502,12 @@ msgstr ""
 "Ako je Aktivno, Gajim će otklizati i izabrati izabrati kontakt koji vam je "
 "poslao posljednju poruku, ako prozor s razgovorom već nije otvoren."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Ako je Aktivno, Gajim će pretvoriti frazu između $$ i $$ u sliku koristeći "
-"dvips i pretvoriti prije ubacivanja u prozor s razgovorom."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Vrijeme neaktivnosti potrebno da bi se prozor za promjenu statusa zatvorio."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4313,7 +4515,7 @@ msgstr ""
 "Maksimalan broj linija koje se ispisuju u razgovorima. Najstarije linije se "
 "čiste."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4322,19 +4524,11 @@ msgstr ""
 "Ako je Aktivno, prozori sa obavijestima notification-daemon-a će biti "
 "prikačeni uz ikonu u traci radne površine."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Izaberi interval između dvije provjere nezaposlenosti."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Promjeni vrijednost za promjenu veličine latex formule koja se prikazuje. "
-"Veća je viša."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4342,21 +4536,22 @@ msgstr ""
 "Ispravne uri sheme. Samo sheme u ovoj listi će biti prihvaćene kao \"pravi\" "
 "uri. (mailto i xmpp se obrađuju posebno)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Zatraži statusnu poruku odspojenih kontakata nakon spajanja na osobni račun. "
 "UPOZORENJE: To će uzrokovati mnogo poslanih zahtjeva!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Ako je Aktivno, automatska dopuna u grupnim razgovorima će biti poput "
 "automatske dopune u sistemskoj ljusci"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4364,31 +4559,60 @@ msgstr ""
 "Kada prikazati red osobnih kontakata. Može biti \"always\", "
 "\"when_other_resource\" ili \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
+"odabrana predefinirana poruka."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4396,7 +4620,7 @@ msgstr ""
 "Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
 "definirani u autopriority_* opcijama."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4405,39 +4629,39 @@ msgstr ""
 "odsutan, produženo nedostupan, ne uznemiravaj, nevidljivd. PRIMJEDBA: ova "
 "postavka se koristi samo ako je restore_last_status onemogućen."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je označeno, vraća zadnji korišteni status."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Ako je Aktivno, Autorizacija kontakata će biti obavljena automatski."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Ako je Neaktivno, ovaj račun će biti neaktivan i neće biti prikazan na listi "
 "kontakata."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ako nije uključeno, ne potpisuj prisutnost GPG ključem, čak i kada je GPG "
 "postavljen."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj račun."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju, ako je to moguće?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4445,50 +4669,65 @@ msgstr ""
 "Poredani popis (odjeljen razmakom) vrsta povezivanja za probati. Može "
 "sadržavati tls, ssl ili plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije korištenja standardne SSL biblioteke."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Razmak poslan nakon neaktivnosti"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping poslan nakon neaktivnosti"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Koliko sekundi čekati odgovor ping alive paketa prije nego pokušamo ponovno "
 "spajanje."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4496,15 +4735,34 @@ msgstr ""
 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
 "u file_transfer_proxies opcijama za prijenos."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtjev za potvrdom o primitku"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Šalji potvrde o primitku"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
+"koristite"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s vam želi poslati datoteku."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4512,20 +4770,52 @@ msgstr ""
 "Prilikom pregovaranja o kriptiranoj sesiji, treba li Gajim pretpostaviti da "
 "želite zapisati vaš razgovor?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonimna autentifikacija"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_imna autentifikacija"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je li OpenPGP omogućen za ovog kontakta?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4533,108 +4823,112 @@ msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju sa ovim kontaktom, ako "
 "je to moguće?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "sve ili razmakom odvojen status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', ili 'both'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
+"razgovoru."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
+"razgovoru."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Vani"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4643,27 +4937,186 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Za"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Zahtjev za ukidanjem pretplate od %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Disk Write Error"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"Datoteku baze podataka (%s) nije moguće pročitati. Pokušajte je popraviti "
+"(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili obrisati (svi "
+"zapisi razgovora će biti izgubljeni)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Soba je uništena"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Neispravan Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Primljena poruka nevažećeg JID-a, automatski je ignorirana."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "greška prilikom slanja %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Nepoznata SSL greška: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nova Jedna Poruka"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova Jedna Poruka od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nova Privatna Poruka"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova Privatna Poruka iz privatnog razgovora %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nova Poruka"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s je Promjenio Status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt Promjenio Status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Se Prijavio"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt Se Prijavio"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Se Odjavio"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt Se Odjavio"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitati modul idle"
@@ -4673,20 +5126,20 @@ msgstr "Nije moguće učitati modul idle"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registracija uspijela"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registracija sa agentom %s je uspjela"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registracija nije uspijela"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4694,193 +5147,168 @@ msgstr ""
 "Registracija sa agentom %(agent)s nije uspjela, uz poruku o grešci "
 "%(error)s: %(error_msg)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 "Disk Write Error"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Račun %s ne podržava nevidljivost."
 
-#: ../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: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: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 ""
-"Datoteku baze podataka (%s) nije moguće pročitati. Pokušajte je popraviti "
-"(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili obrisati (svi "
-"zapisi razgovora će biti izgubljeni)."
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Želio bih te dodati na moju listu kontakata."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Nemoguće dobaviti certifikat izdavača"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Nemoguće dobaviti CRL certifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nemoguće dekriptirati potpis certifikata"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nemoguće dekriptirati CRL potpis"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Nije moguće dekodirati izdavačev javni ključ"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu certifikata"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Greška u CRL potpisu"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Certifikat još nije ispravan"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL nije još ispravan"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Format greška u certifikatovom notBefore polju"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Format greška u certifikatovom notAfter polju"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format greška u CRL lastUpdate polju"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format greška u CRL nextUpdate polju"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Osobno potpisan certifikat u lancu"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Nemoguće dobaviti certifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Nemoguće potvrditi ispravnost prvog certifikata"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Lanac certifikata je pre dugačak"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certifikat je poništen"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Neispravan CA certifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Pređeno ograničenje duljine putanje"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha certifikata"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certifikat nije pouzdan"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certifikat odbijen"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *kriptirana* (Vidi :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4889,78 +5317,79 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, 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:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nepoznata SSL greška: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Nije moguća veza sa \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Provjerite svoju vezu ili pokušajte kasnije."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Odgovor poslužitelja: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Neuspješno povezivanje na račun %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, 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:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4969,7 +5398,7 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4978,24 +5407,33 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Autentičnost certifikata %s bi mogla biti neispravna."
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Nije moguća veza sa \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 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:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom brisanja liste privatnosti"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5004,67 +5442,67 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslan kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Poslani kontakti:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Brisanje registracije nije uspijelo"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Prijenosi"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Nije na Listi Kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Ovom računalu nedostaju D-Bus python poveznice"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus trenutno nije ispravno pokrenut na ovom računalu"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus trenutno nije ispravno pokrenut na ovom računalu"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus trenutno nije ispravno pokrenut na ovom računalu"
@@ -5078,7 +5516,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servis nije dostupan: Gajim nije pokrenut ili je remote_control Neaktivno"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nije namješten na ovom sustavu ili nema python modula."
 
@@ -5263,224 +5701,232 @@ msgstr "Kraj tjedna"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Neispravan znak u korisničkom imenu."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Neispravan znak u imenu računala."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Potrebna je adresa poslužitelja."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Nedostupan"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prijenosa:Stanka"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prijenosa:Stanka"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Odspojen"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Nevidljiv"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Sudionici"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Sudionik"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5488,22 +5934,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr "iz sobe %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr "od korisnika %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5511,21 +5957,40 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaja na čekanju"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Vrijeme isteklo kod učitavanja slike"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Slika je prevelika"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL nije još ispravan"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Vrijeme isteklo kod učitavanja slike"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracija Sobe"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5537,111 +6002,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Poruka Greške: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Greška u izvršavanju \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravna razina zapisnika (loglevel)"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Predefinirana Poruka"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "veličina: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Datoteka: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zelena"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "greška: nemogu otvoriti %s za čitanje"
+msgid "Error: cannot open %s for reading"
+msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
@@ -6278,19 +6757,115 @@ msgstr "Učim"
 msgid "Writing"
 msgstr "Pišem"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "predefinirano"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "morska"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Skrivam se"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Država:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Korisnički račun"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Opis"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Greška"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "jedan"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "soba"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Nepoznat Izvođač"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Nepoznat Naslov"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Nepoznat Izvor"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6299,22 +6874,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "šalje <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nemoguće vezanje na port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Možda već imate pokrenutu jednu instancu Gajima. Prijenos Datoteka će biti "
-"otkazan."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6322,11 +6883,11 @@ msgstr ""
 "[Ovo je dio kriptirane poruke. Ukoliko vidite ovu poruku nešto je pošlo po "
 "zlu.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6335,44 +6896,43 @@ msgstr ""
 "%s\n"
 "Poruke lokalne veze možda ne rade kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemoguće vezanje na port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Molim provjerite da li je avahi-daemon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Vašu poruku nije moguće poslati."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6384,24 +6944,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja usluge. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Predefinirana Poruka"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6411,213 +6971,214 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije upotrebljiv na ovom računalu"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da bi ste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Ovo ime već koristi vaš drugi račun. Molim odaberite drugo ime."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Preimenuj Račun"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za račun %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "OpenPGP tajni ključ nije dostupan."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 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:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Za deaktivaciju računa morate biti odspojeni."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6625,11 +7186,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6637,11 +7198,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6649,11 +7210,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6661,7 +7222,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6677,111 +7238,108 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Å to želite učiniti?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ukloni račun sam_o iz Gajima"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Samo ulasci i izlasci"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Ništa"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molim obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu "
 "oznaku."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Neispravan nadimak"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Znak nije dozvoljen"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Neispravan poslužitelj"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Neispravna soba"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6790,32 +7348,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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo specificirajte poslužitelj na koji se želite registrirati."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6830,7 +7388,7 @@ msgstr ""
 "SSL Greška: %(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6841,72 +7399,89 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije obrisan"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Postavi"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Prva Poruka Primljena"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Sljedeća Poruka Primljena sa Fokusom"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Sljedeća Poruka Primljena bez Fokusa"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6916,7 +7491,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:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6924,233 +7499,234 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Jučer"
 msgstr[1] "Jučer"
 msgstr[2] "Jučer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nije moguće učitati modul idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je već na listi"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "novi@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novi%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ID ključa"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Postavi Raspoloženje"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Prepiši Statusnu Poruku?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Molim unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Adresa:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Adresa:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresa:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ jabber klijent"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber klijent"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -7158,7 +7734,7 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7170,100 +7746,154 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Nesigurna Veza"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
+"instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Da, stvarno želim nesigurno povezivanje"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Ne pitaj me više"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Krivi uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Ovo nije grupni razgovor"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Neispravan Račun"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Neispravan Nadimak"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7272,168 +7902,138 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt Se Prijavio"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nova Poruka"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nova Privatna Poruka"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Poziv na Grupni Razgovor"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt Promjenio Status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Uredi"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "Uklo_ni"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7441,190 +8041,188 @@ 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:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Dodaj"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Uredi"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupe"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Dodaj kontakt"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Dodaj kontakt"
+msgstr[1] "_Dodaj kontakt"
+msgstr[2] "_Dodaj kontakt"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Uklanja kontakt sa liste"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Uklanja kontakt sa liste"
+msgstr[1] "Uklanja kontakt sa liste"
+msgstr[2] "Uklanja kontakt sa liste"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Servis je odgovorio sa greškom."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Želite li prihvatiti poziv?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Zvuci"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Uvjet"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "kada sam "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7635,19 +8233,19 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Kontaktov identitet potvrđen"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Potvrdi ponovno..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7657,19 +8255,19 @@ msgstr ""
 "ili slati vama poruke, morate potvrditi njihov identitet klikom na dugme "
 "ispod."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktov identitet NIJE potvrđen"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Jeste li potvrdili kontaktov identitet?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7684,84 +8282,125 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 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:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG ključ je dodijeljen ovom kontaktu, ali <b>vi ne vjerujete njegovom "
 "ključu</b>, tako da poruke <b>nemogu</b> biti kriptirane. Promjenite razinu "
 "povjerenja u njegov ključ sa GPG klijentom."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG ključ je dodijeljen ovom kontaktu, i vi vjerujete njegovom ključu, tako "
 "da će poruke biti kriptirane."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "za račun %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Osobno potpisan certifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7769,235 +8408,250 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pregled %(address)s koristeći račun %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Izvrši Naredbu..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Knjižna oznaka je već postavljena"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, 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:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Knjižna oznaka je bez uspješno dodana"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Provjera valjanosti SSL certifikata"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka koja se koristi za ovjeru certifikata poslužitelja da bi se "
 "osigurala sigurna veza."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Potreban je python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Razgovori bez centralnog poslužitelja sa automatskim otkrivanjem klijenata u "
 "lokalnoj mreži."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Potreban je python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Potreban je pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Naredbena linija"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Skripta koja kontrolira Gajim iz naredbene linije."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Potreban je python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna za Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP enkripcija poruka"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Kriptiranje poruka sa gpg ključevima."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Potrebni su gpg i python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Automatsko otkrivanje mrežnog statusa."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Potreban je gnome-network-manager i python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Upravljanje Sesijama"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesija je sačuvana kod gašenja i povraćena kod pokretanja."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Potreban je python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Kriptiranje lozinke"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lozinke se mogu spremati sigurno, ne samo kao običan tekst."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Potrebni su gnome-keyring i python-gnome2-desktop, ili kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Mogućnost spajanja na poslužitelje koji koriste SRV spise."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Potreban je dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Potreban je nslookup za korištenje SRV spisa."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Provjera Pravopisa"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Provjera pravopisa napisanih poruka."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Potreban je libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Potreban je libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Obavijest"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Neaktivni prozori sa obavijestima o novim događajima."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -8005,66 +8659,40 @@ msgstr ""
 "Potreban je python-notify ili umjesto toga python-dbus u kombinaciji sa "
 "notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatski status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Mogućnost mjerenja vremena neaktivnosti, da bi se postavio automatski status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Zahtijeva biblioteku libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Potreban je python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-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 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 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."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "End to End kriptiranje poruka"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Kriptiranje poruka."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Potreban je python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8072,172 +8700,200 @@ msgstr ""
 "Generira XHTML izlaz iz RST koda (pogledati http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Potreban je python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Potreban je python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Potreban je python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Potreban je python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Dostupan"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Funkcija"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Vrijeme"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "veličina: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Primatelj: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Spremljeno u: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Prijenos datoteka završen"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Prijenos datoteka otkazan"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Vezu nije moguće ostvariti."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primatelj: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Razmjena datoteka zaustavljena"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Odabir Datoteke za Slanje..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Datoteka: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tip: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Opis: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s vam želi poslati datoteku:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, 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:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Snimiti Datoteku kao..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Datoteka: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tip: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s vam želi poslati datoteku:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Šaljem profil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Greška u Razmjeni Datoteka"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8245,69 +8901,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Neispravna Datoteka"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "poruka"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Emotikoni:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Prikaži samo u _listi kontakata"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Napredni Uređivač Postavki"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Konfiguracija Sobe"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim treba X poslužitelj za rad. Izlaz..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "Učitavanje PyGTK nije uspjelo: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim treba PyGTK 2.12 ili viši"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim treba PyGTK 2.12 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim treba GTK 2.12 ili viši"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim treba GTK 2.12 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8316,12 +9009,11 @@ msgstr ""
 "Molim osigurajte da je Pywin32 instaliran na vašem sustavu. Možete ga naći "
 "na %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8329,28 +9021,28 @@ msgstr ""
 "Trenutno je već pokrenuta jedna instanca Gajima\n"
 "Svejedno pokrenuti?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8358,53 +9050,57 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "račun"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "poruka"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8413,20 +9109,44 @@ msgstr ""
 "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Mjenja status jednog ili više računa"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "prioritet koji želite dodjeliti računu"
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+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:140
 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 "
@@ -8436,34 +9156,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8473,133 +9188,130 @@ msgstr ""
 "želite postaviti samo 'račun', bez 'OpenPGP ključa', postavite 'OpenPGP "
 "ključ' kao ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku grupnom razgovoru kojem ste pristupili."
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvaranje dialoga 'Započeti Razgovor'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 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
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Šalje korisnički XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8607,44 +9319,93 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Promjeni status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Nadimak koji će se koristiti"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for 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.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI za obraditi"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Račun sa kojim želite obraditi"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Sadržaj poruke"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Pridruživanje Novoj Sobi"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "soba"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "JID Sobe"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Nadimak koji će se koristiti"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Lozinka za ulaz u sobu"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Račun sa kojeg želite ući u sobu"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8653,158 +9414,44 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Korištenje: %s %s %s \n"
-"\t %s"
+"Uporaba: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Uporaba: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Krivi 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 ""
-"jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
-"uznemiravaj, nevidljiv"
-
-#: ../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: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:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Promjeni status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Nadimak koji će se koristiti"
-
-#: ../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 ""
-"Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
-"na sve račune"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI za obraditi"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Račun sa kojim želite obraditi"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Sadržaj poruke"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "JID Sobe"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Nadimak koji će se koristiti"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Lozinka za ulaz u sobu"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Račun sa kojeg želite ući u sobu"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Uporaba: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8813,7 +9460,7 @@ msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8822,10 +9469,14 @@ msgstr ""
 "Argument \"%(arg)s\" nije određen. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Krivi uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8848,181 +9499,217 @@ msgid "You cannot delete your current theme"
 msgstr "Ne možete izbrisati svoju trenutnu temu"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Molim prvo odaberite neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s je postavio temu na %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Soba od sada prikazuje nedostupne članove"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "Soba od sada ne prikazuje nedostupne članove"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Soba je sada non-anonymous"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Soba je sada semi-anonymous"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Soba je sada fully-anonymous"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Zapisivanje razgovora u sobi je omogućeno"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Nova soba je stvorena"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "zaustavljanje sustava"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Molim specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9030,22 +9717,22 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
@@ -9069,64 +9756,58 @@ msgstr "_Prijavi Grešku"
 msgid "Details"
 msgstr "Detalji"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije zadani Jabber klijent"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li postaviti Gajim za zadani Jabber klijent?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9137,93 +9818,87 @@ msgstr ""
 "registriran od strane drugog učesnika.\n"
 "Molimo unesite drugi nadimak ispod:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "U slučaju konflikta uvijek koristi ovaj nadimak"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, 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:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> 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."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Grupni razgovor %s ne postoji."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Zahtjev za pretplatom"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9231,100 +9906,96 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Pretplata uklonjena"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Soba od sada prikazuje nedostupne članove"
-
-#: ../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: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:934
-msgid "Room logging is now enabled"
-msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Soba je sada non-anonymous"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Soba je sada semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Soba je sada fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
 "odgovorio sa krivom lozinkom.\n"
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije točna"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Netočna OpenGPG Lozinka"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Certifikat je istekao"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG nije pouzdan"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "GPG ključ koji se koristi za kriptiranje ovog razgovora nije pouzdan. Zaista "
 "želite kriptirati ovu poruku?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi E-mail na %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9332,7 +10003,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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9347,101 +10018,86 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../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:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Greška pri čitanju datoteke"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Prijenosi Datoteka"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Nemoguće dekriptirati poruke od %s\n"
-"Možda ih je netko izmjenio."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Nemoguće dekriptirati poruku"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Greška."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Greška kod ovjere SSL certifikata"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9452,15 +10108,20 @@ msgstr ""
 "%(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Greška SSL certifikata"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Greška SSL certifikata"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9477,27 +10138,7 @@ msgstr ""
 "\n"
 "Još uvijek se želite povezati i korigirati otisak certifikata?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"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: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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9505,7 +10146,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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9515,17 +10156,17 @@ msgstr ""
 "da želite nastaviti?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 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:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9535,83 +10176,86 @@ msgstr ""
 "format emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/"
 "Emoticons za više detalja."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG ključ istekao"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Novi Grupni Razgovor"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Želio bih vas dodati na svoju listu kontakata"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "kreiram %s direktorij"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zapisa"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakti"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Poruka"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9619,7 +10263,7 @@ msgstr ""
 "Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM "
 "POKRENUT)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9633,95 +10277,109 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Pogreška Baze Podataka"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Izvozim Zapise..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Da li zaista želite ukloniti zabilješke odabranog kontakta?"
-msgstr[1] "Da li zaista želite ukloniti zabilješke odabranih kontakata?"
-msgstr[2] "Da li zaista želite ukloniti zabilješke odabranih kontakata?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Da li zaista želite ukloniti odabranu poruku?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Da li zaista želite ukloniti zabilješke odabranog kontakta?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Ovo je nepovratna operacija."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Otkaži potvrdu"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[1] "Da li zaista želite ukloniti odabrane poruke?"
 msgstr[2] "Da li zaista želite ukloniti odabrane poruke?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Povijest Razgovora sa %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Vrijeme isteklo kod učitavanja slike"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programiram"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Slika je prevelika"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Zatvorit će te nekoliko kartica"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Da li ih zaista želite sve zatvoriti?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9733,100 +10391,112 @@ msgstr "- poruke će biti zapisane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti zapisane"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s je Promjenio Status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignoriraj"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Se Prijavio"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Se Odjavio"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Zabranjujem pristup %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nova Jedna Poruka od %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registracija nije uspijela"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova Privatna Poruka iz privatnog razgovora %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Servis je poslao neispravne podatke"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nova poruka od %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Ova datoteka već postoji"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nova poruka od %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignoriraj"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfiguracija Sobe"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Datoteka je prazna"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Dohvaćam profil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacije Kontakta"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Primljene informacije"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Šaljem profil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Objava vCard neuspješna"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9834,51 +10504,52 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, 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:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9886,38 +10557,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "desinkroniziran"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Zaista zatvori Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Uvijek zatvori Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Prekini transfer datoteke"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9925,16 +10596,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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9942,11 +10613,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9955,11 +10626,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovih "
 "prijenosa: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 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:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9968,56 +10639,56 @@ msgstr ""
 "primiti."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, 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:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10026,11 +10697,11 @@ msgstr ""
 "će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10038,16 +10709,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10057,14 +10728,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:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10073,34 +10744,35 @@ 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene kod sljedećeg spajanja."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10110,11 +10782,11 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10122,12 +10794,17 @@ 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Poslati %s prema %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Učini %s i %s pseudokontaktima"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
@@ -10137,130 +10814,130 @@ msgstr "Učini %s i %s pseudokontaktima"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "na %s račun"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje Knjižni_m Oznakama..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "računa %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "za račun %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Postavi Usluge..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Izmjeni _Grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Pošalji Jednu Poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Izvrši Naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Ponovno spajanje"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Odspoji"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
@@ -10277,24 +10954,14 @@ msgstr "Greška u primljenom podatkovnom obrascu"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Disk WriteError"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Potvrdi ove sesijske postavke"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10306,7 +10973,7 @@ msgstr ""
 "\n"
 "\tJesu li te postavke prihvatljive?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10321,147 +10988,152 @@ msgstr ""
 "\n"
 "Nastavi sesiju?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Je li OpenPGP omogućen za ovog kontakta?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Promijeni Statusnu Poruku..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _listi"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr "[blokirano]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr "[minimizirano]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Zadnji status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Spojen"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Odspojen"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Raspoloženje:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivnost:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Glazba:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Obavijest"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Podizanje"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nije početo"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Završeno"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?status prijenosa:Stanka"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Prenosim"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10469,32 +11141,32 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Vrijeme:Nepoznato"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pripadnost:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10502,7 +11174,7 @@ msgstr ""
 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10510,31 +11182,414 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Odabir Datoteke za Slanje..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " otvaranje prozora/kartice sa tim kontaktom "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Akcije</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Uvjeti</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Napredne Akcije"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Napredno Upravljanje Obavijestima"
+
+#~ msgid "All statuses"
+#~ msgstr "Svi statusi"
+
+#~ msgid "Busy "
+#~ msgstr "Zauzet "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt Promjenio Status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt Odspojen"
+
+#~ msgid "Don't have "
+#~ msgstr "Nemam "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Razmjena Datoteka Zaustavljena"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Označavanje Poruke Grupnog Razgovora"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Primljena Poruka Grupnog Razgovora"
+
+#~ msgid "Have "
+#~ msgstr "Imam "
+
+#~ msgid "Launch a command"
+#~ msgstr "Pokrenite naredbu"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Jedan ili više posebnih statusa..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Spojen / Slobodan za Razgovor"
+
+#~ msgid "Play a sound"
+#~ msgstr "Odsviraj zvuk"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nova Privatna Poruka"
+
+#~ msgid "When "
+#~ msgstr "Kada "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktivacija opcije upravitelja prozora za bljeskanje prozora razgovora u "
+#~ "taskbaru"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Onemogući automatsko otvaranje prozora razgovora"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Onemogući postojeći iskočni prozor"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Onemogući postojeći zvuk za ovaj događaj"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Onemogući prikazivanje događaja u listi kontakata"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Onemogući prikazivanje događaja u listi kontakata"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Obavijesti me sa iskočnim prozorom"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Otvori prozor za razgovor sa korisnikom"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Prikaži događaj u _listi kontakata"
+
+#~ msgid "and I "
+#~ msgstr "i ja "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontakti"
+
+#~ msgid "for "
+#~ msgstr "za"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupe"
+
+#~ msgid "when I'm in"
+#~ msgstr "kada sam u"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Prikaži profil kontakta (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Dozvoli njemu/njoj da vidi moj status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Opis: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Napredno..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Prikaži _aktivnost kontakata na listi"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Prikaži _glazbu kontakata na listi"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Prikaži _raspoloženje kontakata na listi"
+
+#~ 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"
+
+#, 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"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Slanje Jedne Poruke..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Korisnički Avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "Engleski"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bjeloruski"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bugarski"
+
+#~ msgid "Breton"
+#~ msgstr "Bretonski"
+
+#~ msgid "Czech"
+#~ msgstr "Češki"
+
+#~ msgid "German"
+#~ msgstr "Njemački"
+
+#~ msgid "Greek"
+#~ msgstr "Grčki"
+
+#~ msgid "British"
+#~ msgstr "Britanski"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Španjolski"
+
+#~ msgid "Basque"
+#~ msgstr "Baskijski"
+
+#~ msgid "French"
+#~ msgstr "Francuski"
+
+#~ msgid "Croatian"
+#~ msgstr "Hrvatski"
+
+#~ msgid "Italian"
+#~ msgstr "Talijanski"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norveški (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Nizozemski"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norveški"
+
+#~ msgid "Polish"
+#~ msgstr "Poljski"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugalski"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazilski Portugalski"
+
+#~ msgid "Russian"
+#~ msgstr "Ruski"
+
+#~ msgid "Serbian"
+#~ msgstr "Srpski"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovački"
+
+#~ msgid "Swedish"
+#~ msgstr "Švedski"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kineski (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Jezik pravopisa"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Ako je Aktivno, Gajim će pretvoriti frazu između $$ i $$ u sliku "
+#~ "koristeći dvips i pretvoriti prije ubacivanja u prozor s razgovorom."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Promjeni vrijednost za promjenu veličine latex formule koja se prikazuje. "
+#~ "Veća je viša."
+
+#~ msgid "all or space separated status"
+#~ msgstr "sve ili razmakom odvojen status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', ili 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' ili ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Greška u izvršavanju \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "greška: nemogu otvoriti %s za čitanje"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Nemoguće vezanje na port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Možda već imate pokrenutu jednu instancu Gajima. Prijenos Datoteka će "
+#~ "biti otkazan."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ jabber klijent"
+
+#~ msgid "Condition"
+#~ msgstr "Uvjet"
+
+#~ msgid "when I am "
+#~ msgstr "kada sam "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr ""
+#~ "Potreban je pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Potrebni su gpg i python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Pretvara LaTeX izraze između $$ $$ znakova."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Potrebni su texlive-latex-base i dvipng (Sve je u MixTeX). Morate "
+#~ "postaviti 'use_latex' na Aktivno u Naprednom Uređivaču Postavki."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Potreban je python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
+#~ "uznemiravaj, nevidljiv"
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Korištenje: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakti"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Disk WriteError"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Tema: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Raspoloženje:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivnost:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10562,32 +11617,12 @@ msgstr " resurs s prioritetom "
 #~ 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"
 
@@ -10690,9 +11725,6 @@ msgstr " resurs s prioritetom "
 #~ "Povijest Grupnih Razgovora\n"
 #~ "Povijest Svih Razgovora"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Podešavanje Računa"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10860,18 +11892,9 @@ msgstr " resurs s prioritetom "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Pridruži Open_PGP Ključ"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Naredba nije podržana za zeroconf račun."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Komanda: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uporaba: /%s, prazni tekstualni prozor"
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uporaba: /%s, sakriva dugmadi."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10879,12 +11902,6 @@ msgstr " resurs s prioritetom "
 #~ "Uporaba: /%(command)s <action>, šalje akciju trenutnom grupnom razgovoru. "
 #~ "Koristi treću osobu. (npr. /%(command)s eksplodira.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Uporaba: /%s, šalje ping kontaktu"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uporaba: /%s, šalje poruku kontaktu"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Nema informacija ni pomoći za /%s"
 
@@ -10901,10 +11918,6 @@ msgstr " resurs s prioritetom "
 #~ msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s"
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Nadimak nije pronađen: %s "
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10916,12 +11929,6 @@ msgstr " resurs s prioritetom "
 #~ "podržani."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10962,9 +11969,6 @@ msgstr " resurs s prioritetom "
 #~ msgstr ""
 #~ "Uporaba: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Uporaba: /%s , prikazuje imena učesnika u grupnom razgovoru."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr "Uporaba: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
@@ -10999,9 +12003,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "Name:"
 #~ msgstr "Ime:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Prikaži _listu kontakata"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Označite račun za sinkronizaciju"
 
@@ -11118,9 +12119,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "_Blocked Contacts"
 #~ msgstr "_Blokirani Kontakti"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Pritisnite za pregled prošlih razgovora sa ovim kontaktom"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Kompaktan Pregled    Alt+K"
 
@@ -11137,9 +12135,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "Query Builder..."
 #~ msgstr "Graditelj Upita..."
 
-#~ msgid "Accept"
-#~ msgstr "Prihvati"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Primljen Poziv"
 
@@ -11271,9 +12266,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "Company:"
 #~ msgstr "Poduzeće:"
 
-#~ msgid "Country:"
-#~ msgstr "Država:"
-
 #~ msgid "Given:"
 #~ msgstr "Dano:"
 
diff --git a/po/hu.po b/po/hu.po
index f154a3cdc..f1c95fdb3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 16:16+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2010-11-28 12:15+0100\n"
 "Last-Translator: Gabriel Papp <gabriel.papp@gmx.com>\n"
 "Language-Team: -\n"
@@ -18,494 +18,536 @@ msgstr ""
 "X-Generator: Virtaal 0.6.1\n"
 
 #: ../data/gui/account_context_menu.ui.h:1
-#: ../data/gui/roster_window.ui.h:7
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Állapot"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Személyes _események"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "Csevegés _kezdeményezése..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Csatlakozás közös beszélgetéshez..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Ismerős hozzáadása..."
 
-#: ../data/gui/account_context_menu.ui.h:3
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Szolgáltatások felderítése"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Parancs futtatása..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Fiók módosítása"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Gmail beérkezett üzenetek megnyitása"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Személyes _események"
-
-#: ../data/gui/account_context_menu.ui.h:8
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Start Chat..."
-msgstr "Csevegés _kezdeményezése..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Állapot"
+msgid "_Modify Account"
+msgstr "_Fiók módosítása"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Fiók Létrehozása Varázsló"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Csatlakozás a szerverhez</b>\n"
-"\n"
-"Kérem várjon..."
+"Szüksége van egy fiókra, hogy csatlakozhasson\n"
+"a Jabber hálózatra."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
-msgid "<b>Please choose one of the options below:</b>"
-msgstr "<b>Kérem válasszon az alábbi lehetőségek közül:</b>"
+msgid "I already have an account I want to _use"
+msgstr "Már van egy fiókom amit _használni szeretnék"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:5
-msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>Kérem töltse ki az adatokat a már létező fiókjához</b>"
+msgid "I want to _register for a new account"
+msgstr "_Regisztrálni szeretnék egy új fiókért"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Kérem válasszon szervert</b>"
+msgid "<b>Please choose one of the options below:</b>"
+msgstr "<b>Kérem válasszon az alábbi lehetőségek közül:</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
+msgid "<b>Please fill in the data for your existing account</b>"
+msgstr "<b>Kérem töltse ki az adatokat a már létező fiókjához</b>"
 
 #: ../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"
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Jelszó:"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Jelszó _mentése"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:10
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
-"Tanusítvány hozzáadása a megbízható tanusítványok listájához.\n"
-"A tanusítvány SHA1 ujjlenyomata:\n"
+"Ha be van pipálva, akkor a Gajim emlékezni fog a jelszavamra ehhez a fiókhoz"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Anon_ymous authentication"
-msgstr "Anon_ymous hitelesítés"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Connect when I press Finish"
-msgstr "Csatlakozás ha a Befejezésre kattintok"
+msgid "Anon_ymous authentication"
+msgstr "Anon_ymous hitelesítés"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Fiók Létrehozása Varázsló"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Kérem válasszon szervert</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I already have an account I want to _use"
-msgstr "Már van egy fiókom amit _használni szeretnék"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Szerver:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-msgid "I want to _register for a new account"
-msgstr "_Regisztrálni szeretnék egy új fiókért"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
-#: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "Ha be van pipálva, akkor a Gajim emlékezni fog a jelszavamra ehhez a fiókhoz"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Kezelés..."
 
+#: ../data/gui/account_creation_wizard_window.ui.h:17
+msgid "Use custom hostname/port"
+msgstr "Egyéni hostnév/port használata"
+
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-#: ../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
-msgid "None"
-msgstr "Egyik sem"
+msgid "_Hostname:"
+msgstr "_Hostnév:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Jelszó _mentése"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Haladó"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Set my profile when I connect"
-msgstr "Profilom beállítása csatlakozáskor"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:22
-msgid "Use custom hostname/port"
-msgstr "Egyéni hostnév/port használata"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:23
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Szüksége van egy fiókra, hogy csatlakozhasson\n"
-"a Jabber hálózatra."
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
-msgid "_Advanced"
-msgstr "_Haladó"
+"Tanusítvány hozzáadása a megbízható tanusítványok listájához.\n"
+"A tanusítvány SHA1 ujjlenyomata:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Finish"
-msgstr "_Kész"
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Csatlakozás a szerverhez</b>\n"
+"\n"
+"Kérem várjon..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-msgid "_Hostname:"
-msgstr "_Hostnév:"
+msgid "Connect when I press Finish"
+msgstr "Csatlakozás ha a Befejezésre kattintok"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Set my profile when I connect"
+msgstr "Profilom beállítása csatlakozáskor"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Jelszó:"
+msgid "_Finish"
+msgstr "_Kész"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:31
-msgid "_Server:"
-msgstr "_Szerver:"
-
-#: ../data/gui/accounts_window.ui.h:1
-#: ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Vegyes</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Egyik sem"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Fiókok"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Személyes információ</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Hozzáad"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Törlés"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Állapothoz _igazítás"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Át_nevezés"
 
-#: ../data/gui/accounts_window.ui.h:6
-#: ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Fiók"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Engedélyez"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Fiókok"
+msgid "Anonymous authentication"
+msgstr "Anonymous hitelesítés"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Adminisztrációs műveletek"
+#, fuzzy
+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 ""
+"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)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonymous hitelesítés"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatikus újracsatlakozás, ha a kapcsolat megszakad"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Partnerek szinkronizálása"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "Tallózás..."
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Kattintson ide ahhoz, hogy a program hitelesítést kérjen minden egyéb "
+"fiókhoz tartozó partnertől"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_satlakozás a Gajim indításával"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Jelszó meg_változtatása"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Kattintson ide a fiók jelszavának megváltoztatásához"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Pipálja be, ha azt szeretné, hogy a Gajim kérdezzen mielőtt a jelszava nem biztonságos kapcsolaton kereszül lenne elküldve."
+msgid "Administration operations"
+msgstr "Adminisztrációs műveletek"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "Válasszon kliens tanusítványt"
+#, fuzzy
+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 ""
+"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"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Válasszon _Kulcsot..."
+msgid "A_djust to status"
+msgstr "Állapothoz _igazítás"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Kattintson ide a fiók jelszavának megváltoztatásához"
+#, fuzzy
+msgid "Priority will change automatically according to your status."
+msgstr "Priority will change automatically according to your status."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Kattintson ide ahhoz, hogy a program hitelesítést kérjen minden egyéb fiókhoz tartozó partnertől"
+msgid "Priori_ty:"
+msgstr "Priori_tás:"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "Kliens tanusítvány"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Csatlakozás Gajim i_ndulásakor"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Kapcsolat"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Vezetéknév:"
+msgid "Resour_ce:"
+msgstr "_Erőforrás:"
 
-#. 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
-msgid "Gajim"
-msgstr "Gajim"
+msgid "_Client Cert File:"
+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
-msgid "General"
-msgstr "Általános"
+msgid "Browse..."
+msgstr "Tallózás..."
 
 #: ../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 "Ha be van pipálva, akkor a GajimIP, so file transfer has higher chances of working."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Tanusítvány visszautasítva"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ha be van pipálva, a Gajim le fogja kérni a jelszavakat egy GPG kezelőtől, mint a seahorse"
+msgid "Client certificate"
+msgstr "Kliens tanusítvány"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Fiók"
 
 #: ../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 "Ha be van pipálva, akkor a Gajim kapcsolat megtartó csomagokat fog küldeni, hogy elkerülje a kapcsolati időtúllépést ami a kapcsolat megszünését eredményezi"
+msgid "C_onnect on Gajim startup"
+msgstr "C_satlakozás a Gajim indításával"
 
 #: ../data/gui/accounts_window.ui.h:30
 #, fuzzy
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "If ticked, Gajim, when launched, will automatically connect to jabber using this account"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"If ticked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
 
 #: ../data/gui/accounts_window.ui.h:31
-#, fuzzy
-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 "If ticked, 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"
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatikus újracsatlakozás, ha a kapcsolat megszakad"
 
 #: ../data/gui/accounts_window.ui.h:32
-#, fuzzy
-msgid ""
-"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 ""
-"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."
+msgid "Save conversation _logs for all contacts"
+msgstr "Beszé_lgetésnapló mentése az összes partnerhez"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Fiókhoz tartozó állapot szink_ronizálása a globális állapottal"
 
 #: ../data/gui/accounts_window.ui.h:34
 #, fuzzy
-msgid "Information about you, as stored in the server"
-msgstr "Information about you, as stored in the server"
+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 ""
+"If ticked, 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"
 
 #: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4
-#: ../src/config.py:1817
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber Azonosító:"
+msgid "Use file transfer proxies"
+msgstr "File küldő proxy-k használata"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Keresztnév:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ha be van pipálva, akkor a GajimIP, so file transfer has higher chances of "
+"working."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Fiókok _egyesítése"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Általános"
 
 #: ../data/gui/accounts_window.ui.h:38
-#: ../src/config.py:1790
-#: ../src/config.py:2356
-msgid "No key selected"
-msgstr "Nincs kulcs kiválasztva"
+msgid "_use HTTP__PROXY environment variable"
+msgstr "HTTP__PROXY környezeti változójának _használata"
+
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Kezelés..."
 
 #: ../data/gui/accounts_window.ui.h:40
-#: ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Személyes információ"
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tás:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Figyelmeztetés nem biztonságos kapcsolat használata előtt"
 
 #: ../data/gui/accounts_window.ui.h:42
-#, fuzzy
-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 "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"
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Pipálja be, ha azt szeretné, hogy a Gajim kérdezzen mielőtt a jelszava nem "
+"biztonságos kapcsolaton kereszül lenne elküldve."
 
 #: ../data/gui/accounts_window.ui.h:43
-#, fuzzy
-msgid "Priority will change automatically according to your status."
-msgstr "Priority will change automatically according to your status."
+msgid "Send _keep-alive packets"
+msgstr "_Kapcsolat életbentartó csomagok küldése"
 
-#. Rename
 #: ../data/gui/accounts_window.ui.h:44
-#: ../src/roster_window.py:5329
-msgid "Re_name"
-msgstr "Át_nevezés"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Ha be van pipálva, akkor a Gajim kapcsolat megtartó csomagokat fog küldeni, "
+"hogy elkerülje a kapcsolati időtúllépést ami a kapcsolat megszünését "
+"eredményezi"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "_Erőforrás:"
+msgid "Use cust_om hostname/port"
+msgstr "E_gyedi hostnév/port használata"
 
 #: ../data/gui/accounts_window.ui.h:46
-#, fuzzy
-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 "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)"
+msgid "_Hostname: "
+msgstr "_Hostnév: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Beszé_lgetésnapló mentése az összes partnerhez"
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Vegyes</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "_Kapcsolat életbentartó csomagok küldése"
+msgid "Connection"
+msgstr "Kapcsolat"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Fiókhoz tartozó állapot szink_ronizálása a globális állapottal"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Nincs kulcs kiválasztva"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Fiókhoz tartozó állapot _szinkronizálása a globális állapottal"
+msgid "Choose _Key..."
+msgstr "Válasszon _Kulcsot..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Partnerek szinkronizálása"
+msgid "Use G_PG Agent"
+msgstr "G_PG kezelő használata"
 
 #: ../data/gui/accounts_window.ui.h:53
-#, fuzzy
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "The path to the client certificate and key in PKCS#12 format"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Ha be van pipálva, a Gajim le fogja kérni a jelszavakat egy GPG kezelőtől, "
+"mint a seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "G_PG kezelő használata"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "E_gyedi hostnév/port használata"
+msgid "_Edit Personal Information..."
+msgstr "_Személyes adatok szerkesztése..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Egye_di port használata:"
+#, fuzzy
+msgid "Information about you, as stored in the server"
+msgstr "Information about you, as stored in the server"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "File küldő proxy-k használata"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Személyes információ</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-#, fuzzy
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Személyes információ"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Személyes adatok szerkesztése..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Csatlakozás Gajim i_ndulásakor"
 
-#. XML Console enable checkbutton
 #: ../data/gui/accounts_window.ui.h:60
-#: ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Engedélyez"
+msgid "Synchroni_ze account status with global status"
+msgstr "Fiókhoz tartozó állapot _szinkronizálása a globális állapottal"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Hostnév: "
+msgid "Use cust_om port:"
+msgstr "Egye_di port használata:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Kezelés..."
+#: ../data/gui/accounts_window.ui.h:62
+#, fuzzy
+msgid ""
+"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 ""
+"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."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Vezetéknév:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Keresztnév:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Figyelmeztetés nem biztonságos kapcsolat használata előtt"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "HTTP__PROXY környezeti változójának _használata"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber Azonosító:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Fiókok _egyesítése"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "F_iók:"
+msgid "Add New Contact"
+msgstr "Új partner felvétele"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Engedélyezem ennek a partnernek, hogy láthassa az állapotomat"
+msgid "A_ccount:"
+msgstr "F_iók:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Új partner felvétele"
+msgid "_Protocol:"
+msgstr "_Protokoll:"
 
 #: ../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 "Fel szeretnélek venni a partnerlistámra."
+msgid "_User ID:"
+msgstr "_Felhasználói azonosító:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Becenév:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Csoport:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Engedélyezem ennek a partnernek, hogy láthassa az állapotomat"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "Feliratkozási üzenet _mentése"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -517,7 +559,11 @@ msgstr ""
 "a protokollal. Kattints a regisztrálás gombra\n"
 "a folytatáshoz."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Regisztrálás"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 #, fuzzy
 msgid ""
 "You must be connected to the transport to be able\n"
@@ -526,519 +572,375 @@ msgstr ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Csoport:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Becenév:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokoll:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Regisztrálás"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "Feliratkozási üzenet _mentése"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Felhasználói azonosító:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Fel szeretnélek venni a partnerlistámra."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Hiba lépett fel:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+#, fuzzy
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Válassz parancsot futtatáshoz:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Kérem várjon amíg a parancslista lekérdezése megtörténik..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-#, fuzzy
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Válassz parancsot futtatáshoz:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Ellenőrizze újra"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Hiba leírás..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Kérem várjon amíg a parancs küldése folyamatban van..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "B_efejezés"
+msgid "Please wait..."
+msgstr "Kérem várjon..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Kérem várjon amíg a parancslista lekérdezése megtörténik..."
+#, fuzzy
+msgid "This jabber entity does not expose any commands."
+msgstr "This jabber entity does not expose any commands."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Kérem várjon amíg a parancs küldése folyamatban van..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Hiba lépett fel:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Kérem várjon..."
+msgid "Error description..."
+msgstr "Hiba leírás..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-#, fuzzy
-msgid "This jabber entity does not expose any commands."
-msgstr "This jabber entity does not expose any commands."
+msgid "F_inish"
+msgstr "B_efejezés"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Leírás</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Bővített Konfiguráció Szerkesztő"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>MEGJEGYZÉS:</b> Ahhoz hogy minden módosítás életbeléphessen, újra kell indítani a Gajim-ot"
+msgid "Filter:"
+msgstr "Szűrés:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Bővített Konfiguráció Szerkesztő"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Leírás</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Szűrés:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+"<b>MEGJEGYZÉS:</b> Ahhoz hogy minden módosítás életbeléphessen, újra kell "
+"indítani a Gajim-ot"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Alapértelmezett színek visszaállítása"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "MOTD Törlése"
+msgid "Show _XML Console"
+msgstr "_XML Parancssor Mutatása"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "A Nap Üzenetének törlése"
+msgid "Edit Archi_ving Preferences"
+msgstr ""
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Edit _Privacy Lists..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:4
-#, fuzzy
-msgid "Sends a message to users currently connected to this server"
-msgstr "Sends a message to users currently connected to this server"
+msgid "_Administrator"
+msgstr "_Adminisztrátor"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Set MOTD..."
-msgstr "MOTD Beállítása..."
+msgid "_Send Server Message..."
+msgstr "_Szerverüzenet küldése..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Sets Message of the Day"
-msgstr "Beállítja a Nap Üzenetét"
+#, fuzzy
+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:7
-msgid "Show _XML Console"
-msgstr "_XML Parancssor Mutatása"
+msgid "Sets Message of the Day"
+msgstr "Beállítja a Nap Üzenetét"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Update MOTD..."
-msgstr "MOTD Frissítése..."
+msgid "Set MOTD..."
+msgstr "MOTD Beállítása..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Updates Message of the Day"
 msgstr "Frissíti a Nap Üzenetét"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:10
-msgid "_Administrator"
-msgstr "_Adminisztrátor"
+msgid "Update MOTD..."
+msgstr "MOTD Frissítése..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Send Server Message..."
-msgstr "_Szerverüzenet küldése..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " a window/tab opened with that contact "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Műveletek</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Állapotok</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Hangok</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Bővített Műveletek"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Bővített Figyelmeztetés Irányítás"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Minden állapot"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106
-#: ../src/common/helpers.py:233
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Távol"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Elfoglalt "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "A Partner Megváltoztatta Állapotát "
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "A Parner Lekapcsolódott "
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Nincs "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "Fileküldés Befejezve"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "Fileküldési Kérelem "
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "Fileküldés Elindult "
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "Csoportos Csevegés Üzenetek Kiemelése "
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "Csoportos Csevegés Üzenet Érkezett "
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Van "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
-msgid "Invisible"
-msgstr "Láthatatlan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Parancs indítása"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216
-#: ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nem elérhető"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Egy vagy több egyedi állapot..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Elérhető / Ráér beszélgetni"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Egy hang lejátszása"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "Egy Üzenet Fogadása"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Amikor "
+msgid "Delete MOTD"
+msgstr "MOTD Törlése"
 
-#: ../data/gui/advanced_notifications_window.ui.h:27
-#, fuzzy
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
+msgid "Deletes Message of the Day"
+msgstr "A Nap Üzenetének törlése"
 
-#: ../data/gui/advanced_notifications_window.ui.h:28
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "_Disable auto opening chat window"
-msgstr "_Disable auto opening chat window"
+msgid "No"
+msgstr "Egyik sem"
 
-#: ../data/gui/advanced_notifications_window.ui.h:29
-#, fuzzy
-msgid "_Disable existing popup window"
-msgstr "_Disable existing pop-up window"
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:30
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "_Disable existing sound for this event"
-msgstr "_Disable existing sound for this event"
+msgid "Prefer"
+msgstr "Tulajdonságok"
 
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in roster"
-msgstr "_Disable showing event in roster"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:32
-#, fuzzy
-msgid "_Disable showing event in systray"
-msgstr "_Disable showing event in systray"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:33
-#, fuzzy
-msgid "_Inform me with a popup window"
-msgstr "_Inform me with a pop-up window"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:34
-#, fuzzy
-msgid "_Open chat window with user"
+#: ../data/gui/archiving_preferences_window.ui.h:7
+msgid "<i>Method Local</i>"
 msgstr ""
-"\n"
-"_Open chat window with user"
 
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in roster"
-msgstr "_Show event in roster"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:36
+#: ../data/gui/archiving_preferences_window.ui.h:9
 #, fuzzy
-msgid "_Show event in systray"
-msgstr "_Show event in systray"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "és Én "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "pertner(ek)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "mindkenki"
+msgid "Auto"
+msgstr "Automatikus csatlakozás"
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "azért, hogy "
+#: ../data/gui/atom_entry_window.ui.h:1
+msgid "New entry received"
+msgstr "Új bejegyzés érkezett"
 
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "csoport(ok)"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Új bejegyzésed érkezett:"
 
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "ha bent vagyok"
+#: ../data/gui/atom_entry_window.ui.h:3
+msgid "Feed name:"
+msgstr "Feed name:"
 
-#: ../data/gui/atom_entry_window.ui.h:1
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "Entry:"
 msgstr "Bejegyzés:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
-msgid "Feed name:"
-msgstr "Feed name:"
-
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Utoljára módosítva:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Új bejegyzés érkezett"
-
-#: ../data/gui/atom_entry_window.ui.h:5
-#: ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Új bejegyzésed érkezett:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Letiltott Partnerek"
 
 #: ../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/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "Tiltás _Feloldása"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Üzenet:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Tevékenység Beállítása"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Egy Tevékenység Beállítása"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Üzenet:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Üzenet:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Hangulat:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Üzenet:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Írja be újra megerősítésképp:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Írja be az új jelszót:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Írja be újra megerősítésképp:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Írja be az új állapotüzenetét</b>"
+msgid "Save as Preset..."
+msgstr "Mentés Sablonként..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Tevékenység:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Hangulat:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Tevékenység:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Sablonüzenetek:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Mentés Sablonként..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Írja be az új állapotüzenetét</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Csatlakozás _Csoportos Társalgáshoz"
+msgid "_Copy Link Location"
+msgstr "Link Helyének _Másolása"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Hozzáad a Partnerlistához..."
+msgid "_Open Link in Browser"
+msgstr "Link _Megnyitása Böngészőben"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "JID/E-mail Cím _Másolása"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "Link Helyének _Másolása"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "E-Mail Szerkesztő _Megnyitása"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "Link _Megnyitása Böngészőben"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "Beszélgetés _Indítása"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1
-#: ../src/dialogs.py:4184
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Csatlakozás _Csoportos Társalgáshoz"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Hozzáad a Partnerlistához..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr ""
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Hozzáad egy partnert a névsorhoz"
 
 #: ../data/gui/chat_control.ui.h:3
-#: ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "figyeli a beszélgetést"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Személyes információk"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+msgid "Show advanced functions (Alt+D)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Üzenet küldése"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Küld"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 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:14
-#: ../data/gui/groupchat_control.ui.h:2
-#: ../data/gui/xml_console_window.ui.h:16
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Küld"
+#: ../data/gui/chat_control.ui.h:20
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:15
-#: ../data/gui/groupchat_control.ui.h:3
-msgid "label"
-msgstr "címke"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Meg_hív"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Barátok Meghívása!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC szerver"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Kérem válasszon MUC szervert."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 #, fuzzy
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
@@ -1047,127 +949,138 @@ msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-#, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "A_sk to see his/her status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Kérem válasszon MUC szervert."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Add Special _Notification..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC szerver"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Assign Open_PGP Key..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Meg_hív"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "Parancs _Futtatása..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "_Beszélgetés Indítása"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Csoportok _Szerkesztése..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "_Levél Küldése..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "_File Küldése..."
 
 #. 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:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Meg_hívás ide:"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "_Partnerek Meghívása "
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Eltá_volít"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Open_PGP titkosítás Be/Kikapcsolása"
 
-#: ../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:7
+msgid "Toggle End to End Encryption"
+msgstr "End to End titkosítás Be/Kikapcsolás"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "E_gyedi Állapot Beállítása"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "Parancs _Futtatása..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "_Levél Küldése..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Partner Kezelése"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "_File Küldése..."
+msgid "_Rename..."
+msgstr "Át_nevez..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Egyedi _Avatar beállítása..."
+msgid "Edit _Groups..."
+msgstr "Csoportok _Szerkesztése..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "_Beszélgetés Indítása"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Assign Open_PGP Key..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "End to End titkosítás Be/Kikapcsolás"
+msgid "Set Custom _Avatar..."
+msgstr "Egyedi _Avatar beállítása..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Open_PGP titkosítás Be/Kikapcsolása"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Add Special _Notification..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Feliratkozás"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Engedélyezem neki, hogy lássa az állapotom"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Engedélyezem ennek a partnernek, hogy láthassa az állapotomat"
 
 #: ../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
-msgid "_Block"
-msgstr "_Tiltás"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "A_sk to see his/her status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "_Nem engedélyezem neki, hogy lássa az állapotom"
 
-#: ../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
-msgid "_History"
-msgstr "_Előzmények"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Figyelmen kívül hagy"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Tiltás"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Partner Kezelése"
+msgid "_Unignore"
+msgstr "_Figyelmen kívül hagyás kikapcsolása"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "Át_nevez..."
+msgid "_Ignore"
+msgstr "_Figyelmen kívül hagy"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Feliratkozás"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Eltá_volít"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Figyelmen kívül hagyás kikapcsolása"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Előzmények"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Töltse ki az ívet."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Szoba Konfiguráció"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Töltse ki az ívet."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Csoportok Szerkesztése"
@@ -1180,42 +1093,45 @@ msgstr "(<b>EMunkamenet</b> információ)"
 msgid "_Verify"
 msgstr "_Igazol"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Funkciók"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>A Gajimban lehetséges funkciók listája:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Funkciók"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "A list of active, completed and stopped file transfers"
+msgid "File Transfers"
+msgstr "Fileátvitelek"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Fileküldés megszakítása"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr "Shows a list of file transfers between you and others"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Megszakítja a kiválasztott fileátvitelt"
+msgid "file transfers list"
+msgstr "fileátvitelek listája"
 
 #: ../data/gui/filetransfers.ui.h:4
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Cancels the selected file transfer and removes incomplete file"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "A list of active, completed and stopped file transfers"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Tisztítás"
+#, fuzzy
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notify me when a file transfer is complete"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Fileátvitelek"
+#, fuzzy
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Show a pop-up notification when a file transfer is complete "
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Elrejti az ablakot"
+#, fuzzy
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Removes completed, cancelled and failed file transfers from the list"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
@@ -1223,102 +1139,115 @@ msgstr "Fileátvitel eltávolítása a listáról."
 
 #: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Removes completed, cancelled and failed file transfers from the list"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
 
 #: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr "Shows a list of file transfers between you and others"
+msgid "Clean _up"
+msgstr "_Tisztítás"
 
 #: ../data/gui/filetransfers.ui.h:11
-#, fuzzy
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
+msgid "_Pause"
+msgstr "_Szünet"
 
 #: ../data/gui/filetransfers.ui.h:12
 #, fuzzy
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Show a pop-up notification when a file transfer is complete "
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Cancels the selected file transfer and removes incomplete file"
 
 #: ../data/gui/filetransfers.ui.h:13
-#: ../src/filetransfers_window.py:788
-#, fuzzy
-msgid "_Continue"
-msgstr "_Continue"
+msgid "Cancel file transfer"
+msgstr "Fileküldés megszakítása"
 
 #: ../data/gui/filetransfers.ui.h:14
-#, fuzzy
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notify me when a file transfer is complete"
+msgid "Cancels the selected file transfer"
+msgstr "Megszakítja a kiválasztott fileátvitelt"
 
 #: ../data/gui/filetransfers.ui.h:15
-#: ../src/filetransfers_window.py:205
+msgid "Hides the window"
+msgstr "Elrejti az ablakot"
+
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+#, fuzzy
+msgid "_Continue"
+msgstr "_Continue"
+
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
 #, fuzzy
 msgid "_Open Containing Folder"
 msgstr "_Open Containing Folder"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Szünet"
-
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "fileátvitelek listája"
-
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Chatstate Tab Colours</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "Fiók sor"
 
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "Csoport sor"
+
 #: ../data/gui/gajim_themes_window.ui.h:3
-#: ../src/chat_control.py:925
-msgid "Bold"
-msgstr "Félkövér"
+msgid "Contact row"
+msgstr "Partner sor"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "Beszélgetés Banner"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Fogalmaz"
+#, fuzzy
+msgid "Gajim Themes Customization"
+msgstr "Gajim Themes Customisation"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "Partner sor"
+msgid "Text _color:"
+msgstr "Szöveg _színe:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Betűtípus stílusa:"
+msgid "_Background:"
+msgstr "_Háttér:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-#, fuzzy
-msgid "Gajim Themes Customization"
-msgstr "Gajim Themes Customisation"
+msgid "Text _font:"
+msgstr "Szöveg _betűtípusa:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Elment"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "Csoport sor"
+msgid "Font style:"
+msgstr "Betűtípus stílusa:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11
-#: ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inaktív"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Félkövér"
 
-#: ../data/gui/gajim_themes_window.ui.h:12
-#: ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Dőlt"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Szüneteltetve"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Fogalmaz"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inaktív"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Chatstate Tab Colours</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Elment"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1326,7 +1255,7 @@ msgstr ""
 "MUC\n"
 "Üzenetek"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1334,256 +1263,332 @@ msgstr ""
 "MUC Irányított\n"
 "Üzenetek"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Szüneteltetve"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Szöveg _színe:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Szöveg _betűtípusa:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Háttér:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Becenév _megváltoztatása..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Szoba _Kezelése"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "_Beszélgetőtéma megváltoztatása..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "_Szoba Beállítása..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4
-#: ../src/disco.py:1782
-msgid "_Bookmark"
-msgstr "_Könyvjelző"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "Szoba _törlése"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Szoba _Kezelése"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Tálcára helyezés bezáráskor"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Hang"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Könyvjelző"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derátor"
+msgid "_Send Private Message"
+msgstr "Privát Üzenet _Küldése"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "_File Küldése"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "Occupant Actions"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "_File Küldése"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Hozzáadás a Főablakhoz"
+msgid "_Voice"
+msgstr "_Hang"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derátor"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Tag"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Ban"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Tulajdonos"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Kick"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Tag"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Tulajdonos"
+msgid "_Ban"
+msgstr "_Ban"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "Privát Üzenet _Küldése"
+msgid "_Add to Roster"
+msgstr "_Hozzáadás a Főablakhoz"
 
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Hang"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Szoba felvétele a _könyvjelzők közé"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Új bejegyzés létrehozása"
 
 #: ../data/gui/groups_post_window.ui.h:2
-#: ../src/common/helpers.py:258
-msgid "From"
-msgstr "Feladó"
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Feladó:"
 
-#. holds subject
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tárgy"
+#: ../data/gui/single_message_window.ui.h:4
+msgid "Subject:"
+msgstr "Tárgy:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
-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."
-msgstr ""
-"<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."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim History Logs Manager"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 #, fuzzy
 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
-msgid "Delete"
-msgstr "Törlés"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Exportálás"
-
-#: ../data/gui/history_manager.ui.h:6
-#, fuzzy
-msgid "Gajim History Logs Manager"
-msgstr "Gajim History Logs Manager"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 #, fuzzy
 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 ""
-"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."
+
+#: ../data/gui/history_manager.ui.h:6
+#, fuzzy
+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."
+msgstr ""
+"<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."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Keresés az Adatbázisban"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "All Chat Histories"
-
-#: ../data/gui/history_window.ui.h:2
-#: ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Beszélgetés Előzmények"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Exportálás"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "Írja be a Jabber azonosítót, vagy a partner nevét"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Groupchat Histories"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "All Chat Histories"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Beszélgetés Előzmények"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Keresés:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Beszélgetés _naplózása"
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Szobák Bön_gészése"
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Log status changes of contacts"
 
-#: ../data/gui/join_groupchat_window.ui.h:3
-#: ../src/dialogs.py:2180
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+#, fuzzy
+msgid "otr"
+msgstr "Hot"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "Jabber Azonosító"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+#, fuzzy
+msgid "body"
+msgstr "mindkenki"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+msgid "message"
+msgstr "üzenet"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+msgid "stream"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "require"
+msgstr ""
+
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Join this room _automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Szoba:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Becenév:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Legutóbbi:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Legutóbbi:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Join this room _automatically when I connect"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Szoba:"
+msgid "_Bookmark this room"
+msgstr "Szoba felvétele a _könyvjelzők közé"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-#: ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Szerver:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "Szoba felvétele a _könyvjelzők közé"
+msgid "Bro_wse Rooms"
+msgstr "Szobák Bön_gészése"
 
-#: ../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/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Csatlakozás"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automatikus csatlakozás"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Ha be van pipálva, induláskor a Gajim automatikusan csatlakozni fog ehhez a csoportos beszélgetéshez"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Könyvjelzők kezelése"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Tálcára helyezés automatikus csatlakozáskor"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Cím:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Print status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatikus csatlakozás"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Ha be van pipálva, induláskor a Gajim automatikusan csatlakozni fog ehhez a "
+"csoportos beszélgetéshez"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Cím:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Tálcára helyezés automatikus csatlakozáskor"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1594,72 +1599,137 @@ msgid "_Configure"
 msgstr "_Beállítás"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Tulajdonságok</b>"
+msgid "HTTP Connect"
+msgstr "HTTP Csatlakozás"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Beállítások</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP Csatlakozás"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 #, fuzzy
 msgid "Manage Proxy Profiles"
 msgstr "Manage Proxy Profiles"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Típus:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Jel_szó:"
+msgid "_Name:"
+msgstr "_Név:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxy _Hoszt:"
+msgid "<b>Properties</b>"
+msgstr "<b>Tulajdonságok</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgid "Use HTTP prox_y"
+msgstr "HTTP prox_y használata"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "HTTP prox_y használata"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Use proxy auth_entication"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Felhasználónév:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "Jel_szó:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Név:"
+msgid "Proxy _Host:"
+msgstr "Proxy _Hoszt:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Típus:"
+msgid "Proxy _Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Felhasználónév:"
+msgid "<b>Settings</b>"
+msgstr "<b>Beállítások</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Partnerek _kezelése"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 #, fuzzy
 msgid "Passphrase"
 msgstr "Passphrase"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "Install from zip"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Verzió:"
+
+#: ../data/gui/plugins_window.ui.h:5
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Authors:"
+msgstr "_Engedélyez"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Weboldal:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "homepage url"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Description:"
+msgstr "Leírás: "
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+#, fuzzy
+msgid "Configure"
+msgstr "_Beállítás"
+
+#: ../data/gui/plugins_window.ui.h:12
+#, fuzzy
+msgid "Installed"
+msgstr "Várakozás"
+
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
 msgstr "Esemény típusa"
@@ -1669,973 +1739,1057 @@ msgid "Event desc"
 msgstr "Esemény leírása"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Bővített konfigurációszerkesztő</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Always use KDE default applications"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Alkalmazások</b>"
+msgid "Custom"
+msgstr "Egyéni"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Hang</b>"
+msgid "All chat states"
+msgstr "Minden beszélgetésállapot"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatikus állapot</b>"
+msgid "Composing only"
+msgstr "Csak fogalmazás"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Beszélgetés kinézete</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Kikapcsolva"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Chat Line Colours</b>"
+msgid "Never"
+msgstr "Soha"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Chat state notifications</b>"
+msgid "Only when pending events"
+msgstr "Csak függő eseményeknél"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Kapcsolat</b>"
+msgid "Always"
+msgstr "Mindig"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "Ugorjon fel"
 
-#. 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>Egyéni</b>"
+msgid "Notify me about it"
+msgstr "Figyelmeztessen róla"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Betűtípus</b>"
+msgid "Show only in roster"
+msgstr "Csak a főablakban jelenítse meg"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Opciók</b>"
+msgid "Detached roster with detached chats"
+msgstr "Külön főablak külön beszélgetőablakokkal"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "Külön főablak egy közös beszélgetőablakkal"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Preset Status Messages</b>"
+msgid "Single window for everything"
+msgstr "Egy ablak mindenre"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Magánélet</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "Külön főablak fiók szerint csoportosított beszélgetésekkel"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Főablak kinézete</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "Külön főablak típus szerint csoportosított beszélgetésekkel"
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Legutóbbi állapot: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Állapotüzenetek</b>"
+msgid "Preferences"
+msgstr "Tulajdonságok"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Témák</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Partnerek a_vatarjainak megjelenítése a főablakban"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>Videó</b>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"If ticked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Képi értesítések</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Partnerek állapotüz_eneteinek megjelenítése a főablakban"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(példa: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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:23
-msgid "Advanced"
-msgstr "Haladó"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Partnerek tartózkodási _helyének megjelenítése a főablakban"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Haladó..."
+#, fuzzy
+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:25
-msgid "All chat states"
-msgstr "Minden beszélgetésállapot"
+msgid "Sort contacts by status"
+msgstr "Partnerek állapot szerinti rendezése"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Engedélyezi az _Operációs rendszer típusának küldését"
+msgid "in _roster"
+msgstr "_főablakban"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "Engedélyezi a -tétlen idő küldését"
+msgid "in _group chats"
+msgstr "_csoportos beszélgetésekben"
 
 #: ../data/gui/preferences_window.ui.h:28
-#, fuzzy
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Főablak kinézete</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Engedélyezze a hangokat _elfoglalt állapotban"
+msgid "_Window behavior:"
+msgstr "_Ablak viselkedés:"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "Mindig"
+#, fuzzy
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr "Mindig a GNOME alapértelmezett alkalmazásait használja"
+msgid "_Emoticons:"
+msgstr "_Hangulatjelek:"
 
 #: ../data/gui/preferences_window.ui.h:32
 #, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Always use KDE default applications"
+msgid "Ma_ke message windows compact"
+msgstr "Ma_ke message windows compact"
 
 #: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Always use Xfce default applications"
+msgid "Hide all buttons in chat windows"
+msgstr "Összes gomb elrejtése a beszélgetőablakokban"
 
 #: ../data/gui/preferences_window.ui.h:34
 #, fuzzy
-msgid "Ask status message when I:"
-msgstr "Ask status message when I:"
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignore rich content in incoming messages"
 
 #: ../data/gui/preferences_window.ui.h:35
-#: ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr "Hang / Videó"
+#, fuzzy
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Audio input device"
-msgstr "Hangbemeneti eszköz"
+msgid "_Highlight misspelled words"
+msgstr "_Félregépelt szavak kiemelése"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Audio output device"
-msgstr "Hangkimeneti eszköz"
+#, fuzzy
+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 ""
+"If ticked, 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."
 
 #: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Autodetect on every Gajim startup"
+msgid "_Show roster on startup:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Chat message:"
-msgstr "Beszélgetés üzenet:"
-
-#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Check on startup if Gajim is the _default Jabber client"
+msgid "Show icon when your messages are received"
+msgstr "Sound to play when any MUC message arrives."
 
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Composing only"
-msgstr "Csak fogalmazás"
+#: ../data/gui/preferences_window.ui.h:40
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Beszélgetés kinézete</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Configure color and font of the interface"
-msgstr "A felhasználói felület színének és betűtípusának beállítása"
+msgid "When new event is received:"
+msgstr "Ha új esemény érkezik:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Contact's message:"
-msgstr "Partner üzenete:"
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notify me about contacts that sign _in"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Contact's nickname:"
-msgstr "Partner beceneve:"
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notify me about contacts that sign _out"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Custom"
-msgstr "Egyéni"
+#, fuzzy
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+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:46
-msgid "Detached roster with chat grouped by account"
-msgstr "Külön főablak fiók szerint csoportosított beszélgetésekkel"
+#, fuzzy
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Detached roster with chat grouped by type"
-msgstr "Külön főablak típus szerint csoportosított beszélgetésekkel"
+#, fuzzy
+msgid "Notify on new _GMail email"
+msgstr "Notify on new _GMail email"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Detached roster with detached chats"
-msgstr "Külön főablak külön beszélgetőablakokkal"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"If ticked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 
 #: ../data/gui/preferences_window.ui.h:49
-msgid "Detached roster with single chat"
-msgstr "Külön főablak egy közös beszélgetőablakkal"
+msgid "Display _extra email details"
+msgstr "_Extra email részletek megjelenítése"
 
 #: ../data/gui/preferences_window.ui.h:50
-#: ../src/config.py:170
-#: ../src/config.py:671
-msgid "Disabled"
-msgstr "Kikapcsolva"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"If ticked, Gajim will also include information about the sender of the new e-"
+"mails"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display _activity of contacts in roster"
-msgstr "Partnerek _tevékenységeinek megjelenítése a főablakban"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Opciók</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display _extra email details"
-msgstr "_Extra email részletek megjelenítése"
+msgid "Show notification area icon:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display _location of contacts in roster"
-msgstr "Partnerek tartózkodási _helyének megjelenítése a főablakban"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Képi értesítések</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-msgid "Display _tunes of contacts in roster"
-msgstr "Partnerek által hallgatott _zenék számcímeinek megjelenítése a főablakban"
+msgid "Play _sounds"
+msgstr "_Hangok lejátszása"
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid "Display a_vatars of contacts in roster"
-msgstr "Partnerek a_vatarjainak megjelenítése a főablakban"
+msgid "Ma_nage..."
+msgstr "Ke_zelés..."
 
 #: ../data/gui/preferences_window.ui.h:56
-msgid "Display m_ood of contacts in roster"
-msgstr "Partnerek h_angulatának megjelenítése a főablakban"
+msgid "Allow sound when I'm _busy"
+msgstr "Engedélyezze a hangokat _elfoglalt állapotban"
 
 #: ../data/gui/preferences_window.ui.h:57
-msgid "Display status _messages of contacts in roster"
-msgstr "Partnerek állapotüz_eneteinek megjelenítése a főablakban"
+msgid "<b>Sounds</b>"
+msgstr "<b>Hangok</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-#, fuzzy
-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 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."
+msgid "Notifications"
+msgstr "Figyelmeztetések"
 
 #: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
-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 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."
+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 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."
 
 #: ../data/gui/preferences_window.ui.h:60
 #, fuzzy
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim will notify you via a pop-up window in the bottom right of the screen about contacts that just signed out"
+msgid "_Display chat state notifications:"
+msgstr "_Display chat state notifications:"
+
+#: ../data/gui/preferences_window.ui.h:61
+#, fuzzy
+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 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."
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid "Hide all buttons in chat windows"
-msgstr "Összes gomb elrejtése a beszélgetőablakokban"
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "_Send chat state notifications:"
 
 #: ../data/gui/preferences_window.ui.h:63
-#, fuzzy
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr "If ticked, Gajim will allow others to detect the operation system you are using"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Chat state notifications</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
-#, fuzzy
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "If ticked, Gajim will also include information about the sender of the new e-mails"
+msgid "Personal Events"
+msgstr "Személyes események"
 
 #: ../data/gui/preferences_window.ui.h:65
-#, fuzzy
-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."
+msgid "_Away after:"
+msgstr "_Távol miután:"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "If ticked, Gajim will change status to Not Available when the computer has not been used even longer"
+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:67
-#, fuzzy
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "If ticked, Gajim will display avatars of contacts in roster window and in group chats"
+msgid "_Not available after:"
+msgstr "_Nem elérhető miután:"
 
 #: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "If ticked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+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:69
-#, fuzzy
-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"
+msgid "minutes"
+msgstr "perc"
 
 #: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "If ticked, Gajim will display the location of contacts in the roster window"
-
-#: ../data/gui/preferences_window.ui.h:71
-#, fuzzy
-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
-#, fuzzy
-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"
+msgid ""
+"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 ""
+"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"
 
 #: ../data/gui/preferences_window.ui.h:73
 #, fuzzy
-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 "If ticked, 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."
-
-#: ../data/gui/preferences_window.ui.h:74
-#, fuzzy
-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 "If ticked, Gajim will ignore incoming events from unauthorised contacts. Use with caution, because it blocks all messages from any contact that is not in the roster"
-
-#: ../data/gui/preferences_window.ui.h:75
-#, fuzzy
-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 "If ticked, 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."
+msgid ""
+"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 ""
+"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"
 
 #: ../data/gui/preferences_window.ui.h:76
-#, fuzzy
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
-msgstr "If ticked, Gajim will show a notification when a new e-mail is received via GMail"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatikus állapot</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
-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 "If ticked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent MSN icon for status online, away, busy, etc...)"
+msgid "Ask status message when I:"
+msgstr "Ask status message when I:"
 
 #: ../data/gui/preferences_window.ui.h:78
-#, fuzzy
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
-msgstr "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
+msgid "Sign _in"
+msgstr "_Bejelentkezés"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
+msgid "Sign _out"
+msgstr "_Kijelentkezés"
 
 #: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
-msgid "Log _encrypted chat session"
-msgstr "Log _encrypted chat session"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Ma_ke message windows compact"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Állapotüzenetek</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Ma_nage..."
-msgstr "Ke_zelés..."
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Preset Status Messages</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Never"
-msgstr "Soha"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Állapot"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notifications"
-msgstr "Figyelmeztetések"
+msgid "Use system _default"
+msgstr "Rendszer _alapértelmezésének hanszálata"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Notify me about contacts that sign _in"
+msgid "Chat message:"
+msgstr "Beszélgetés üzenet:"
 
 #: ../data/gui/preferences_window.ui.h:86
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Notify me about contacts that sign _out"
+msgid "<b>Font</b>"
+msgstr "<b>Betűtípus</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Notify me about it"
-msgstr "Figyelmeztessen róla"
+msgid "Use _transports icons"
+msgstr "_Transport ikonok használata"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Notify on new _GMail email"
-msgstr "Notify on new _GMail email"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"If ticked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent MSN icon for status online, away, busy, "
+"etc...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Only when pending events"
-msgstr "Csak függő eseményeknél"
+msgid "Status _iconset:"
+msgstr "Állapo _ikonkészlet:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid "Personal Events"
-msgstr "Személyes események"
+msgid "Configure color and font of the interface"
+msgstr "A felhasználói felület színének és betűtípusának beállítása"
 
 #: ../data/gui/preferences_window.ui.h:91
-msgid "Play _sounds"
-msgstr "_Hangok lejátszása"
+msgid "T_heme:"
+msgstr "Té_ma:"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "Pop it up"
-msgstr "Ugorjon fel"
+msgid "<b>Themes</b>"
+msgstr "<b>Témák</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Preferences"
-msgstr "Tulajdonságok"
+msgid "Contact's nickname:"
+msgstr "Partner beceneve:"
 
 #: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
+msgid "Your nickname:"
+msgstr "Beceneved:"
+
+#: ../data/gui/preferences_window.ui.h:95
+msgid "_Status message:"
+msgstr "_Állapot üzenet:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "STUN server:"
-msgstr "STUN szerver:"
+msgid "_URL highlight:"
+msgstr "_URL kiemelés:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Show only in roster"
-msgstr "Csak a főablakban jelenítse meg"
+msgid "_Reset to Default Colors"
+msgstr "_Alapértelmezett színek visszaállítása"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Tálca mutatása:"
+msgid "Contact's message:"
+msgstr "Partner üzenete:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sign _in"
-msgstr "_Bejelentkezés"
+msgid "Your message:"
+msgstr "Üzeneted:"
 
 #: ../data/gui/preferences_window.ui.h:100
-msgid "Sign _out"
-msgstr "_Kijelentkezés"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Közös beszélgetés üzenet kiemelése"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Single window for everything"
-msgstr "Egy ablak mindenre"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Chat Line Colours</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
-#, fuzzy
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Some messages may include rich content (formatting, colours etc). If ticked, Gajim will just display the raw message text."
+msgid "Style"
+msgstr "Stílus"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "Sort contacts by status"
-msgstr "Partnerek állapot szerinti rendezése"
+msgid "Audio input device"
+msgstr "Hangbemeneti eszköz"
 
 #: ../data/gui/preferences_window.ui.h:104
-#: ../src/config.py:391
-msgid "Status"
-msgstr "Állapot"
+msgid "Audio output device"
+msgstr "Hangkimeneti eszköz"
 
 #: ../data/gui/preferences_window.ui.h:105
-msgid "Status _iconset:"
-msgstr "Állapo _ikonkészlet:"
+msgid "<b>Audio</b>"
+msgstr "<b>Hang</b>"
 
 #: ../data/gui/preferences_window.ui.h:106
-msgid "Style"
-msgstr "Stílus"
+msgid "Video input device"
+msgstr "Videó bemeneti eszköz"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid "T_heme:"
-msgstr "Té_ma:"
+msgid "Video output device"
+msgstr "Videó kimeneti eszköz"
 
 #: ../data/gui/preferences_window.ui.h:108
-#, fuzzy
-msgid ""
-"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"
+msgid "Video framerate"
+msgstr "Videó képkockasebesség"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "Videó mérete"
+
+#: ../data/gui/preferences_window.ui.h:110
+msgid "View own video source"
 msgstr ""
-"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"
 
 #: ../data/gui/preferences_window.ui.h:111
+msgid "<b>Video</b>"
+msgstr "<b>Videó</b>"
+
+#: ../data/gui/preferences_window.ui.h:112
+msgid "STUN server:"
+msgstr "STUN szerver:"
+
+#: ../data/gui/preferences_window.ui.h:113
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(példa: stunserver.org)</i>"
+
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid ""
-"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"
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
-"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"
-
-#: ../data/gui/preferences_window.ui.h:114
-msgid "Use _transports icons"
-msgstr "_Transport ikonok használata"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Use system _default"
-msgstr "Rendszer _alapértelmezésének hanszálata"
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video framerate"
-msgstr "Videó képkockasebesség"
+msgid "<b>Connection</b>"
+msgstr "<b>Kapcsolat</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "Video input device"
-msgstr "Videó bemeneti eszköz"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Hang / Videó"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Video output device"
-msgstr "Videó kimeneti eszköz"
+msgid "_File manager:"
+msgstr "_Filekezelő:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Video size"
-msgstr "Videó mérete"
+msgid "_Mail client:"
+msgstr "_Levelezőkliens:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "When new event is received:"
-msgstr "Ha új esemény érkezik:"
-
-#: ../data/gui/preferences_window.ui.h:121
-msgid "Your message:"
-msgstr "Üzeneted:"
+msgid "_Browser:"
+msgstr "_Böngésző:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "Your nickname:"
-msgstr "Beceneved:"
+msgid "<b>Custom</b>"
+msgstr "<b>Egyéni</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Away after:"
-msgstr "_Távol miután:"
+msgid "<b>Applications</b>"
+msgstr "<b>Alkalmazások</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_Browser:"
-msgstr "_Böngésző:"
+#, fuzzy
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignore events from contacts not in the roster"
 
 #: ../data/gui/preferences_window.ui.h:125
 #, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "_Display chat state notifications:"
+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 ""
+"If ticked, Gajim will ignore incoming events from unauthorised contacts. Use "
+"with caution, because it blocks all messages from any contact that is not in "
+"the roster"
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Emoticons:"
-msgstr "_Hangulatjelek:"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Engedélyezi az _Operációs rendszer típusának küldését"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_File manager:"
-msgstr "_Filekezelő:"
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Highlight misspelled words"
-msgstr "_Félregépelt szavak kiemelése"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Engedélyezi az _Operációs rendszer típusának küldését"
 
 #: ../data/gui/preferences_window.ui.h:129
 #, fuzzy
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignore events from contacts not in the roster"
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignore rich content in incoming messages"
+msgid "Log _encrypted chat session"
+msgstr "Log _encrypted chat session"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Log status changes of contacts"
-msgstr "_Log status changes of contacts"
+#, fuzzy
+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 ""
+"If ticked, 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."
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Mail client:"
-msgstr "_Levelezőkliens:"
+msgid "Allow my _idle time to be sent"
+msgstr "Engedélyezi a -tétlen idő küldését"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Not available after:"
-msgstr "_Nem elérhető miután:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Open..."
-msgstr "_Megnyitás..."
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Reset to Default Colors"
-msgstr "_Alapértelmezett színek visszaállítása"
+msgid "<b>Privacy</b>"
+msgstr "<b>Magánélet</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-#, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "_Send chat state notifications:"
+msgid "_Log status changes of contacts"
+msgstr "_Log status changes of contacts"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "_Status message:"
-msgstr "_Állapot üzenet:"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "_URL highlight:"
-msgstr "_URL kiemelés:"
+#, fuzzy
+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:139
-msgid "_Window behavior:"
-msgstr "_Ablak viselkedés:"
+msgid "_Open..."
+msgstr "_Megnyitás..."
 
 #: ../data/gui/preferences_window.ui.h:140
-msgid "in _group chats"
-msgstr "_csoportos beszélgetésekben"
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Bővített konfigurációszerkesztő</b>"
 
 #: ../data/gui/preferences_window.ui.h:141
-msgid "in _roster"
-msgstr "_főablakban"
-
-#: ../data/gui/preferences_window.ui.h:142
-msgid "minutes"
-msgstr "perc"
+msgid "Advanced"
+msgstr "Haladó"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Magánéleti listák:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Szabály Hozzáadása / Szerkesztése</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Magánéleti lista"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Szabályok listája</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Magánéleti lista</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktív ebben a munkamenetben"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktív minden induláskor"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Szabályok listája</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Összes"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Szabály Hozzáadása / Szerkesztése</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Összes (beleértve a feliratkozást)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Engedélyez"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Elutasít"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Jabber Azonosító"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "összes a csoportban"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Sorrend:"
+msgid "all by subscription"
+msgstr "összes feliratkozás szerint"
 
 #: ../data/gui/privacy_list_window.ui.h:12
-#: ../src/dialogs.py:3436
-msgid "Privacy List"
-msgstr "Magánéleti lista"
+msgid "All"
+msgstr "Összes"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "összes feliratkozás szerint"
+msgid "to send me messages"
+msgstr "hogy üzeneteket küldjön nekem"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "összes a csoportban"
+msgid "to send me queries"
+msgstr "hogy kéréseket küldjön nekem"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "minkettő"
+msgid "to view my status"
+msgstr "hogy láthassa az állapotomat"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "tól/től"
+msgid "to send me status"
+msgstr "hogy állapotokat küldjön nekem"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "egyik sem"
+msgid "All (including subscription)"
+msgstr "Összes (beleértve a feliratkozást)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "nak/nek"
+msgid "Order:"
+msgstr "Sorrend:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "hogy üzeneteket küldjön nekem"
+msgid "none"
+msgstr "egyik sem"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "hogy kéréseket küldjön nekem"
+msgid "both"
+msgstr "minkettő"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "hogy állapotokat küldjön nekem"
+msgid "from"
+msgstr "tól/től"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "hogy láthassa az állapotomat"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Cím</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+msgid "to"
+msgstr "nak/nek"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Születésnap:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Város:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Család:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Cég:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Ország:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Középső név:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Részleg:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Előtag:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Extra Cím:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Keresztnév:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Család:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Szuffixum:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Teljes Név</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Utca:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Keresztnév:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Város:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Weboldal:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Megye:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Extra Cím:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Középső név:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Irányítószám:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Név:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Ország:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Becenév:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Cím</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefonszám:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Weboldal:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Beosztás:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Név:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Irányítószám:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Becenév:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefonszám:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Előtag:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formátum: ÉÉÉÉ-HH-NN"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Szerep:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Születésnap:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Megye:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Utca:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Kattints az avatarod beállításához"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Szuffixum:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Személyes információk"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Cég:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Magamról"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Beosztás:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Kattints az avatarod beállításához"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Részleg:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formátum: ÉÉÉÉ-HH-NN"
+msgid "<b>Role:</b>"
+msgstr "<b>Szerep:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Személyes információk"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Munka"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Mit szeretnél csinálni?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Magamról"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Fiók eltávolítása _csak a Gajim-ból"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Fiók eltávolítása a Gajim-ból és a _szerverről is"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Mit szeretnél csinálni?</b>"
+
 #. 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:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
 #: ../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>valaki@valahol.hu</b> azt szeretné, hogy <b>vegyél fel</b> néhány ismerőst a névsorodba."
+msgid "Roster Item Exchange"
+msgstr "Névsor elem cseréje"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Szövegtörzs <jelenleg nincs használatba, ezért alapértelmezetten rejtve van>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+"<b>valaki@valahol.hu</b> azt szeretné, hogy <b>vegyél fel</b> néhány "
+"ismerőst a névsorodba."
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Névsor elem cseréje"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Partner felvétele..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr ""
+"Szövegtörzs <jelenleg nincs használatba, ezért alapértelmezetten rejtve van>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "_Fuckciók"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "Mű_veletek"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Fileá_tvitelek"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Partner felvétele..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Gyakran Ismételt Kérdések (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Szerkesztés"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Online segítség"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Fiókok"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Show Only _Active Contacts"
-msgstr "Csak az _aktív partnereket mutassa"
+#: ../data/gui/roster_window.ui.h:12
+msgid "P_lugins"
+msgstr ""
 
-#: ../data/gui/roster_window.ui.h:10
-msgid "Show Trans_ports"
-msgstr "Mutassa a transzportokat"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Nézet"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:14
 msgid "Show _Offline Contacts"
 msgstr "Mutassa a kijelentkezett partnereket"
 
-#: ../data/gui/roster_window.ui.h:12
-#: ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:15
+msgid "Show Only _Active Contacts"
+msgstr "Csak az _aktív partnereket mutassa"
+
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
+msgstr "Mutassa a transzportokat"
+
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Névsor mutatása"
 
-#: ../data/gui/roster_window.ui.h:13
-msgid "_Accounts"
-msgstr "_Fiókok"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Fileá_tvitelek"
 
-#. 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/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "Mű_veletek"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Súgó"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Tartalomjegyzék"
 
-#: ../data/gui/roster_window.ui.h:18
-#: ../src/disco.py:1502
-msgid "_Edit"
-msgstr "_Szerkesztés"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Online segítség"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_GyIK"
 
-#: ../data/gui/roster_window.ui.h:20
-msgid "_Help"
-msgstr "_Súgó"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Gyakran Ismételt Kérdések (online)"
 
-#: ../data/gui/roster_window.ui.h:22
-msgid "_Send Single Message..."
-msgstr "_Levél küldése..."
+#: ../data/gui/roster_window.ui.h:25
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/roster_window.ui.h:24
-msgid "_View"
-msgstr "_Nézet"
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Fuckciók"
 
 #: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Kérlek várj amíg a kereső űrlapot lekérem..."
-
-#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Keresés"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Kérlek várj amíg a kereső űrlapot lekérem..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Partner _hozzáadása"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4
-#: ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Információ"
 
-#: ../data/gui/search_window.ui.h:5
-#: ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Keresés"
 
@@ -2655,301 +2809,315 @@ msgstr "Regisztráció ide: "
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Feladó:"
-
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Válasz erre az üzenetre"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Címzett:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Küldés"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Üzenet küldése"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Üzenet küldése és az ablak bezárása"
-
 #: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tárgy:"
+msgid "_Reply"
+msgstr "_Válasz"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Címzett:"
+msgid "Reply to this message"
+msgstr "Válasz erre az üzenetre"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Válasz"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Küld & Bezár"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Üzenet küldése és az ablak bezárása"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Engedélyez"
+msgid "Subscription Request"
+msgstr "Feliratkozási kérelem"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Partner engedélyezése, hogy lássa a csatlakozásod"
+msgid "_Deny"
+msgstr "_Elutasít"
 
 #: ../data/gui/subscription_request_window.ui.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Engedélyezés elutasítása a partnertől, tehát nem fogja tudni hogy csatlakozva vagy-e"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Engedélyezés elutasítása a partnertől, tehát nem fogja tudni hogy "
+"csatlakozva vagy-e"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Feliratkozási kérelem"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Engedélyez"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Elutasít"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Partner engedélyezése, hogy lássa a csatlakozásod"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Partnerek szinkronizálása"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Válaszd ki a fiókot amellyel szinkronizálni szeretnél"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Válaszd ki a partnereket akikkel szinkronizálni akarsz"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Szonkronizálás : válassz partnereket"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Hangok némítása"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "_Levél küldése"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Összes függő esemény mutatása"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Válaszd ki a partnereket akikkel szinkronizálni akarsz"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Á_llapot"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Csoportos beszélgetés"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Kérdez:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "_Levél küldése"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Kliens:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Összes függő esemény mutatása"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Kapcsolat ideje:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Hangok némítása"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Személyes információk"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber Azonosító:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Erőforrás:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Feliratkozás:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Kliens:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Rendszer:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Megjegyzések"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Kapcsolat ideje:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Beállított avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Partner"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Feliratkozás:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Személyes információk"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Kérdez:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Több"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Felhasználói avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Partner"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Szűrő</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Megjegyzések"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber forgalom</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML bemenet</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "Bejövő stanzák elrejtése"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "IQ stanzák elrejtése"
+msgid "Hide OUT stanzas"
+msgstr "Kimenő stanzák elrejtése"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "Üzenet stanzák elrejtése"
+msgid "Hide Presence stanzas"
+msgstr "Jelenléti stanzák elrejtése"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "Kimenő stanzák elrejtése"
+msgid "Hide IQ stanzas"
+msgstr "IQ stanzák elrejtése"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "Jelenléti stanzák elrejtése"
+msgid "Hide Message stanzas"
+msgstr "Üzenet stanzák elrejtése"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Lekérdezés"
+msgid "<b>Filter</b>"
+msgstr "<b>Szűrő</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Lekérdezés"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Jelenlét"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "Ü_zenet"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Jelenlét"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML bemenet</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "Fiók _módosítása..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Helyi Jabber Azonosító:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Személyes"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Erőforrás:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Állapot:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Egy GTK+ Jabber kliens"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Személyes"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Azonnali Üzenetküldő"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber Azonnali üzenetküldő kliens"
 
-#: ../src/adhoc_commands.py:314
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Egy GTK+ Jabber kliens"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Megerősítés megszakítása"
 
-#: ../src/adhoc_commands.py:315
-msgid "You are in process of executing command. Do you really want to cancel it?"
-msgstr "Folyamatban van egy futó parancs. Biztos, hogy meg szeretnéd szakítani?"
+#: ../src/adhoc_commands.py:326
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+"Folyamatban van egy futó parancs. Biztos, hogy meg szeretnéd szakítani?"
+
+#: ../src/adhoc_commands.py:372
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Érvénytelen szoba"
+
+#: ../src/adhoc_commands.py:373
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "A becenévben nem megengedett karakterek vannak."
 
-#: ../src/adhoc_commands.py:351
-#: ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 #, fuzzy
 msgid "Service sent malformed data"
 msgstr "Service sent malformed data"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "A szolgáltatás megváltoztatta a munkamenet azonosítóját."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "A szolgáltatás hibát jelzett."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktiválva"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Kikapcsolva"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Eldöntendő"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Egész szám"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Szöveg"
 
-#: ../src/advanced_configuration_window.py:96
-#: ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Szín"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Beállítás neve"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Érték"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Típus"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Nincs)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Rejtett"
 
@@ -2960,252 +3128,185 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Új bejegyzések érkeztek (ebből %d nem jelent meg):"
 msgstr[1] "Új bejegyzések érkeztek (ebből %d nem jelent meg):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
-msgid "English"
-msgstr "Angol"
-
-#: ../src/chat_control.py:75
-msgid "Belarusian"
-msgstr "Fehérorosz"
-
-#: ../src/chat_control.py:75
-msgid "Bulgarian"
-msgstr "Bulgár"
-
-#: ../src/chat_control.py:75
-msgid "Breton"
-msgstr "Breton"
-
-#: ../src/chat_control.py:75
-msgid "Czech"
-msgstr "Cseh"
-
-#: ../src/chat_control.py:75
-msgid "German"
-msgstr "Német"
-
-#: ../src/chat_control.py:75
-msgid "Greek"
-msgstr "Görög"
-
-#: ../src/chat_control.py:75
-msgid "British"
-msgstr "Brit"
-
-#: ../src/chat_control.py:75
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:75
-msgid "Spanish"
-msgstr "Spanyol"
-
-#: ../src/chat_control.py:75
-msgid "Basque"
-msgstr "Baszk"
-
-#: ../src/chat_control.py:75
-msgid "French"
-msgstr "Francia"
-
-#: ../src/chat_control.py:75
-msgid "Croatian"
-msgstr "Horvát"
-
-#: ../src/chat_control.py:75
-msgid "Italian"
-msgstr "Olasz"
-
-#: ../src/chat_control.py:75
-msgid "Norwegian (b)"
-msgstr "Norvég (b)"
-
-#: ../src/chat_control.py:75
-msgid "Dutch"
-msgstr "Dán"
-
-#: ../src/chat_control.py:75
-msgid "Norwegian"
-msgstr "Norvég"
-
-#: ../src/chat_control.py:75
-msgid "Polish"
-msgstr "Lengyel"
-
-#: ../src/chat_control.py:75
-msgid "Portuguese"
-msgstr "Portugál"
-
-#: ../src/chat_control.py:75
-msgid "Brazilian Portuguese"
-msgstr "Brazíliai portugál"
-
-#: ../src/chat_control.py:75
-msgid "Russian"
-msgstr "Orosz"
-
-#: ../src/chat_control.py:75
-msgid "Serbian"
-msgstr "Szerb"
-
-#: ../src/chat_control.py:75
-msgid "Slovak"
-msgstr "Szlovák"
-
-#: ../src/chat_control.py:75
-msgid "Swedish"
-msgstr "Svéd"
-
-#: ../src/chat_control.py:75
-msgid "Chinese (Ch)"
-msgstr "Kínai (Ch)"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:75
-msgid "Hungarian"
-msgstr "Magyar"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:479
-msgid "Spelling language"
-msgstr "Beszélt nyelv"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Hiba."
 
 #. we are not connected
-#: ../src/chat_control.py:511
-#: ../src/chat_control.py:720
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Egy kapcsolat nem elérhető"
 
-#: ../src/chat_control.py:512
-#: ../src/chat_control.py:721
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Az üzenet addig nem küldhető el, amíg nem csatlakozol."
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Aláhúzás"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Áthúzás"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Betűtípus"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Formázás törlése"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Biztosan elküldöd a file-t?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Ha egy filet küldesz neki: %s, akkor tudni fogja a valós Jabber Azonosítód."
+msgstr ""
+"Ha egy filet küldesz neki: %s, akkor tudni fogja a valós Jabber Azonosítód."
 
-#: ../src/chat_control.py:1503
-#: ../src/chat_control.py:1987
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG titkosítás engedélyezve"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Ez a partner nem támogatja a fileátvitelt."
+
 #. Add to roster
-#: ../src/chat_control.py:1528
-#: ../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/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/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Nincs a névsorban"
 
-#: ../src/chat_control.py:1558
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Ez a funkció nem elérhető Windowson."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "_File Küldése"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Ez a partner nem támogatja a fileátvitelt."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr "Tudnod kell a partner valós Jabber Azonosítóját, hogy filet küldhess neki."
+msgstr ""
+"Tudnod kell a partner valós Jabber Azonosítóját, hogy filet küldhess neki."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1906
 #, fuzzy, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)ok állapot : %(state)ok, indok: %(reason)s"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:2098
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)ek a csoportos beszélgetésből %(room_name)ek"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1967
-#: ../src/dialogs.py:4866
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Nincs GPG kulcs hozzárendelve"
 
-#: ../src/chat_control.py:1968
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Nincs GPG kulcs hozzárendelve ehhez a partnerhez, így nem lehet GPG titkosítással kódolni az üzeneteket."
+#: ../src/chat_control.py:2230
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
+msgstr ""
+"Nincs GPG kulcs hozzárendelve ehhez a partnerhez, így nem lehet GPG "
+"titkosítással kódolni az üzeneteket."
 
-#: ../src/chat_control.py:1977
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG titkosítás kikapcsolva"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "A munkamenet NAPLÓZVA LESZ"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "A munkamenet NEM LESZ naplózva"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "van"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "nincs"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "fog"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NEM fog"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "és hitelesített"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2294
 msgid "and NOT authenticated"
 msgstr "és NEM hitelesített"
 
 #. 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:2301
 #, fuzzy, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3214,298 +3315,665 @@ msgstr ""
 "%(type)ok titkosítás %(status)ok aktív %(authenticated)s.\n"
 "A beszélgetési munkamenet %(logged)k naplózot(ak)."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Munkamenet létrehozása megszakítva"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2449
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2451
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "A munkamenet NEM LESZ naplózva"
+
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Ez a munkamenet titkosított"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " és NAPLÓZVA LESZ"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " és NEM LESZ naplózva"
 
-#: ../src/chat_control.py:2201
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "A beszélgetőpartner személyazonossága nem visszaigazolt. Kattints a pajzs gombra a részletekért."
+#: ../src/chat_control.py:2470
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"A beszélgetőpartner személyazonossága nem visszaigazolt. Kattints a pajzs "
+"gombra a részletekért."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E titkosítás kikapcsolva"
 
-#: ../src/chat_control.py:2241
-#: ../src/chat_control.py:2254
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "A következő szöveg NEM VOLT titkosítva"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "A következő üzenet titkosítva volt"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Új üzeneted érkezett tőle: \"%s\""
 
-#: ../src/chat_control.py:2520
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Ha bezárod ezt a fület és a beszélgetésnaplózás funkció ki van kapcsolva, akkor ez az üzenet el fog veszni."
-
-#: ../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/gajim.py:159
-#: ../src/session.py:138
+#: ../src/chat_control.py:2799
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Ha bezárod ezt a fület és a beszélgetésnaplózás funkció ki van kapcsolva, "
+"akkor ez az üzenet el fog veszni."
+
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Adatbázis hiba"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2968
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Az adatbázis file (%s) nem olvasható. Próbáld meg kijavítani vagy eltávolítani (az összes naplózott beszélgetés el fog veszni)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+"Az adatbázis file (%s) nem olvasható. Próbáld meg kijavítani vagy "
+"eltávolítani (az összes naplózott beszélgetés el fog veszni)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Nem lehet tőle visszafejteni az üzenetet: %s\n"
+"Elképzelhető, hogy szabotázs történt."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s mostantól %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Fileátvitelek"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Méret: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "_Fiókok"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Fileátvitel sikeres"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Meghívó közös társalgásba"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "A partner megállította a fileátvitelt"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Hiba a file megnyitása közben"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Fileátvitel megállítva"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Fileátvitel megszakítva"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Nem létesíthető kapcsolat a partnerrel."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Filet küld egy partnernek"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nincs meg"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Távol"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Nem elérhető"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Elrejti az ablakot"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Open_PGP titkosítás Be/Kikapcsolása"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Filet küld egy partnernek"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s érvénytelen naplózási szint"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Egy kapcsolat nem elérhető"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Kapcsolat nem elérhető"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Nem csatlakoztál a csoportos beszélgetéshez."
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Érvénytelen becenév"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"\n"
+"_Open chat window with user"
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Használandó becenév"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Ask before closing a group chat tab/window."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Send %s to %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Meghívtak közös társalgásba"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Érvénytelen szerver"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "a hovatartozás megváltozott"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s nem a közös beszélgetés neve."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Hiányzó argumentum \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "beszélgetésnapló adatbázis létrehozása"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 msgid "creating cache database"
 msgstr "gyorsítótár adatbázis létrehozása"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s egy file de lehetne egy könyvtár is"
 
-#: ../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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim most kilép"
 
-#: ../src/common/check_paths.py:317
-#: ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s egy könyvtár de lehetne egy file is"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "%s könyvtár létrehozása"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Állapot információ változtatás"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Állapot megváltoztatása"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Jelenlét típusának és leírásának beállítása"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Ráér beszélgetni"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Kiterjesztett távollét"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Ne zavarj"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Offline - lecsatlakozva"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Jelenlét leírása:"
 
-#: ../src/common/commands.py:149
-#: ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Az állapot megváltozott."
 
-#: ../src/common/commands.py:181
-#: ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Csoportos beszélgetések elhagyása"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Nem csatlakoztál a csoportos beszélgetéshez."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Válaszd ki a csoportos beszélgetéseket amelyeket el szeretnél hagyni"
 
 #. 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/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Csoportos beszélgetések"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Elhagytad a következő csoportos beszélgetéseket:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Olvasatlan üzenetek továbbítása"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Az összes olvasatlan üzenet továbbítva lett."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr "Továbbítsd az olvasatlan üzeneteket, majd kapcsolódj le"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Hang lejátszása ha a felhasználó elfoglalt"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Használd a D-Bus-t és a Figyelmeztető-daemon-t a figyelmeztetések megjelenítésére"
+msgstr ""
+"Használd a D-Bus-t és a Figyelmeztető-daemon-t a figyelmeztetések "
+"megjelenítésére"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
-msgstr "Csak az \"Elérhető\" illetve \"ráér beszélgetni\" partnereket mutasd a névsoron."
+msgstr ""
+"Csak az \"Elérhető\" illetve \"ráér beszélgetni\" partnereket mutasd a "
+"névsoron."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Idő percben, miután az állapotod távolra változik."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Állapota: Távol, mert több mint $T percig tétlen volt)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr "$S fel lesz cserélve a jelenlegi állapotüzenetedre, amit ez az idő eltelik: $T."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgstr ""
+"$S fel lesz cserélve a jelenlegi állapotüzenetedre, amit ez az idő eltelik: "
+"$T."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Idő percben, miután az állapotod nem elérhetőre változik."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Állapota: Nem elérhető, mert több mint $T percig tétlen volt)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr "$S fel lesz cserélve a jelenlegi állapotüzeneteddel, amint ez az idő eltelik: $T."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
+msgstr ""
+"$S fel lesz cserélve a jelenlegi állapotüzeneteddel, amint ez az idő "
+"eltelik: $T."
 
-#: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#: ../src/common/config.py:89
+#, 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
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Bejövő becenév színe."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Kimenő becenév színe."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Bejövő szöveg színe."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Kimenő szöveg színe."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Állapotüzenet színe."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+msgid "Contact signed in notification color."
+msgstr ""
+
+#. limegreen
+#: ../src/common/config.py:103
+msgid "Contact signout notification color"
+msgstr ""
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Preview new messages in notification popup?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Fileküldési Kérelem "
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Fileátvitel megszakítva"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Show a pop-up notification when a file transfer is complete "
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Meghívó közös társalgásba"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Bejövő becenév betűtípusa."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Kimenő becenév betűtípusa."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Bejövő szöveg betűtípusa."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Kimenő szöveg betűtípusa."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Állapotüzenet betűtípusa."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 #, fuzzy
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "List (space separated) of rows (accounts and groups) that are collapsed."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py: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:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "alapértelmezett"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Beszélő által használt nyelv"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3515,1025 +3983,1445 @@ msgstr ""
 "'néha' - print time every print_ichat_every_foo_minutes minute.\n"
 "'soha' - soha ne írja ki az időpontot."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 #, fuzzy
-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 "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'."
+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 ""
+"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'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 #, fuzzy
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 #, fuzzy
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 #, fuzzy
-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 "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)"
+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 ""
+"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)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 #, fuzzy
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Character to add after nickname when using nick completion (tab) in group chat."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 #, fuzzy
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 #, fuzzy
-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 "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"
+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 ""
+"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"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 #, fuzzy
-msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
-msgstr "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+msgstr ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 #, fuzzy
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
 #, fuzzy
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "How many lines to remember from previous conversation when a chat tab/window is reopened."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened?"
+msgstr ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 #, fuzzy
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:182
 #, fuzzy
-msgid "How many lines to request to server when entering a groupchat."
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "How many lines to request to server when entering a groupchat."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:183
 #, fuzzy
-msgid "How many minutes back to request logs when a entering a groupchat."
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 #, fuzzy
-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 "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
+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 ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 #, fuzzy
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, fuzzy, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 #, fuzzy
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 #, fuzzy
-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 "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."
+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 ""
+"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."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 #, fuzzy
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 #, fuzzy
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 #, fuzzy
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "When not printing time for every message (print_time==sometimes), print it every x minutes."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 #, fuzzy
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
 #, fuzzy
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Always ask before closing group chat tab/window in this space separated list of group chat jids."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat JIDs."
+msgstr ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
 #, fuzzy
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Never ask before closing group chat tab/window in this space separated list of group chat jids."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat JIDs."
+msgstr ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 #, fuzzy
-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 "Ask before closing tabbed chat window if there are controls that can lose data (chat, private chat, groupchat that will not be minimised)"
+msgid ""
+"Ask before closing tabbed chat window if there are controls that can lose "
+"data (chat, private chat, groupchat that will not be minimized)"
+msgstr ""
+"Ask before closing tabbed chat window if there are controls that can lose "
+"data (chat, private chat, groupchat that will not be minimised)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
-msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
-msgstr "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
+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 ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 #, fuzzy
 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
+#: ../src/common/config.py:210
 #, fuzzy
-msgid "Notify of events in the system trayicon."
+msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 #, fuzzy
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 #, fuzzy
 msgid "Show close button in tab?"
 msgstr "Mutassa a bezárás gombot a füleken?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 #, fuzzy
-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 "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."
+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 ""
+"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."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 #, fuzzy
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "A semicolon-separated list of words that will be highlighted in group chats."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, 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."
-msgstr "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
+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 ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 #, fuzzy
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "If True, Gajim will check if it's the default jabber client on each startup."
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"If True, Gajim will check if it's the default jabber client on each startup."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 #, fuzzy
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 #, fuzzy
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 #, fuzzy
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define the position of the avatar in roster. Can be left or right"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 #, fuzzy
-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 "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."
+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 ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 #, fuzzy
-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 "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or status message."
+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 ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or status message."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 #, fuzzy
-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 "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."
+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 ""
+"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."
+
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:262
 #, fuzzy
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 #, fuzzy
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 #, fuzzy
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "If True, restored messages will use a smaller font than the default one."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 #, fuzzy
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 #, fuzzy
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 #, fuzzy
-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 "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."
+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 ""
+"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."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 #, fuzzy
-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 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."
+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 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."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 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) is sent to a "
+"specific window."
 msgstr ""
 "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."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Elrejti a beszélgetőablakok gombjait."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Elrejti a bannert ebben a közös beszélgetőablakban"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 #, fuzzy
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 #, fuzzy
-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 "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."
+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 ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Smooth scroll message in conversation window"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "List of colours, separated by \":\", that will be used to colour nicknames in group chats."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"List of colours, separated by \":\", that will be used to colour nicknames "
+"in group chats."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 #, fuzzy
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:258
-#, fuzzy
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Should we show the confirm metacontacts creation dialogue or not? Empty string means we never show the dialogue."
-
-#: ../src/common/config.py:259
+#: ../src/common/config.py:286
 #, fuzzy
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
-msgstr "Should we show the confirm block contact dialogue or not? Empty string means we never show the dialogue."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Should we show the confirm metacontacts creation dialogue or not? Empty "
+"string means we never show the dialogue."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:287
 #, fuzzy
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Should we show the confirm custom status dialogue or not? Empty string means we never show the dialogue."
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Should we show the confirm block contact dialogue or not? Empty string means "
+"we never show the dialogue."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:288
 #, fuzzy
-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 "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."
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Should we show the confirm custom status dialogue or not? Empty string means "
+"we never show the dialogue."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:289
 #, fuzzy
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
+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 ""
+"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."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:290
 #, fuzzy
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:291
 #, fuzzy
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "If True, Gajim will show number of online and total contacts in account and group rows."
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:292
 #, fuzzy
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:293
 #, fuzzy
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:294
 #, fuzzy
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
-msgstr "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 #, fuzzy
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 #, fuzzy
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "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 ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "If True, notification windows from notification-daemon will be attached to systray icon."
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
+msgstr ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 #, fuzzy
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: ../src/common/config.py:272
-#, fuzzy
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
-msgstr "Change the value to change the size of latex formulae displayed. The higher is larger."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 #, fuzzy
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+msgstr ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 #, fuzzy
-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 "Ask offline status message to all offline contacts when connection to an account is established. WARNING: This causes a lot of requests to be sent!"
+msgid ""
+"Ask offline status message to all offline contacts when connection to an "
+"account is established. WARNING: This causes a lot of requests to be sent!"
+msgstr ""
+"Ask offline status message to all offline contacts when connection to an "
+"account is established. WARNING: This causes a lot of requests to be sent!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 #, fuzzy
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "If True, completion in groupchats will be like a shell auto-completion"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 #, fuzzy
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
-msgstr "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 #, fuzzy
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 #, fuzzy
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "Optionally resize jingle output video. Example: 320x240"
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 #, fuzzy
-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 "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."
+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 ""
+"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."
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 #, fuzzy
 msgid "STUN server to use when using jingle"
 msgstr "STUN server to use when using jingle"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 #, fuzzy
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
-msgstr "If True, Gajim will show affiliation of groupchat occupants by adding a coloured square to the status icon"
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
+msgstr ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"coloured square to the status icon"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
 #, fuzzy
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:332
 #, fuzzy
-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 "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"
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:340
+#, fuzzy
+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 ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+
+#: ../src/common/config.py:341
 #, fuzzy
 msgid "If enabled, restore the last status that was used."
 msgstr "If enabled, restore the last status that was used."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 #, fuzzy
-msgid "If True, Contacts requesting authorization will be automatically accepted."
-msgstr "If True, Contacts requesting authorisation will be automatically accepted."
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+"If True, Contacts requesting authorisation will be automatically accepted."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
-msgid "If False, this account will be disabled and will not appear in roster window."
-msgstr "If False, this account will be disabled and will not appear in roster window."
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"If False, this account will be disabled and will not appear in roster window."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 #, fuzzy
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 #, fuzzy
 msgid "Enable ESessions encryption for this account."
 msgstr "Enable ESessions encryption for this account."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 #, fuzzy
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 #, fuzzy
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 #, fuzzy
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Show a warning dialogue before sending password on an plaintext connection."
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
+msgstr ""
+"Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 #, fuzzy
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "Show a warning dialogue before sending PLAIN password over a plain conenction."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
+msgstr ""
+"Show a warning dialogue before sending PLAIN password over a plain "
+"conenction."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 #, fuzzy
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 #, fuzzy
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace sent after inactivity"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 #, fuzzy
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sent after inactivity"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 #, fuzzy
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
+msgid ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect?"
+msgstr ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 #, fuzzy
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 #, fuzzy
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "If ticked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"If ticked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:393
 #, fuzzy
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 #, fuzzy
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
 #, fuzzy
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s egy filet szeretne küldeni neked."
+
+#: ../src/common/config.py:405
+#, fuzzy
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Message that is sent to contacts you want to add"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:409
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonymous hitelesítés"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_ymous hitelesítés"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:478
 #, fuzzy
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Should Gajim automatically start an encrypted session with this contact when possible?"
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+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:479 ../src/common/config.py:482
 #, fuzzy
 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:483
 #, fuzzy
-msgid "all or space separated status"
-msgstr "all or space separated status"
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "How many lines to request to server when entering a groupchat."
 
-#: ../src/common/config.py:447
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', or 'both'"
+#: ../src/common/config.py:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: ../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
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' or ''"
+#: ../src/common/config.py:487
+msgid ""
+"State whether plugins should be activated on startup (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:461
-#: ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Alszik"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Nemsokára vagyok"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Néhány perc múlva vagyok."
 
-#: ../src/common/config.py:463
-#: ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eszik"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Eszek, hagyj üzenetet."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Filmet nézek."
 
-#: ../src/common/config.py:465
-#: ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Munka"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Dolgozom."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Telefonálok."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Szabadban"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Kint vagyok a szabadban, élvezem az életet."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Elérhető vagyok."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Ráérek beszélgetni."
 
-#: ../src/common/config.py:480
-#: ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Nemsokára vagyok."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Nem vagyok elérhető."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ne zavarjanak."
 
-#: ../src/common/config.py:483
-#: ../src/common/config.py:484
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:526
 #, fuzzy
-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 "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."
+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 ""
+"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:527
 #, fuzzy
 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:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zöld"
 
-#: ../src/common/config.py:508
-#: ../src/common/optparser.py:290
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "fűszeres"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "emberi"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "tengerész"
 
-#: ../src/common/connection_handlers.py:84
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-msgstr "Nem sikerült betölteni a tétlen modult"
-
-#: ../src/common/connection_handlers.py:117
-#, 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
-msgid "Registration succeeded"
-msgstr "Regisztráció sikeres"
-
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "Registration with agent %s succeeded"
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "neki"
 
-#: ../src/common/connection_handlers.py:133
-msgid "Registration failed"
-msgstr "Regisztráció nem sikerült"
+#: ../src/common/connection_handlers_events.py:370
+#, 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 ""
+"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_handlers.py:133
+#: ../src/common/connection_handlers_events.py:825
 #, 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"
+msgid "unsubscribe request from %s"
+msgstr "liratkozási kérelem tőle: %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
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "Lemez írási hiba"
 
-#: ../src/common/connection_handlers.py:678
-#: ../src/common/connection.py:1472
-msgid "Invisibility not supported"
-msgstr "A láthatatlanság nem támogatott"
-
-#: ../src/common/connection_handlers.py:679
-#: ../src/common/connection.py:1473
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, fuzzy, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "Account %s doesn't support invisibility."
+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 ""
+"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: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
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Szoba törölve"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Helyette csatlakozhatsz ehhez a szobához: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Érvénytelen Jabber Azonosító"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Érvénytelen Jabber Azonosítóval érkezett egy üzenet, ezért figyelmen kívül lett hagyva."
-
-#: ../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
-#, fuzzy, 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 "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 ""
+"Érvénytelen Jabber Azonosítóval érkezett egy üzenet, ezért figyelmen kívül "
+"lett hagyva."
 
-#: ../src/common/connection_handlers.py:1805
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
 #, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Becenév nem megengedett: %s"
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "hiba ennek a küldése során %(message)s ( %(error)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 "Nem sikerült csatlakozni közös beszélgetéshez"
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Ismeretlen SSL hiba: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Új levél"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Új levél tőle: %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Új privát üzenet"
 
-#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Új privát üzenet ebből a közös beszélgetésből: %s"
+
+#: ../src/common/connection_handlers_events.py:2222
 #, fuzzy, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Maximum number of users for %s has been reached"
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/connection_handlers.py:1912
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
-msgid "You are banned from group chat %s."
-msgstr "Bannolva lettél a közös beszélgetésekből %s."
+msgid "Messaged by %(nickname)s"
+msgstr "Üzenetet írta: %(nickname)s"
 
-#: ../src/common/connection_handlers.py:1919
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Új üzenet"
+
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
-msgid "Group chat %s does not exist."
-msgstr "Group chat %s does not exist."
+msgid "New Message from %(nickname)s"
+msgstr "Új üzenet tőle: %(nickname)s"
 
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Közös beszélgetés létrehozása korlátozva van."
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s megváltoztatta állapotát"
 
-#: ../src/common/connection_handlers.py:1927
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
 #, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "A regisztrált becenevedet kell használnod a közös beszélgetésben %s."
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s mostantól %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "A partner megváltoztatta az állapotát"
 
-#: ../src/common/connection_handlers.py:1932
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Nem vagy ennek a közös beszélgetésnek a taglistáján %s."
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s bejelentkezett"
 
-#. 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 "Szoba törölve"
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Partner bejelentkezett"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers_events.py:2389
 #, python-format
-msgid "You can join this room instead: %s"
-msgstr "Helyette csatlakozhatsz ehhez a szobához: %s"
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s kijelentkezett"
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Fel szeretnélek venni a névsoromba."
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Partner kijelentkezett"
+
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+msgid "Unable to load idle module"
+msgstr "Nem sikerült betölteni a tétlen modult"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:127
 #, python-format
-msgid "we are now subscribed to %s"
-msgstr "feliratkoztunk ide: %s"
+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:2043
+#: ../src/common/connection_handlers.py:135
+msgid "Registration succeeded"
+msgstr "Regisztráció sikeres"
+
+#: ../src/common/connection_handlers.py:136
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "liratkozási kérelem tőle: %s"
+msgid "Registration with agent %s succeeded"
+msgstr "Registration with agent %s succeeded"
+
+#: ../src/common/connection_handlers.py:145
+msgid "Registration failed"
+msgstr "Regisztráció nem sikerült"
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:146
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "leiratkoztunk innen: %s"
+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:591 ../src/common/connection.py:1770
+msgid "Invisibility not supported"
+msgstr "A láthatatlanság nem támogatott"
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, 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 "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 %s doesn't support invisibility."
+msgstr "Account %s doesn't support invisibility."
+
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Fel szeretnélek venni a névsoromba."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 #, fuzzy
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Nem lehet dekódolni a kibocsátó publikus kulcsát"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Tanusítvány aláírás hiba"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "CRL aláírás hiba"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Az tanusítvány még nem érvényes"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "A tanusítvány lejárt"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL még nem érvényes"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL lejárt"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 #, fuzzy
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 #, fuzzy
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 #, fuzzy
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 #, fuzzy
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Saját magunk által aláírt tanusítvány"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Saját magunk által aláírt tanusítvány a tanusítványláncon"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Nem lehet lekérni a helyi kibocsátó tanusítványát"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Nem lehet ellenőrizni az első tanusítványt"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "A tanusítványlánc túl hosszú"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Tanusítvány érvénytelenítve"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Érvénytelen CA tanusítvány"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Az elérési útvonal elérte a megengedett maximális hosszát"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Nem támogatott tanusítvány cél"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "A tanusítvány nem megbízható"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Tanusítvány visszautasítva"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Téma kibocsátó eltérés"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 #, fuzzy
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 #, fuzzy
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "A kulcshasználat nem tartalmazza a tanusítvány aláírást"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Alkalmazás ellenőrzési funkció"
 
-#: ../src/common/connection.py:254
-#: ../src/dialogs.py:2932
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Nem lehetséges az üzenetküldés neki: %s. Ez a Jabber Azonosító nem érvényes."
+msgstr ""
+"Nem lehetséges az üzenetküldés neki: %s. Ez a Jabber Azonosító nem érvényes."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Se a távoli jelenlét nincs aláírva, se a kulcs nincs hozzárendelve."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:307
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "A partner kulcsa (%s) nem egyezik a Gajimban hozzárendelt kulccsal."
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:331
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ez az üzenet *titkosított* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4542,80 +5430,80 @@ msgstr ""
 "Tárgy: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "A kapcsolat a következő fiókkal megszakadt: \"%s\""
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Manuális újracsatlakozás."
 
-#: ../src/common/connection.py:820
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Szerver %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:854
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, fuzzy, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:867
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Ismeretlen SSL hiba: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Érvénytelen válasz"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "Transzport %(name)s rosszul lettek megválaszolva a kérés regisztrálásához: %(error)s"
+msgstr ""
+"Transzport %(name)s rosszul lettek megválaszolva a kérés regisztrálásához: "
+"%(error)s"
 
-#: ../src/common/connection.py:1165
-#: ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nem lehet csatlakozni ide: \"%s\""
 
-#: ../src/common/connection.py:1166
-#: ../src/gui_interface.py:755
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Nem lehet csatlakozni ide: \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Ellenőrizd a kapcsolatod és később próbáld meg újra."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Szerver válaszolt: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Nem sikerült a csatlakozás a proxyhoz"
 
-#: ../src/common/connection.py:1215
-#: ../src/common/connection.py:1274
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nem lehet csatlakozni a fiókhoz %s"
 
-#: ../src/common/connection.py:1216
-#: ../src/common/connection.py:1275
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "A kapcsolat megszakadt a következő fiókkal: %s. Próbálj meg újracsatlakozni."
+msgstr ""
+"A kapcsolat megszakadt a következő fiókkal: %s. Próbálj meg újracsatlakozni."
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1388
 #, fuzzy, 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:1391
 #, python-format
 msgid ""
 "\n"
@@ -4624,7 +5512,7 @@ msgstr ""
 "\n"
 "SSL hiba: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4633,98 +5521,106 @@ msgstr ""
 "\n"
 "Ismeretlen SSL hiba: %d"
 
-#: ../src/common/connection.py:1295
-msgid "Check your connection or try again later"
-msgstr "Ellenőrizd a kapcsolatod vagy próbáld meg később"
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "The authenticity of the %s certificate could be invalid."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Nem lehet csatlakozni ide: \"%s\""
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Nem sikerült a hitelesítés vele \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Kérlek ellenőrizd a felhasználóneved és jelszavad helyességét."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Hiba a magánéleti lista eltávolításakor"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1575
 #, 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 "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Deactivate it and try again."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+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:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Elküldött partner: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Elküldött partnerek:"
 
-#: ../src/common/connection.py:1799
-#: ../src/common/connection.py:1822
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nem lett lekérve mert az állapot láthatatlan"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Regisztráció megszűntetése nem sikerült"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2827
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr "A szerverrel való regisztráció megszűntetése %(server)s nem sikerült: %(error)s"
+msgstr ""
+"A szerverrel való regisztráció megszűntetése %(server)s nem sikerült: "
+"%(error)s"
 
-#: ../src/common/contacts.py:135
-#: ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "Megfigyelők"
 
-#: ../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/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transzportok"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Nincs a névsoron"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:41
-#: ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "A Gajim D-Bus képességeit nem lehet használni"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "A D-Bus nem fut megfelelően ezen a számítógépen"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
-msgstr "A D-Bus nem fut megfelelően ezen a számítógépen: nincs jelen a rendszerbusz"
+msgstr ""
+"A D-Bus nem fut megfelelően ezen a számítógépen: nincs jelen a rendszerbusz"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "A D-Bus nem fut megfelelően ezen a számítógépen: munkamenet busz nincs jelen"
+msgstr ""
+"A D-Bus nem fut megfelelően ezen a számítógépen: munkamenet busz nincs jelen"
 
 #: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
@@ -4732,9 +5628,11 @@ msgstr "Nem olvasható az adatbázis."
 
 #: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Szolgáltatás nem elérhető: Nem fut a Gajum, vagy a távoli számítógépes _irányítás nem megfelelő."
+msgstr ""
+"Szolgáltatás nem elérhető: Nem fut a Gajum, vagy a távoli számítógépes "
+"_irányítás nem megfelelő."
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "A D-Bus nincs jelen ezen a számítógépen, vagy a python modul hiányzik"
 
@@ -4871,8 +5769,7 @@ msgstr "öt %(1)s"
 msgid "%(1)s o'clock"
 msgstr "%(1)s óra"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Éjjel"
 
@@ -4908,8 +5805,7 @@ msgstr "Késő este"
 msgid "Start of week"
 msgstr "A hét eleje"
 
-#: ../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 "A hét közepe"
 
@@ -4921,260 +5817,292 @@ msgstr "A hét vége"
 msgid "Weekend!"
 msgstr "Hétvége!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:158
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Nem megfelelő karakter van a felhasználónévben."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Szerver cím szükséges."
+#: ../src/common/helpers.py:169
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Nem megfelelő karakter van a hosztnévben."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:176
+msgid "Server address required."
+msgstr "Szerver cím szükséges."
+
+#: ../src/common/helpers.py:180
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Nem megfelelő karakter van az erőforrásban."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "El_foglalt"
 
-#: ../src/common/helpers.py:211
-#: ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Nem elérhető"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Nem elérhető"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Ráér beszélgetni"
 
-#: ../src/common/helpers.py:221
-#: ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Ráér beszélgetni"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:240
 msgid "?user status:_Available"
 msgstr "_Elérhető"
 
-#: ../src/common/helpers.py:226
-#: ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "Elérhető"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Csatlakozás"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Távol"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Kijelentkezett"
 
-#: ../src/common/helpers.py:238
-#: ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Kijelentkezett"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Láthatatlan"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Láthatatlan"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Hibái vannak"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Nincs"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "neki"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:274
+msgid "From"
+msgstr "Feladó"
+
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "mindkét"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Egyik sem"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Nincs"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderátorok"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Résztvevők"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Résztvevő"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Látogatók"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Látogató"
 
-#: ../src/common/helpers.py:300
-#: ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nincs"
 
-#: ../src/common/helpers.py:302
-#: ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Tulajdonos"
 
-#: ../src/common/helpers.py:304
-#: ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: ../src/common/helpers.py:306
-#: ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Tag"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "figyeli a beszélgetést"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "valami mást csinál"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "üzenetet fogalmaz..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "üzenetet fogalmaz, de nem gépel"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "bezárta a beszélgetőablakot, vagy fület"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108
-#: ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d függő üzenet"
 msgstr[1] "%d függő üzenetek"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " szobából %s"
 
-#: ../src/common/helpers.py:1124
-#: ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " felhasználótól %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " tól/től %s"
 
-#: ../src/common/helpers.py:1133
-#: ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d függő esemény"
 msgstr[1] "%d függő események"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "Szia! Én $name vagyok."
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Időtúllépés a kép betöltése közben"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Túl nagy a kép"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL még nem érvényes"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Időtúllépés a kép betöltése közben"
+
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s konfiguráció hiba"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5193,11 +6121,11 @@ msgstr ""
 "hiba volt:\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "GStreamer hiba"
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5206,100 +6134,114 @@ msgstr ""
 "Hiba: %s\n"
 "Hibajavítás: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "hang bemenet"
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "hang kimenet"
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "videó bemenet"
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "videó kimenet"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Hiba a futtatás közben \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s érvénytelen naplózási szint"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr " Alapértelmezett eszköz"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Hang teszt"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "Automatikus érzékelés"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "File: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "Nem létező hangkimenet"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Videó teszt"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zöld"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "videó kimenet"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X ablakkezelő rendszer (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X ablakkezelő rendszer (without Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "hiba: nem lehet megnyitni %s olvasásra"
+msgid "Error: cannot open %s for reading"
+msgstr "Hiba: nem lehet %s-t megnyitni olvasásra"
 
-#: ../src/common/optparser.py:299
-#: ../src/common/optparser.py:300
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cián"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -5720,8 +6662,7 @@ msgstr "Ebédel"
 msgid "Exercising"
 msgstr "Edz"
 
-#: ../src/common/pep.py:133
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Bringázik"
 
@@ -5937,19 +6878,115 @@ msgstr "Tanul"
 msgid "Writing"
 msgstr "Ír"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "alapértelmezett"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "tengerész"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Rejtőzködik"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Fiók"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Fiók sor"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Leírás"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Hiba"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "egy"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "room"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Ismeretlen Előadó"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Ismeretlen Cím"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Ismeretlen forrás"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5958,26 +6995,20 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nem lehet lefoglalni a portot %s."
-
-#: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Elképzelhető hogy fut még egy Gajim a háttérben. Fileátvitel meg lesz szakítva."
-
 #. 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 "[Ez a része egy titkosított munkamenetnek. Ha ezt látod, valami hiba történt.]"
+#: ../src/common/stanza_session.py:425
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Ez a része egy titkosított munkamenetnek. Ha ezt látod, valami hiba "
+"történt.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi hiba"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -5986,46 +7017,47 @@ msgstr ""
 "%s\n"
 "Link-helyi üzenetküldés valószínűleg nem jól működik."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kélek ellenőrizd hogy az Avahi, vagy a Bonjour telepítve van-e."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Nem lehet elindítani a helyi szolgáltatást"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nem lehet a porthoz kötni %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:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Kérlek ellenőrizd hogy az avahi-daemon fut-e."
 
-#: ../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:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nem lehet megváltoztatni ennek a fióknak az állapotát \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Nem lehet elküldeni az üzeneted."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "A partner nincs bejelentkezve. Az üzeneted nem lett elküldve."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Nem lehet létrehozni kapcsolatot a hoszttal: Időtúllépés adatküldés közben."
+#: ../src/common/zeroconf/connection_zeroconf.py:394
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Nem lehet létrehozni kapcsolatot a hoszttal: Időtúllépés adatküldés közben."
 
 #: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
@@ -6033,251 +7065,248 @@ msgstr "Nem lehet létrehozni kapcsolatot a hoszttal: Időtúllépés adatküld�
 msgid "Error while adding service. %s"
 msgstr "Hiba a szolgáltatás hozzáadása közben. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Alapértelmezett üzenet"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../src/config.py:459
-#: ../src/config.py:463
-#: ../src/config.py:3078
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../src/config.py:739
-#: ../src/dialogs.py:1395
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Nem érhető el szótár a(z) %s nyelvhez"
 
-#: ../src/config.py:740
+#: ../src/config.py:748
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Fel kell telepítened a %s szótárt, hogy használhasd a helyesírás-ellenőrzést, vagy válassz egy másik nyelvet úgy hogy beállítod a beszélő_nyelve opciót."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Fel kell telepítened a %s szótárt, hogy használhasd a helyesírás-"
+"ellenőrzést, vagy válassz egy másik nyelvet úgy hogy beállítod a "
+"beszélő_nyelve opciót."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "állapotüzenet címe"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "állapotüzenet szövege"
 
 #. 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:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Név"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Újracsatlakozik?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Ha azt szeretnéd, hogy a változások azonnal életbelépjenek, akkor újra be kell jelentkezned."
+msgstr ""
+"Ha azt szeretnéd, hogy a változások azonnal életbelépjenek, akkor újra be "
+"kell jelentkezned."
 
-#: ../src/config.py:1764
-#: ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nem használható ezen a számítógépen"
 
-#: ../src/config.py:1933
-#: ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Olvasatlan események"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Összes függő esemény elolvasása mielőtt a fiók törlésre kerül."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Megnyitotál egy beszélgetést a következő fiókban: %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Minden beszélgető és közös beszélgetőablak be lesz zárva. Szeretnéd folytatni?"
+msgstr ""
+"Minden beszélgető és közös beszélgetőablak be lesz zárva. Szeretnéd "
+"folytatni?"
 
-#: ../src/config.py:1976
-#: ../src/config.py:2509
-#: ../src/config.py:2545
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Csatlakozva vagy a szerverhez"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Ahhoz, hogy megváltoztathasd a fiók nevét, ki kell jelentkezned."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
-msgstr "Ahhoz, hogy megváltoztathasd a fiók nevét, az összes függő eseményt el kell olvasnod."
+msgstr ""
+"Ahhoz, hogy megváltoztathasd a fiók nevét, az összes függő eseményt el kell "
+"olvasnod."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Ez a fióknév már használatban van"
 
-#: ../src/config.py:1988
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Ez a név már használatban van egy másik fiókodhoz. Kérlek válassz másikat."
+#: ../src/config.py:2047
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Ez a név már használatban van egy másik fiókodhoz. Kérlek válassz másikat."
 
-#: ../src/config.py:1992
-#: ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Érvénytelen fióknév"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Fióknév nem lehet üres."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "fióknév nem tartalmazhat szóközöket."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Fiók átnevezése"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Írja be az új nevet ehhez a fiókhoz: %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
-msgstr "A Jabber azonosítónak ilyen formátumúnak kell lennie \"felhasznalo@szervernev\"."
+msgstr ""
+"A Jabber azonosítónak ilyen formátumúnak kell lennie \"felhasznalo@szervernev"
+"\"."
 
-#: ../src/config.py:2318
-#: ../src/config.py:3606
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Érvénytelen bejegyzés"
 
-#: ../src/config.py:2319
-#: ../src/config.py:3607
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Az egyedi portnak egy számnak kell lennie."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Hiba a titkos kulcsok lekérdezése közben"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Nincs elérhető titkos OpenPGP kulcs."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP kulcs választás"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Válaszd ki az OpenPGP kulcsod"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Nem elérhető ilyen fiók"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
-msgstr "El kell készítened a fiókodat mielőtt szerkesztenéd a szeméyes adataid."
-
-#: ../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
+msgstr ""
+"El kell készítened a fiókodat mielőtt szerkesztenéd a szeméyes adataid."
+
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Nem csatlakozol a szerverhez"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Kapcsolat nélkül nem tudod szerkeszteni a személyes adataid."
 
-#: ../src/config.py:2396
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "A szervered nem támogatja a Vcard-ot"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "A szervered nem menti el a személyes adataid."
 
-#: ../src/config.py:2510
-#: ../src/config.py:2546
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Ahhoz hogy kikapcsold a fiókod, előbb le kell csatlakoznod."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "A Helyi fiók már létezik."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Kérlek nevezd át vagy töröld mielőtt engedélyezed a link-local üzenetküldést."
+msgstr ""
+"Kérlek nevezd át vagy töröld mielőtt engedélyezed a link-local üzenetküldést."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Szerkeszt: %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Regisztrálás ide: %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Ban lista"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Taglista"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Tulajdonosi lista"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Adminisztrátor lista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763
-#: ../src/disco.py:873
-#: ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "Jabber Azonosító"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Indok"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Becenév"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Szerep"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Bannolás..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6285,11 +7314,11 @@ msgstr ""
 "<b>Kit szeretnél bannolni?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Tag hozzáadása..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6297,11 +7326,11 @@ msgstr ""
 "<b>Kit szeretnél taggá tenni?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Tulajdonos hozzáadása..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6309,11 +7338,11 @@ msgstr ""
 "<b>Kit szeretnél tulajdonossá tenni??</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Adminisztrátor hozzáadása..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6321,7 +7350,7 @@ msgstr ""
 "<b>Kit szeretnél adminisztrátorrá tenni?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6337,145 +7366,142 @@ msgstr ""
 "4. domain (a domain maga egyezik, mint bármely felhasznalo@domain,\n"
 "domain/erőforrás, vagy cím tartalmaz aldomaint)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "%s fiók törlése"
 
-#: ../src/config.py:2941
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "Fiók kikapcsolva"
 
-#: ../src/config.py:2942
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
-msgstr "Ahhoz hogy töröld a regisztrációd egy szerverről, a fiókodnak engedélyezve kell lenni."
+msgstr ""
+"Ahhoz hogy töröld a regisztrációd egy szerverről, a fiókodnak engedélyezve "
+"kell lenni."
 
-#: ../src/config.py:2955
-#: ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Jelszó szükséges"
 
-#: ../src/config.py:2956
-#: ../src/gui_interface.py:1223
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Írd be a jelszavad a következő fiókhoz: %s"
 
-#: ../src/config.py:2957
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Jelszó megjegyzése"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A \"%s\" fiók csatlakozva van a szerverhez"
 
-#: ../src/config.py:2968
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Ha eltávolítod, akkor a kapcsolat megszakad."
 
-#: ../src/config.py:2982
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "A kapcsolat a %s szerverrel megszakadt"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "Mit szeretnél tenni?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "Eltávolítás csak a Gajim-ból"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ne távolíts el semmit. Később újból megpróbálom"
 
-#: ../src/config.py:3078
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "Minden"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Csak belépés és elhagyás"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "Egyik sem"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Új közös beszélgetés"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Ennek a könyvjelzőnek érvénytelen adatai vanak"
 
-#: ../src/config.py:3184
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Kérlek töltsd ki a szerver és a szoba mezőket vagy töröld ezt a könyvjelzőt."
-
-#. invalid char
-#: ../src/config.py:3302
-#: ../src/dialogs.py:1934
-msgid "Invalid nickname"
-msgstr "Érvénytelen becenév"
+#: ../src/config.py:3280
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Kérlek töltsd ki a szerver és a szoba mezőket vagy töröld ezt a könyvjelzőt."
 
-#: ../src/config.py:3303
-#: ../src/config.py:3317
-#: ../src/config.py:3331
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Nem megengedett karakter"
 
-#: ../src/config.py:3316
-#: ../src/config.py:3582
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Érvénytelen szerver"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Érvénytelen szoba"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Fiók sikeresen hozzáadva"
 
-#: ../src/config.py:3499
-#: ../src/config.py:3505
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
-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 "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."
+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 ""
+"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."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Az új fiók sikeresen elkészült"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Érvénytelen felhasználónév"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Meg kell adnod egy felhasználónevet hogy beállíthasd ezt a fiókot."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Kérlek adj meg egy szervert amelyre regisztrálni szeretnél."
 
-#: ../src/config.py:3639
-#: ../src/gui_interface.py:1904
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Tanusítvány már a fileban van"
 
-#: ../src/config.py:3640
-#: ../src/gui_interface.py:1905
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ez a tanusítvány már a %s fileban van, ezért nem lett ismét hozzáadva."
 
-#: ../src/config.py:3717
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6490,8 +7516,7 @@ msgstr ""
 "SSL hiba: %(error)s\n"
 "Ennek ellenére szeretnél csatlakozni a szerverhez?"
 
-#: ../src/config.py:3723
-#: ../src/gui_interface.py:1932
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6502,64 +7527,89 @@ msgstr ""
 "A tanusítvány SHA1 ujjlenyomata:\n"
 "%s"
 
-#: ../src/config.py:3755
-#: ../src/config.py:3789
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Hiba lépett fel a fiók létrehozása közben"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Fióknév használatban van"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Már van egy fiókod ezzel a névvel."
 
-#: ../src/config.py:4009
+#: ../src/config.py:4118
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:4119
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Beállítás"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktív"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Esemény"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Első beérkezett üzenet"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Első beérkezett üzenet"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Következő beérkezett üzenet előtérbe hozása"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Következő beérkezett üzenet háttérbe tétele"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Partner csatlakozott"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Partner lecsatlakozott"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Üzenet elküldve"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Közös beszélgetés üzenet kiemelése"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Közös beszélgetési üzenet érkezett"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail E-mail érkezett"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 #, fuzzy
 msgid ""
 "This icon indicates that this message has not yet\n"
@@ -6570,7 +7620,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:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6579,689 +7629,730 @@ 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:793
 msgid "_Quote"
 msgstr "_Idézet"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Műveletek ehhez: \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia cikk elolvasása"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Megnézem a _szótárban"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:835
 #, fuzzy, 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:848
 #, fuzzy, 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:851
 msgid "Web _Search for it"
 msgstr "Rá_keresés a weben"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Megnyit egy _linket"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
-#, python-format
+#: ../src/conversation_textview.py:1386
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Tegnap"
 msgstr[1] "%i nappal ezelőtt"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344
-#: ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tárgy: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "Nem lehet betölteni a képet"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Média típus nem támogatott: %s"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:592
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Ez a Jabber Azonosító már a listán van"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
-msgstr "A Jabber Azonosító amit beírt már szerepel a listán. Válasszon egy másikat."
+msgstr ""
+"A Jabber Azonosító amit beírt már szerepel a listán. Válasszon egy másikat."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "uj@jabber.id"
 
-#: ../src/dataforms_widget.py:616
-#: ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "uj%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Partner neve: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber Azonosító: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Csoport"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "A csoportban"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Kulcs azonosító"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Partner neve"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Hangulat beállítása"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Állapot üzenet"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Állapot üzenet"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Felülítja az állapotüzenetet?"
 
-#: ../src/dialogs.py:794
-msgid "This name is already used. Do you want to overwrite this status message?"
-msgstr "Ez a név már használatban van. Felül szeretnéd írni ezt az állapotüzenetet?"
+#: ../src/dialogs.py:805
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Ez a név már használatban van. Felül szeretnéd írni ezt az állapotüzenetet?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Mentés sablon állapotüzenetként"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Kérlek írj be egy nevet ehhez az állapotüzenethez"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM cím:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG szám:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ szám:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN cím:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! cím:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Kérlek töltsd ki annak a partnernek az adatait akit hozzá szeretnél adni %s"
+msgstr ""
+"Kérlek töltsd ki annak a partnernek az adatait akit hozzá szeretnél adni %s"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
-msgstr "Kérlek töltsd ki annak a partnernek az adatait akit hozzá szeretnél adni"
+msgstr ""
+"Kérlek töltsd ki annak a partnernek az adatait akit hozzá szeretnél adni"
 
-#: ../src/dialogs.py:1039
-#: ../src/dialogs.py:1045
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Érvénytelen felhasználói azonosító"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "A felhasználói azonosító nem tartalmazhat erőforrást"
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Nem veheted fel saját magad a névsorra."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "A partner már a névsoron van"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Ez a partner már fel van véve a névsorba."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Felhasználói azonosító:"
 
-#: ../src/dialogs.py:1175
-msgid "A GTK+ jabber client"
-msgstr "Egy GTK+ jabber kliens"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Egy GTK+ Jabber kliens"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzió:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzió:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Jelenlegi fejlesztők:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Fejlesztők voltak:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "KÖSZÖNET:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1305
 msgid "Last but not least, we would like to thank all the package maintainers."
-msgstr "Végül de nem utolsó sorban köszönetet szeretnénk mondani az összes csomag karbantartónak."
+msgstr ""
+"Végül de nem utolsó sorban köszönetet szeretnénk mondani az összes csomag "
+"karbantartónak."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1213
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Gabriel Papp <gabriel.papp@gmx.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1500
 #, 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 ""
-"Fel kell telepítened a(z) %s szótárat hogy használhasd a helyesírás-ellenőrzést, vagy válassz egy másik nyelvet a beszélő_nyelv opció beállításával.\n"
+"Fel kell telepítened a(z) %s szótárat hogy használhasd a helyesírás-"
+"ellenőrzést, vagy válassz egy másik nyelvet a beszélő_nyelv opció "
+"beállításával.\n"
 "\n"
 "A félregépelt szövegek kiemelése funkció nem lesz használva"
 
-#: ../src/dialogs.py:1935
-#: ../src/dialogs.py:2322
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Nem biztonságos kapcsolat"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Nem biztonságos kapcsolaton keresztül történő csatlakozás előtt állsz. Ez "
+"azt jelenti, hogy az összes beszélgetésed titkosítatlanul fog továbbítódni. "
+"Biztosan ezt szeretnéd tenni?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Igen, ennek ellenére szeretnék csatlakozni"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "_Ne kérdezzen meg újra"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "A becenévben nem megengedett karakterek vannak."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Feliratkozási kérelem ehhez a fiókhoz: %(account)s, e(zek)től a felhasználó(k)tól %(jid)s"
+msgstr ""
+"Feliratkozási kérelem ehhez a fiókhoz: %(account)s, e(zek)től a "
+"felhasználó(k)tól %(jid)s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Feliratkozási kérelem tőle: %s"
 
-#: ../src/dialogs.py:2131
-#: ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Már benne vagy a közös beszélgetésben %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "Addig nem léphetsz be közös társalgásba amíg csatlakozva vagy."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Csatlakozás közös társalgáshoz ezzel a fiókkal: %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Rossz URI"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Ez nem egy közös társalgás"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Érvénytelen fiók"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2599
 #, fuzzy
-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."
+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:2611
 msgid "Invalid Nickname"
 msgstr "Érvénytelen becenév"
 
-#: ../src/dialogs.py:2326
-#: ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Érvénytelen közös társalgási Jabber Azonosító"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
-msgstr "Kérlek írd be a közös társalgás Jabber Azonosítóját úgy mint: szoba@szerver."
+msgstr ""
+"Kérlek írd be a közös társalgás Jabber Azonosítóját úgy mint: szoba@szerver."
 
-#: ../src/dialogs.py:2333
-#: ../src/groupchat_control.py:1833
-msgid "The group chat Jabber ID has not allowed characters."
-msgstr "A közös társalgás Jabber Azonosítójában nem megengedett karakterek vannak."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
+msgstr ""
+"A közös társalgás Jabber Azonosítójában nem megengedett karakterek vannak."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Ez nem egy közös társalgás"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nem a közös beszélgetés neve."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Kapcsolat nélkül nem szinkronizálhatod a partnereid."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Szerver"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Ez a fiók nem kapcsolódik a szerverhez"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Addig nem szinkronizálhatod a fiókkal amíg csatlakozva van."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Szinkronizálás"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Beszélgetés kezdeményezése ezzel a fiókkal: %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Beszélgetés kezdeményezése"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
-msgstr "Írd be annak a partnernek a Jabber Azonosítóját vagy becenevét, akinek üzenetet szeretnél küldeni."
+msgstr ""
+"Írd be annak a partnernek a Jabber Azonosítóját vagy becenevét, akinek "
+"üzenetet szeretnél küldeni."
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536
-#: ../src/dialogs.py:2917
-#: ../src/dialogs.py:3129
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Kapcsolat nem elérhető"
 
-#: ../src/dialogs.py:2537
-#: ../src/dialogs.py:2918
-#: ../src/dialogs.py:3130
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Győződj meg róla, hogy ezzel vagy csatlakozva: \"%s\"."
 
-#: ../src/dialogs.py:2546
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Érvénytelen Jabber Azonosító"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nem értelmezhező \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Kapcsolat nélkül nem változtathatod meg a jelszavad."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Érvénytelen jelszó"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Be kell írnod egy jelszót."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "A beírt jelszavak nem egyeznek"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "A jelszavaknak egyezniük kell egymással mindkét mezőben."
 
-#. default value
-#: ../src/dialogs.py:2619
-#: ../src/notify.py:247
-#: ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Partner bejelentkezett"
-
-#: ../src/dialogs.py:2621
-#: ../src/notify.py:255
-#: ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Partner kijelentkezett"
-
-#. chat message
-#: ../src/dialogs.py:2623
-#: ../src/notify.py:277
-#: ../src/notify.py:477
-msgid "New Message"
-msgstr "Új üzenet"
-
-#. single message
-#: ../src/dialogs.py:2623
-#: ../src/notify.py:259
-#: ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Új levél"
-
-#. private message
-#: ../src/dialogs.py:2624
-#: ../src/notify.py:265
-#: ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Új privát üzenet"
-
-#: ../src/dialogs.py:2624
-#: ../src/gui_interface.py:1358
-#: ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Új E-mail"
 
-#: ../src/dialogs.py:2626
-#: ../src/gui_interface.py:1420
-#: ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Fileátviteli kérelem"
 
-#: ../src/dialogs.py:2628
-#: ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389
-#: ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Fileátvitel hiba"
 
-#: ../src/dialogs.py:2630
-#: ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489
-#: ../src/gui_interface.py:1506
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Fileátvitel befejezve"
 
-#: ../src/dialogs.py:2631
-#: ../src/gui_interface.py:1469
-#: ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Fileátvitel megállítva"
 
-#: ../src/dialogs.py:2633
-#: ../src/gui_interface.py:1152
-#: ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Meghívó közös társalgásba"
-
-#: ../src/dialogs.py:2635
-#: ../src/notify.py:239
-#: ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "A partner megváltoztatta az állapotát"
-
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Levél ezzel a fiókkal: %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Levél ebben a fiókban %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Levél"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Elküldött %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Fogadott %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:3185
 #, python-format
 msgid "Form %s"
 msgstr "Feladó %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s írta:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML parancssor ehhez: %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML parancssor"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "hozzáad"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "módosít"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "eltávolít"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3508
 #, 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> szeretne <b>%(action)s</b> néhány partnerhez a névsoron."
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204
-#: ../src/dialogs.py:3250
-msgid "Add"
-msgstr "Hozzáad"
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> szeretne <b>%(action)s</b> néhány partnerhez a névsoron."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206
-#: ../src/dialogs.py:3281
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Módosít"
 
-#: ../src/dialogs.py:3212
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber Azonosító"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Csoportok"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s javasolta nekem hogy vegyelek fel a névsoromba."
 
-#: ../src/dialogs.py:3340
-#, python-format
-msgid "Added  %s contacts"
-msgstr "%s partner hozzáadva"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "%s partner hozzáadva"
+msgstr[1] "%s partner hozzáadva"
+
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "%s partner eltávolítva"
+msgstr[1] "%s partner eltávolítva"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
-msgid "Removed  %s contacts"
-msgstr "%s partner eltávolítva"
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3779
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Érvénytelen szervernév"
+
+#: ../src/dialogs.py:3780
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3827
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:4047
+#, fuzzy
+msgid "There is an error"
+msgstr "A szolgáltatás hibát jelzett."
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Magánéleti lista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Magánéleti lista ehhez: %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:4186
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Sorrend: %(order)s, művelet: %(action)s, típus: %(type)s, érték: %(value)s"
+msgstr ""
+"Sorrend: %(order)s, művelet: %(action)s, típus: %(type)s, érték: %(value)s"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sorrend: %(order)s, művelet: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Szabály szerkesztése</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Szabály hozzáadása</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Magánéleti listák ehhez: %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Magánéleti listák"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Érvénytelen listanév"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Be kell írnod egy nevet hogy magánéleti listát készíthess."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Meghívtak közös társalgásba"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Partner meghívott téged hogy csatlakozz egy beszélgetéshez"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Partner meghívott téged egy közös társalgásba %(room_jid)s"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Megjegyzés: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "El szeretnéd fogadni a meghívást?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "Válassz kliens tanusítványt #PCKS12"
 
-#: ../src/dialogs.py:3942
-#: ../src/dialogs.py:3985
-#: ../src/dialogs.py:4041
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Minden file"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "PKCS12 Fileok"
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Válassz hangot"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav hangok"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Válassz képet"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Képek"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4847
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Válassz képet"
+
+#: ../src/dialogs.py:4865
+#, fuzzy
+msgid "Zip files"
+msgstr "Minden file"
+
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Amint %s válik:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Egyedi figylemeztetés hozzáadása hozzá: %s"
 
-#: ../src/dialogs.py:4190
-msgid "Condition"
-msgstr "Kondíció"
-
-#: ../src/dialogs.py:4310
-msgid "when I am "
-msgstr "Amint én "
-
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7272,591 +8363,677 @@ msgstr ""
 "\n"
 "Ennek a munkamenetnek a rövid hitelesítési jele a következő: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Már hitelesítetted ennek a partnernek a kilétét."
 
-#: ../src/dialogs.py:4795
-#: ../src/dialogs.py:4879
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Partner kiléte hitelesítve"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Újra hitelesít..."
 
-#: ../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 "Azért hogy biztos lehess benne <b>csak</b> az a személy tudja olvasni az üzeneteid akit szeretnél, hitelesítened kell az ő személyazonosságát azzal hogy a gombra kattintasz alább."
+#: ../src/dialogs.py:5133
+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 ""
+"Azért hogy biztos lehess benne <b>csak</b> az a személy tudja olvasni az "
+"üzeneteid akit szeretnél, hitelesítened kell az ő személyazonosságát azzal "
+"hogy a gombra kattintasz alább."
 
-#: ../src/dialogs.py:4809
-#: ../src/dialogs.py:4860
-#: ../src/dialogs.py:4873
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "A partner személyazonossága NINCS hitelesítve"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Hitelesítés..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Hitelesítetted már a partnered személyazonosságát?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5153
 #, fuzzy, 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 ""
-"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>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5154
 #, fuzzy
 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:5189
 #, fuzzy, 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."
+msgstr ""
+"The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 
-#: ../src/dialogs.py:4867
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Nincs GPG kulcs hozzárendelve ehhez a partnerhez, így nem tudod titkosítani az üzeneteket"
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+"Nincs GPG kulcs hozzárendelve ehhez a partnerhez, így nem tudod titkosítani "
+"az üzeneteket"
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5202
 #, fuzzy
-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 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."
+msgid ""
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
+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
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "Hozzá van rendelve GPG kulcs ehhez a partnerhez és meg is bízol a kulccsában, tehát az üzenetek titkosítva lesznek."
+#: ../src/dialogs.py:5208
+#, fuzzy
+msgid ""
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
+msgstr ""
+"Hozzá van rendelve GPG kulcs ehhez a partnerhez és meg is bízol a "
+"kulccsában, tehát az üzenetek titkosítva lesznek."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "egy hang és videó"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "egy hang"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "egy videó"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5281
 #, fuzzy, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
-msgstr "%(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 wants to start %(type)s session with you. Do you want to answer "
+"the call?"
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "for account %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Kliens tanusítvány"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Egyebek"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Kapcsolat nélkül nem böngészheted az elérhető szolgáltatásokat"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Szolgáltatás felderítés ennek a fióknak a használatával: %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Szolgáltatás felderítés"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "A szolgáltatás nem található"
 
-#: ../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 "Nincs szolgáltatás azon a címen amit beírtál, vagy a szogáltató nem válaszol. Ellenőrizd a címet és próbáld újra."
+#: ../src/disco.py:762
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Nincs szolgáltatás azon a címen amit beírtál, vagy a szogáltató nem "
+"válaszol. Ellenőrizd a címet és próbáld újra."
 
-#: ../src/disco.py:746
-#: ../src/disco.py:1082
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "A szolgáltatás nem böngészhető"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Ez a típusú szolgáltatás nem tartalmaz böngészhető elemeket."
 
-#: ../src/disco.py:786
-#: ../src/disco.py:796
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Érvénytelen szervernév"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:873
 #, fuzzy, 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:917
 msgid "_Browse"
 msgstr "_Tallózás"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Ez a szolgáltatás nem tartalmaz olyan elemet amely böngészhető lenne."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "Parancs _futtatása"
 
-#: ../src/disco.py:1333
-#: ../src/disco.py:1504
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gisztrál"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Felhasználók"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Leírás"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Azonosító"
 
-#: ../src/disco.py:1817
-#: ../src/gui_interface.py:3182
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Ez a könyvjelző már fel van véve"
 
-#: ../src/disco.py:1818
-#: ../src/gui_interface.py:3183
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, fuzzy, 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:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "A könyvjelző sikeresen hozzá lett adva"
 
-#: ../src/disco.py:1828
-#: ../src/gui_interface.py:3198
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "A könyvjelzőkezelőt a névsor tetején lévő \"Műveletek\" menüben éred el"
+msgstr ""
+"A könyvjelzőkezelőt a névsor tetején lévő \"Műveletek\" menüben éred el"
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Feliratkozva"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Csomópont"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Új bejegyzés"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Feliratkozás"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Leiratkozás"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
-msgstr "SSL tanusítvány hitelesítés"
-
 #: ../src/features_window.py:50
 #, fuzzy
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "A library used to validate server certificates to ensure a secure connection."
+msgid "SSL certificate validation"
+msgstr "SSL tanusítvány hitelesítés"
 
 #: ../src/features_window.py:51
-#: ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#, fuzzy
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"A library used to validate server certificates to ensure a secure connection."
+
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "python-pyopenssl szükséges hozzá."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Szerver nélküli beszélgetés a helyi hálózaton automatikusan felismert kliensekkel."
+msgstr ""
+"Szerver nélküli beszélgetés a helyi hálózaton automatikusan felismert "
+"kliensekkel."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "python-avahi szükséges hozzá."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "pybonjour szükséges (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Parancssor"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Egy szkript a Gajim parancssorból történő vezérlésére"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "python-dbus szükséges hozzá."
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Ez a funkció nem elérhető Windowson."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP üzenettitkosítás"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Üzenetek titkosítása GPG kulcsokkal"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "gpg és python-GnuPGInterface szükséges hozzá."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Hálózat kezelő"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Hálózati kapcsolat automatikus észlelése"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "gnome-network-manager és python-dbus szükséges hozzá."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Munkamenet kezelés"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
-msgstr "A Gajim munkamenet el lesz mentve kijelentkezéskor és vissza lesz állítva bejelentkezéskor."
+msgstr ""
+"A Gajim munkamenet el lesz mentve kijelentkezéskor és vissza lesz állítva "
+"bejelentkezéskor."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "python-gnome2 szükséges hozzá."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Jelszó titkosítás"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
-msgstr "A jelszavakat biztonságosan lehet tárolni nem csak egyszerű szöveges formátumban."
+msgstr ""
+"A jelszavakat biztonságosan lehet tárolni nem csak egyszerű szöveges "
+"formátumban."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "gnome-keyring és python-gnome2-desktop, vagy kwalletcli szükséges hozzá."
+msgstr ""
+"gnome-keyring és python-gnome2-desktop, vagy kwalletcli szükséges hozzá."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
-msgstr "Képesség hogy SRV bejegyzéseket használó szerverekhez lehessen csatlakozni."
+msgstr ""
+"Képesség hogy SRV bejegyzéseket használó szerverekhez lehessen csatlakozni."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "dnsutils szükséges hozzá."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "nslookup szükséges hogy SRV bejegyzéseket lehessen használni."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Helyesírás-ellenőrző"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "A fogalmazott üzenetek helyesírás ellenőrzése"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "libgtkspell szükséges hozzá."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "libgtkspell szükséges hozzá."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Értesítés"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Passzív felugró ablakok figyelmeztetnek az új eseményekről."
 
-#: ../src/features_window.py:87
-#, fuzzy
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
+#: ../src/features_window.py:88
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatikus állapot"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 #, fuzzy
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Képesség hogy mérje a tétlenül eltöltött időt az automatikus állapotüzenet beállításához"
+msgstr ""
+"Képesség hogy mérje a tétlenül eltöltött időt az automatikus állapotüzenet "
+"beállításához"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "libxss könyvtár szükséges."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "python2.5 szükséges."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-#, fuzzy
-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."
-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."
-msgstr "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "End to End üzenettitkosítás"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Chat üzenetek titkosítása."
 
-#: ../src/features_window.py:99
-#: ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "python-crypto szükséges hozzá."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST Generátor"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Generate XHTML output from RST code (see 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 ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103
-#: ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "python-docutils szükséges hozzá."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Képesség hogy beszélgetést kezdeményezzünk hanggal és videóval."
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "python-farsight szükséges."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "python-gnome2 szükséges hozzá."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "python-dbus szükséges hozzá."
+
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "Elérhető"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Funkció"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Idő"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Állapot"
 
-#: ../src/filetransfers_window.py:178
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Filenév: %s"
 
-#: ../src/filetransfers_window.py:179
-#: ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Méret: %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/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Te üzeneted"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Feladó: %s"
 
-#: ../src/filetransfers_window.py:190
-#: ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Címzett: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Elmentve ebbe: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Fileátvitel sikeres"
-
-#: ../src/filetransfers_window.py:218
-#: ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Fileátvitel megszakítva"
-
-#: ../src/filetransfers_window.py:218
-#: ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Nem létesíthető kapcsolat a partnerrel."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Címzett: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Hibaüzenet: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Fileátvitel megállítva"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Válaszd ki az elküldendő filet..."
 
-#: ../src/filetransfers_window.py:273
-#: ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Leírás: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "A Gajim nem fér hozzá ehhez a filehoz"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Ez a filet egy másik folyamat használja."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "File: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Típus: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Leírás: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s egy filet szeretne küldeni neked:"
-
-#: ../src/filetransfers_window.py:342
-#: ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nem lehet kicserélni a létező filet \"%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 "Egy file már létezik ezzel a névvel és neked nincs jogosultságod ahhoz, hogy felülírd."
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Egy file már létezik ezzel a névvel és neked nincs jogosultságod ahhoz, hogy "
+"felülírd."
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Ez a file már létezik"
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "What do you want to do?"
 msgstr "Mit szeretnél csinálni?"
 
-#. 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
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "A(z) \"%s\" könyvtár nem írható"
 
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nincs jogosultságod file létrehozására ebbe a könyvtárba"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "File mentése másként..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "File: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Típus: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Leírás: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s egy filet szeretne küldeni neked:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Profil küldése..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Fileátvitel hiba"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, fuzzy, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7864,455 +9041,524 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, fuzzy, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585
-#: ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Érvénytelen file"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Nem lehet üres fileokat küldeni"
 
-#: ../src/filetransfers_window.py:613
-#: ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Név: "
 
-#: ../src/filetransfers_window.py:615
-#: ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Feladó: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "üzenet"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Hangulatjelek:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Csak a főablakban jelenítse meg"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Bővített Konfiguráció Szerkesztő"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s konfiguráció hiba"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "A Gajimnak szüksége van az X szerverre a futáshoz. Kilépés..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "PyGTK importálása meghiúsult: %s"
 
-#: ../src/gajim.py:186
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "A Gajimnap PyGTK 2.16-ra vagy újabbra van szüksége"
 
-#: ../src/gajim.py:187
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "A Gajimnak PyGTK 2.16-ra, vagy újabbra van szüksége a futáshoz. Kilépés..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+msgstr ""
+"A Gajimnak PyGTK 2.16-ra, vagy újabbra van szüksége a futáshoz. Kilépés..."
 
-#: ../src/gajim.py:189
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "A Gajimnap szüksége van a GTK 2.16-ra vagy újabbra"
 
-#: ../src/gajim.py:190
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "A Gajimnak szüksége van a GTK 2.16-ra vagy újabbra a futáshoz. Kilépés..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+msgstr ""
+"A Gajimnak szüksége van a GTK 2.16-ra vagy újabbra a futáshoz. Kilépés..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "A Gajimnak szüksége van a pywin32-re a futáshoz"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Kérlek győződj meg róla hgy a Pywin32 fel van telepítve a számítógépedre. Ezen a címen érheted el: %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Kérlek győződj meg róla hgy a Pywin32 fel van telepítve a számítógépedre. "
+"Ezen a címen érheted el: %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "A Gajim már fut"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr "Úgy tűnik egy másik Gajim már fut. Futtatsz mégegyet?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Mutassa a súgót az egyes parancsoknál"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "parancs"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mutass súgót az egyes parancsoknál"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Megjeleníti vagy elrejti a névsor ablakot"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Megnyit egy ablakot a következő függő eseménnyel"
 
-#: ../src/gajim-remote.py:93
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Kiír egy listát az összes névsoron lévő partnerről. Minden partner külön sorba kerül"
-
-#: ../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"
+#: ../src/gajim-remote.py:94
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Kiír egy listát az összes névsoron lévő partnerről. Minden partner külön "
+"sorba kerül"
+
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "fiók"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 #, fuzzy
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Kiír egy listát a regisztrált fiókokról"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Megváltoztatja az állapotát egy fióknak vagy több fióknak"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "állapot"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use accoun't previous status"
-msgstr "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account's previous status"
+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. If not set, use "
+"account's previous status"
 
-#: ../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"
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
 msgstr "üzenet"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "állapotüzenet"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 #, fuzzy
-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"
+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
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "Egy vagy több fiók prioritását változtatja meg"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "prioritás"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "a prioritás amit hozzá szeretnél rendelni egy fiókhoz"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:122
 #, 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 "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
+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.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Megmutatja a beszélgetőablakot, tehát tudsz üzenetet küldeni a partnernek"
+msgstr ""
+"Megmutatja a beszélgetőablakot, tehát tudsz üzenetet küldeni a partnernek"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
-msgstr "Annak a partnernek a Jabber Azonosítója, amelyikkel beszélgetni szeretnél"
+msgstr ""
+"Annak a partnernek a Jabber Azonosítója, amelyikkel beszélgetni szeretnél"
 
-#: ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 #, fuzzy
 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
+#: ../src/gajim-remote.py:135
 #, fuzzy
 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.py:140
 #, fuzzy
-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 "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 ''."
+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 ""
+"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 ''."
 
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Annak a partnernek a Jabber Azonosítója aki az üzenetet kapni fogja"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "üzenet tartalma"
 
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "PGP kulcs"
 
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ha be van állítva, az üzenet ezzel a publikus kulccsal lesz titkosítva"
 
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ha be van állítva, az üzenet ezzel a fiókkal lesz elküldve"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 #, fuzzy
-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 "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 ''."
+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 ""
+"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 ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tárgy"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "üzenet tárgya"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Új üzenetet küld egy olyan közös beszélgetésbe amelyhez csatlakoztál."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "A Jabber Azonosítója annak a szobának ami meg fogja kapni az üzenetet"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Részletes információkat kér le a partnerről"
 
-#: ../src/gajim-remote.py:177
-#: ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Partner Jabber Azonosítója"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Részletes információkat kér le a fiókról"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Fiók neve"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Filet küld egy partnernek"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "File elérési útvonala"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ha be van állítva, a file ezen a fiókon keresztül lesz elküldve"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Kilistáz minden beállítást és azok értékeit"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 #, fuzzy
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "kulcs=érték"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 #, fuzzy
 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.py:208
 msgid "Deletes a preference item"
 msgstr "Töröl egy beállítási elemet"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "kulcs"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "a beállítás neve ami törlődni fog"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Kiírja a Gajim beállításainak jelenlegi állapotát egy .config fileba"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Eltávolítja a partnert a névsorról"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Hozzáad egy partnert a névsorhoz"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "Jabber Azonosító"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Új partnert vesz fel ehhez a fiókhoz"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "A jelenlegi állapotot adja vissza (a globálisat, ha nincs fiók beállítva)"
+msgstr ""
+"A jelenlegi állapotot adja vissza (a globálisat, ha nincs fiók beállítva)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:243
 #, 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)"
+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:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Visszaadja az olvasatlan üzenetek számát"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Megnyitja a \"Beszélgetés kezdeményezése\" párbeszédet"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Beszélgetés kezdeményezése ennek a fióknak a használatával"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Egyedi XML-t küld"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "küldendő XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 #, fuzzy
-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"
+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.py:268
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "Avatar megváltoztatása"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "Használni kívánt kép"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 #, 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 avatar will be set; if not specified, the avatar will be set for all accounts"
+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 avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Egy xmpp:/ uri kezelése"
 
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "Kezelésre szánt URI"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Account in which you want to handle it"
 msgstr "Account in which you want to handle it"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "Üzenet tartalma"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Csatlakozás egy MUC szobához"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "Szoba Jabber Azonosítója"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "becenév"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "Használandó becenév"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "jelszó"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "Szoba belépési jelszava"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 #, fuzzy
 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
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Ellenőrizd, hogy fut-e a Gajim"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Elrejti vagy megjeleníti az ipython ablakot"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Hiányzó argumentum \"contact_jid\""
 
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, fuzzy, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8321,15 +9567,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Nincs aktív fiókod"
 
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Úgy tűnik nem fut a Gajim, tehát nem használhatod a gajim-remote-t"
 
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote.py:433
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8338,25 +9584,27 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumentumok:"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nincs meg"
 
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:447
 #, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8365,7 +9613,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8374,11 +9622,11 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "Nincs megadva URI"
 
-#: ../src/gajim-remote.py:540
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "Rossz URI"
 
@@ -8404,190 +9652,222 @@ msgid "You cannot delete your current theme"
 msgstr "Nem törölheted a jelenlegi témád"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Kérlek válassz másikat a jelenlegi témádhoz."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s mostantól így szerepel: %(new_nick)s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Nem sikerült elküldeni a privát üzenetet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:238
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Írd be a becenevet"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Beszélgetés vele: "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Folytatott beszélgetés"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s has set the subject to %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272
-#: ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 #, fuzzy
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "A szoba mostantól mutatja a nem elérhető tagokat"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "a szoba mostantól nem mutatja a nem elérhető tagokat"
+
+#: ../src/groupchat_control.py:1293
+#, fuzzy
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "A szoba naplózása mostantól engedélyezve van"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "A szoba naplózása mostantól nincs engedélyezve"
+
+#: ../src/groupchat_control.py:1301
+#, fuzzy
+msgid "Room is now non-anonymous"
+msgstr "Room is now non-anonymous"
+
+#: ../src/groupchat_control.py:1304
+#, fuzzy
+msgid "Room is now semi-anonymous"
+msgstr "Room is now semi-anonymous"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "A szoba mostantól teljesen anonymous"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Szoba naplózása engedélyezve"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Egy új szoba lett létrehozva"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
-msgstr "A szerver hozzárendelte vagy módosította a te beceneved ebben a szobában"
+msgstr ""
+"A szerver hozzárendelte vagy módosította a te beceneved ebben a szobában"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1603
 #, fuzzy, 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:1606
 #, fuzzy, 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:1615
 #, fuzzy, 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:1618
 #, fuzzy, 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:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Mostantól így szerepelsz: %s"
 
-#: ../src/groupchat_control.py:1330
-#: ../src/gui_interface.py:919
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s mostantól így szerepel: %(new_nick)s"
-
-#: ../src/groupchat_control.py:1372
-#: ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "a hovatartozás megváltozott"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1706
 #, fuzzy
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "a rendszer leáll"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1795
 #, fuzzy, 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"
+msgstr ""
+"** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1799
 #, fuzzy, 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:1814
 #, fuzzy, 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:1818
 #, fuzzy, 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:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s távozott"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s csatlakozott a közös beszélgetéshez"
 
-#: ../src/groupchat_control.py:1529
-#: ../src/gui_interface.py:946
-#: ../src/history_window.py:447
-#: ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s mostantól %(status)s"
-
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Biztosan el szeretnéd hagyni ezt a közös beszélgetést: \"%s\"?"
 
-#: ../src/groupchat_control.py:1761
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:2126
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Ha bezárod ezt az ablakot akkor kilépsz ebből a közös beszélgetésből."
 
-#: ../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
-msgid "_Do not ask me again"
-msgstr "_Ne kérdezzen meg újra"
-
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Téma váltása"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Kérlek add meg az új témát:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Becenév megváltoztatása"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kérlek határozd meg az új becenevet amelyet használni szerenél:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+"A közös társalgás Jabber Azonosítójában nem megengedett karakterek vannak."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "%s törlése"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8595,23 +9875,22 @@ msgstr ""
 "Véglegesen törölni szeretnéd ezt a szobát.\n"
 "Ha szeretnél, beírhatsz egy indokot:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Ha szeretnél, beírhatsz egy alternatív értéket:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "%s kirúgása"
 
-#: ../src/groupchat_control.py:2029
-#: ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Ha szeretnél, beírhatsz egy indokot:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "%s bannolása"
@@ -8621,8 +9900,11 @@ msgid "A programming error has been detected"
 msgstr "Egy programozási hibát észleltem"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Minden bizonnyal nem kritikus, de ha szeretnéd, jelezheted a fejlesztőknek."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Minden bizonnyal nem kritikus, de ha szeretnéd, jelezheted a fejlesztőknek."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
@@ -8632,120 +9914,149 @@ msgstr "Hiba _jelentése"
 msgid "Details"
 msgstr "Részletek"
 
-#. we talk about file
-#: ../src/gtkgui_helpers.py:205
-#: ../src/gtkgui_helpers.py:221
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "Hiba: nem lehet %s-t megnyitni olvasásra"
-
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Hiba a file olvasása közben:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Hiba a file értelmezése közben:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:393
 #, fuzzy, 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:767
 msgid "Gajim is not the default Jabber client"
 msgstr "A Gajim nem az alapértelmezett Jabber kliens"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Szeretnéd hogy a Gajim legyen az alapértelmezett Jabber kliens?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Induláskor mindig ellenőrizd, hogy a Gajim-e az alapértelmezett Jabber kliens"
+msgstr ""
+"Induláskor mindig ellenőrizd, hogy a Gajim-e az alapértelmezett Jabber kliens"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Kiterjesztés nem támogatott"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:837
 #, fuzzy, 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:873
 msgid "Save Image as..."
 msgstr "Kép mentése másként..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
+msgid "Unable to join group chat"
+msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
+
+#: ../src/gui_interface.py:135
 #, fuzzy, 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 ""
-"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:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:138
 #, fuzzy
 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:155
 msgid "Do you accept this request?"
 msgstr "Elfogadod ezt a felkérést?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:157
 #, fuzzy, 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:160
 #, fuzzy, 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:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Kapcsolat megszakadt"
 
-#: ../src/gui_interface.py:606
-#: ../src/gui_interface.py:610
+#: ../src/gui_interface.py:287
 #, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Error %(code)s: %(msg)s"
+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."
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621
-#: ../src/gui_interface.py:636
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr "Maximum number of users for %s has been reached"
+
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "Bannolva lettél a közös beszélgetésekből %s."
+
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "Group chat %s does not exist."
+
+#: ../src/gui_interface.py:317
+msgid "Group chat creation is restricted."
+msgstr "Közös beszélgetés létrehozása korlátozva van."
+
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
+msgstr "A regisztrált becenevedet kell használnod a közös beszélgetésben %s."
+
+#: ../src/gui_interface.py:325
 #, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "hiba ennek a küldése során %(message)s ( %(error)s )"
+msgid "You are not in the members list in groupchat %s."
+msgstr "Nem vagy ennek a közös beszélgetésnek a taglistáján %s."
 
-#: ../src/gui_interface.py:663
-#: ../src/notify.py:495
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Error %(code)s: %(msg)s"
+
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Feliratkozási kérelem"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Engedély elfogadva"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:500
 #, fuzzy, 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:508
 #, fuzzy, 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:509
 #, fuzzy
 msgid ""
 "You will always see him or her as offline.\n"
@@ -8754,106 +10065,103 @@ 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:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Leiratkozva"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:541
 #, fuzzy, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:1015
-#, fuzzy, 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
-msgid "Room now shows unavailable member"
-msgstr "A szoba mostantól mutatja a nem elérhető tagokat"
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:1085
-msgid "room now does not show unavailable members"
-msgstr "a szoba mostantól nem mutatja a nem elérhető tagokat"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:658
 #, fuzzy
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "A non-privacy-related room configuration change has occurred"
+msgid ""
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
+msgstr ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
 
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
-msgid "Room logging is now enabled"
-msgstr "A szoba naplózása mostantól engedélyezve van"
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Jelenleg az OpenPGP kulcsod nélkül csatlakozol"
 
-#: ../src/gui_interface.py:1093
-msgid "Room logging is now disabled"
-msgstr "A szoba naplózása mostantól nincs engedélyezve"
+#: ../src/gui_interface.py:663
+msgid "Your passphrase is incorrect"
+msgstr "A jelszavad nem megfelelő"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "Room is now non-anonymous"
-msgstr "Room is now non-anonymous"
+msgid "OpenPGP Passphrase Incorrect"
+msgstr "OpenPGP jelszó nem megfelelő"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:681
 #, fuzzy
-msgid "Room is now semi-anonymous"
-msgstr "Room is now semi-anonymous"
-
-#: ../src/gui_interface.py:1101
-msgid "Room is now fully-anonymous"
-msgstr "A szoba mostantól teljesen anonymous"
+msgid "Certificate Passphrase Required"
+msgstr "A tanusítvány lejárt"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:682
 #, fuzzy, 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."
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:704
 #, fuzzy
-msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
-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
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Jelenleg az OpenPGP kulcsod nélkül csatlakozol"
-
-#: ../src/gui_interface.py:1184
-msgid "Your passphrase is incorrect"
-msgstr "A jelszavad nem megfelelő"
-
-#: ../src/gui_interface.py:1188
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "OpenPGP jelszó nem megfelelő"
-
-#: ../src/gui_interface.py:1214
-msgid "GPG key not trusted"
+msgid "OpenPGP key not trusted"
 msgstr "Nem megbízható GPG kulcs"
 
-#: ../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 "A GPG kulcs amivel ez a beszélgetés lesz titkosítva nem megbízható. Biztosan szeretnéd titkosítani az üzenetet?"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid ""
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
+msgstr ""
+"A GPG kulcs amivel ez a beszélgetés lesz titkosítva nem megbízható. Biztosan "
+"szeretnéd titkosítani az üzenetet?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:717
 #, fuzzy
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, fuzzy, 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:858
 #, fuzzy, 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:871
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -8868,350 +10176,373 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: ../src/gui_interface.py:1455
-#: ../src/roster_window.py:1856
-msgid "Remote contact stopped transfer"
-msgstr "A partner megállította a fileátvitelt"
-
-#: ../src/gui_interface.py:1458
-#: ../src/roster_window.py:1858
-msgid "Error opening file"
-msgstr "Hiba a file megnyitása közben"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Fileküldés Befejezve"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Sikeresen fogadtad a filet %(filename)s tőle: %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1063
 #, fuzzy, 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
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "File transfer of %(filename)s from %(name)s stopped."
+
+#: ../src/gui_interface.py:1080
 #, fuzzy, 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:1084
 #, fuzzy, 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
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Nem lehet tőle visszafejteni az üzenetet: %s\n"
-"Elképzelhető, hogy szabotázs történt."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Nem lehet visszafejteni az üzenetet"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "felhasználónév összeférhetetlenség"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Kérlek írj be egy új felhasználónevet a helyi fiókodhoz"
 
-#: ../src/gui_interface.py:1716
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1729
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1740
-msgid "Error."
-msgstr "Hiba."
-
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Erőforrás összeférhetetlenség"
 
-#: ../src/gui_interface.py:1769
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Már csatlakozva vagy ehhez a fiókhoz ugyanazzal az erőforrással. Kérlek írj be egy másikat"
+#: ../src/gui_interface.py:1192
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Már csatlakozva vagy ehhez a fiókhoz ugyanazzal az erőforrással. Kérlek írj "
+"be egy másikat"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s szeretne élőszóban beszélni veled."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Élőszavas beszélgetés kérelem"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Hiba az SSL tanusítvány ellenőrzése közben"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1338
 #, fuzzy, 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 ""
-"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?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Mellőzd ezt a hibát ehhez a tanusítványhoz."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL tanusítvány hiba"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL tanusítvány hiba"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1375
 #, fuzzy, 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 ""
-"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?"
 
-#: ../src/gui_interface.py:1987
-#: ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
-msgid "Insecure connection"
-msgstr "Nem biztonságos kapcsolat"
-
-#: ../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 "Nem biztonságos kapcsolaton keresztül történő csatlakozás előtt állsz. Ez azt jelenti, hogy az összes beszélgetésed titkosítatlanul fog továbbítódni. Biztosan ezt szeretnéd tenni?"
-
-#: ../src/gui_interface.py:1991
-#: ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
-msgid "Yes, I really want to connect insecurely"
-msgstr "Igen, ennek ellenére szeretnék csatlakozni"
-
-#: ../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 "A jelszavad nem biztonságos kapcsolaton keresztül történő elküldése előtt állsz. Hogy ezt megakadályozd, feltelepítheted a PyOpenSSL-t. Biztosan szeretnéd folytatni ennek ellenére?"
+#: ../src/gui_interface.py:1447
+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 ""
+"A jelszavad nem biztonságos kapcsolaton keresztül történő elküldése előtt "
+"állsz. Hogy ezt megakadályozd, feltelepítheted a PyOpenSSL-t. Biztosan "
+"szeretnéd folytatni ennek ellenére?"
 
-#: ../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 "A jelszavad nem biztonságos kapcsolaton keresztül történő titkosítatlan továbbítása előtt állsz. Biztosan szeretnéd folytatni?"
+#: ../src/gui_interface.py:1489
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"A jelszavad nem biztonságos kapcsolaton keresztül történő titkosítatlan "
+"továbbítása előtt állsz. Biztosan szeretnéd folytatni?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624
-#: ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Hangulatjelek letiltva"
 
-#: ../src/gui_interface.py:2625
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "A beállított hangulatjel témád nem található, ezért a hangulatjelek le lesznek tiltva."
+#: ../src/gui_interface.py:1996
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"A beállított hangulatjel témád nem található, ezért a hangulatjelek le "
+"lesznek tiltva."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2019
 #, fuzzy
-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 "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."
+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 ""
+"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."
 
-#: ../src/gui_interface.py:2679
-#: ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Amíg láthatatlan vagy nem csatlakozhatsz közös beszélgetéshez"
 
 #. 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:2450
 msgid "Could not save your settings and preferences"
 msgstr "Nem lehet elmenteni a beállításaid."
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3043
 #, fuzzy
 msgid "Passphrase Required"
 msgstr "Jelszó szükséges (vagy jelmondat?)"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP 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
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG kulcs lejárt"
 
-#: ../src/gui_interface.py:3608
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "A GPG kulcsod lejárt, csatlakoztatva leszel ide: %s Open PGP nélkül."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Rossz jelszó"
 
-#: ../src/gui_interface.py:3618
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Kérlek írd be újra a GPG jelszavad, vagy kattints a mégsére"
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "Ú_j közös társalgás"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Hozzá szeretnélek adni a névsoromhoz"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "%s könyvtár létrehozása"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Nem található az előzménynapló adatbázisa"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Partnerek"
-
 #. holds time
-#: ../src/history_manager.py:167
-#: ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Dátum"
 
 #. holds nickname
-#: ../src/history_manager.py:173
-#: ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Becenév"
 
 #. holds message
-#: ../src/history_manager.py:181
-#: ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Üzenet"
 
-#: ../src/history_manager.py:241
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Biztosan ki szeretnéd takarítani az adatbázist? (ERŐSEN NEM AJÁNLOTT, HA FUT A GAJIM)"
+#. holds subject
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
+msgid "Subject"
+msgstr "Tárgy"
+
+#: ../src/history_manager.py:262
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Biztosan ki szeretnéd takarítani az adatbázist? (ERŐSEN NEM AJÁNLOTT, HA FUT "
+"A GAJIM)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 #, fuzzy
 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 ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, otherwise 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, "
+"otherwise click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Adatbázis hiba"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Előzménynaplók exportálása..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, fuzzy, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Biztosan szeretnéd törölni a kiválasztott partner naplóit?"
-msgstr[1] "Biztosan szeretnéd törölni a kiválasztott partnerek naplóit?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Biztosan szeretnéd törölni a kiválasztott partner naplóit?"
 
-#: ../src/history_manager.py:576
-#: ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Ez egy visszafordíthatatlan művelet"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Megerősítés megszakítása"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
 msgstr[1] "Biztosan szeretnéd törölni a kiválasztott üzeneteket?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Beszélgetésnapló vele: %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Lemezhiba"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Hiba: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Az állapot mostantól: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Az állapot mostantól: %(status)s"
 
-#: ../src/htmltextview.py:515
-#: ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Időtúllépés a kép betöltése közben"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programozik"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Túl nagy a kép"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Több lap bezárása előtt állsz"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Biztosan mindet be szeretnéd zárni?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Beszélgetések"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Közös beszélgetések"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Privát beszélgetések"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Üzenetek"
 
@@ -9223,317 +10554,358 @@ msgstr "- üzenetek naplózva lesznek"
 msgid "- messages will not be logged"
 msgstr "- üzenetek nem lesznek naplózva"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s megváltoztatta állapotát"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Mellőz"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s bejelentkezett"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s kijelentkezett"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "%s bannolása"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Új levél tőle: %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Regisztráció nem sikerült"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Új privát üzenet ebből a közös beszélgetésből: %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, fuzzy, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Service sent malformed data"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Üzenetet írta: %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Ez a file már létezik"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Új üzenet tőle: %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Mellőz"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Szoba Konfiguráció"
 
-#: ../src/profile_window.py:57
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "A file üres"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Profil lekérése..."
 
-#: ../src/profile_window.py:110
-#: ../src/roster_window.py:2935
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "A file üres"
 
-#: ../src/profile_window.py:113
-#: ../src/roster_window.py:2938
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "A file nem létezik"
 
 #. 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:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Nem lehet a képet betölteni"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "Rossz dátumformátum"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "A dátumformátumnak ilyennek kell lenni: ÉÉÉÉ-HH-NN (Év-Hó-Nap)"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Információ érkezett"
 
-#: ../src/profile_window.py:340
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Kapcsolat nélkül nem tudod közzétenni a partnerinformációd"
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Profil küldése..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Az információ NEM LETT közzétéve"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard közzététel nem sikerült"
 
-#: ../src/profile_window.py:376
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Hiba lépett fel a személyes információid közzététele közben. Próbáld meg később."
+#: ../src/profile_window.py:412
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Hiba lépett fel a személyes információid közzététele közben. Próbáld meg "
+"később."
 
-#: ../src/roster_window.py:256
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Összevont fiókok"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Engedély elküldve"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:2060
 #, fuzzy, 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:2083
 msgid "Subscription request has been sent"
 msgstr "Feliratkozási kérelem elküldve"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:2084
 #, fuzzy, 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:2098
 msgid "Authorization has been removed"
 msgstr "Engedély eltávolítva"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:2099
 #, fuzzy, 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
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "A GPG nem használható"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Csatlakoztatva leszel hozzá: %s, OpenPGP nélkül."
 
-#: ../src/roster_window.py:2199
-#: ../src/roster_window.py:3496
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Egy vagy több közös beszélgetésben veszel részt"
 
-#: ../src/roster_window.py:2200
-#: ../src/roster_window.py:3497
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 #, fuzzy
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:2361
 #, fuzzy
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2427
 #, fuzzy
 msgid "Really quit Gajim?"
 msgstr "Really quit Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2428
 #, fuzzy
 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:2429
 #, fuzzy
 msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "You have running file transfers"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2520
 #, fuzzy
-msgid "If you quit now, the file(s) being transfered will be stopped. Do you still want to quit?"
-msgstr "If you quit now, the file(s) being transferred will be stopped. Do you still want to quit?"
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
 
-#: ../src/roster_window.py:2405
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 #, fuzzy
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2552
 #, fuzzy
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
-msgstr "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+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:2989
 #, fuzzy
 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:2992
 #, fuzzy, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2993
 #, fuzzy
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "You will no longer be able to send and receive messages from contacts using this transport."
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+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:2996
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "You will no longer be able to send and receive messages to contacts from these transports: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+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:3043
 #, fuzzy
 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:3045
 #, fuzzy
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "This contact will see you offline and you will not receive messages he will send you."
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:3084
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:3085
 #, fuzzy, 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:3092
 #, fuzzy
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:3093
 #, fuzzy, 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:3138
 #, fuzzy
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:3139
 #, fuzzy, 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:3140
 #, fuzzy
 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:3179
 #, fuzzy
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:3180
 #, fuzzy
 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:3635
 #, fuzzy, 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:3637
 #, fuzzy, 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:3642
 #, fuzzy
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "By removing this contact you also remove authorisation resulting in him or her always seeing you as offline."
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"By removing this contact you also remove authorisation resulting in him or "
+"her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3652
 #, fuzzy
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "By removing this contact you also by default remove authorisation resulting in him or her always seeing you as offline."
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+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:3655
 #, fuzzy
 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:3659
 #, fuzzy
 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:3664
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9542,63 +10914,86 @@ 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:3722
 #, 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?"
+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:3724
 #, fuzzy, 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 "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."
+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 ""
+"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."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3743
 #, fuzzy
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3744
 #, fuzzy
 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:4456
 #, fuzzy
 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:4458
 #, fuzzy
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
+msgid ""
+"Your server does not support storing metacontacts information. So this "
+"information will not be saved on next reconnection."
+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:4550
 #, fuzzy
-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?"
+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:4552
 #, fuzzy
-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 "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."
+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 ""
+"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."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Érvénytelen file URI:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4685
 #, 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] "Szeretnéd ezt a fájlt elküldeni neki(k)? %s:"
 msgstr[1] "Szeretnéd ezeket a fájlokat elküldeni neki(k)? %s:"
 
-#: ../src/roster_window.py:4361
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Send %s to %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Make %s and %s metacontacts"
+
+#: ../src/roster_window.py:4834
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
@@ -9608,171 +11003,153 @@ 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:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "%s fiók használatával"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:5364
 #, fuzzy, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:5369
 #, fuzzy, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4948
-#: ../src/statusicon.py:309
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Könyvjelzők kezelése..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5428
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5469
 #, fuzzy, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:5069
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Állapot üzenet _megváltoztatása"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Éppen hallgatott zeneszám címének közzététele"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "Tartózkodási hely közzététele"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Szolgáltatások beállítása..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "Mindet _teljes képernyőre"
 
-#: ../src/roster_window.py:5262
-#: ../src/roster_window.py:5436
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Közös _beszélgetési üzenet küldése"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Az összes felhasználónak"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Az összes jelenlévő felhasználónak"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "Partnerek _kezelése"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "_Csoportok szerkesztése"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Levél küldése"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Parancs futtatása..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "Transzport _kezelése"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "Transzport _módosítása"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Át_nevez"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Teljes képernyő"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "Újracsatlakozás"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Lecsatlakozás"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Előzménykezelő"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Csatlakozás új közös beszélgetéshez"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Állapotüzenet megváltoztatása..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Várakozás eredményekre"
 
-#: ../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 "Hiba a fogadott adatformában"
 
 #. 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 "Nincs eredmény"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Lemezírási hiba"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Tárgy: %s"
-
-#: ../src/session.py:433
-#: ../src/session.py:468
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Munkamenet opciók megerősítése"
 
-#: ../src/session.py:435
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9784,7 +11161,7 @@ msgstr ""
 "\n"
 "Are these options acceptable?"
 
-#: ../src/session.py:469
+#: ../src/session.py:471
 #, fuzzy, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9799,151 +11176,151 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/statusicon.py:210
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Is OpenPGP enabled for this contact?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "Állapotüzenet _megváltoztatása"
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "Névsor el_rejtése"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Elrejti ezt a menüt"
 
-#: ../src/tooltips.py:392
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber Azonosító:"
 
-#: ../src/tooltips.py:395
-#: ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Erőforrás: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, fuzzy, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [tiltva]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [tálcára helyezve]"
 
-#: ../src/tooltips.py:521
-#: ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Állapot: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Legutóbbi állapot: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " %s óta"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Csatlakozva"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Lecsatlakozva"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Feliratkozás:"
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "%s óta tétlen"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Idle for %s"
 
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "Hangulat: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "Hangulat:"
 
-#: ../src/tooltips.py:702
-#, python-format
-msgid "Activity: %s"
-msgstr "Tevékenység: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "Tevékenység:"
 
-#: ../src/tooltips.py:706
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Zene: %s"
 
-#: ../src/tooltips.py:710
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Tartózkodási hely: %s"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Letöltés"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Típus: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Továbbítva: "
 
-#: ../src/tooltips.py:755
-#: ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nincs elkezdve"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Megállítva"
 
-#: ../src/tooltips.py:761
-#: ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Befejezve"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Szüneteltetve"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Várakozás"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Továbbítás"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Ez a szolgáltatás még nem válaszolt a részletezett információkkal"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9952,61 +11329,449 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/vcard.py:298
-#: ../src/vcard.py:308
-#: ../src/vcard.py:516
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "%s óta"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>Szerep:</b>"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Hovatartozás:</b>"
 
-#: ../src/vcard.py:343
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Ezt a partnert érdekli, hogy mikor szoktál jelen lenni, de téged nem érdekel hogy ő mikor szokott"
+#: ../src/vcard.py:408
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Ezt a partnert érdekli, hogy mikor szoktál jelen lenni, de téged nem érdekel "
+"hogy ő mikor szokott"
 
-#: ../src/vcard.py:345
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Érdekel, hogy a partner mikor szokott jelen lenni, de őt nem érdekli hogy te mikor szoktál"
+#: ../src/vcard.py:410
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Érdekel, hogy a partner mikor szokott jelen lenni, de őt nem érdekli hogy te "
+"mikor szoktál"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
-msgstr "Téged és a partneredet is érdekli hogy mikor szokott a másik jelen lenni"
+msgstr ""
+"Téged és a partneredet is érdekli hogy mikor szokott a másik jelen lenni"
 
 #. None
-#: ../src/vcard.py:349
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Nem érdekel, hogy a partnered mikor szokott jelen lenni, és őt sem érdekli, hogy te mikor"
+#: ../src/vcard.py:414
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Nem érdekel, hogy a partnered mikor szokott jelen lenni, és őt sem érdekli, "
+"hogy te mikor"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "A partnernek küldött felirakozási kérelmed válaszára vársz"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Nincs függő feliratkozási kérelem."
 
-#: ../src/vcard.py:363
-#: ../src/vcard.py:417
-#: ../src/vcard.py:539
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " erőforrás prioritással "
 
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "Choose Client Cert"
+#~ msgstr "Válasszon kliens tanusítványt"
+
+#, fuzzy
+#~ msgid "The path to the client certificate and key in PKCS#12 format"
+#~ msgstr "The path to the client certificate and key in PKCS#12 format"
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " a window/tab opened with that contact "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Műveletek</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Állapotok</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Bővített Műveletek"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Bővített Figyelmeztetés Irányítás"
+
+#~ msgid "All statuses"
+#~ msgstr "Minden állapot"
+
+#~ msgid "Busy "
+#~ msgstr "Elfoglalt "
+
+#~ msgid "Contact Change Status "
+#~ msgstr "A Partner Megváltoztatta Állapotát "
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "A Parner Lekapcsolódott "
+
+#~ msgid "Don't have "
+#~ msgstr "Nincs "
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Fileküldés Elindult "
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Csoportos Csevegés Üzenetek Kiemelése "
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Csoportos Csevegés Üzenet Érkezett "
+
+#~ msgid "Have "
+#~ msgstr "Van "
+
+#~ msgid "Launch a command"
+#~ msgstr "Parancs indítása"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Egy vagy több egyedi állapot..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Elérhető / Ráér beszélgetni"
+
+#~ msgid "Play a sound"
+#~ msgstr "Egy hang lejátszása"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Egy Üzenet Fogadása"
+
+#~ msgid "When "
+#~ msgstr "Amikor "
+
+#, fuzzy
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+
+#, fuzzy
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Disable auto opening chat window"
+
+#, fuzzy
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Disable existing pop-up window"
+
+#, fuzzy
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Disable existing sound for this event"
+
+#, fuzzy
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Disable showing event in roster"
+
+#, fuzzy
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Disable showing event in systray"
+
+#, fuzzy
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Inform me with a pop-up window"
+
+#, fuzzy
+#~ msgid "_Show event in roster"
+#~ msgstr "_Show event in roster"
+
+#, fuzzy
+#~ msgid "_Show event in systray"
+#~ msgstr "_Show event in systray"
+
+#~ msgid "and I "
+#~ msgstr "és Én "
+
+#~ msgid "contact(s)"
+#~ msgstr "pertner(ek)"
+
+#~ msgid "for "
+#~ msgstr "azért, hogy "
+
+#~ msgid "group(s)"
+#~ msgstr "csoport(ok)"
+
+#~ msgid "when I'm in"
+#~ msgstr "ha bent vagyok"
+
+#~ msgid "label"
+#~ msgstr "címke"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Engedélyezem neki, hogy lássa az állapotom"
+
+#~ msgid "Advanced..."
+#~ msgstr "Haladó..."
+
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Mindig a GNOME alapértelmezett alkalmazásait használja"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Always use Xfce default applications"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Autodetect on every Gajim startup"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Partnerek _tevékenységeinek megjelenítése a főablakban"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr ""
+#~ "Partnerek által hallgatott _zenék számcímeinek megjelenítése a főablakban"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Partnerek h_angulatának megjelenítése a főablakban"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "If ticked, Gajim will display the location of contacts in the roster "
+#~ "window"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Show systray:"
+#~ msgstr "Tálca mutatása:"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Levél küldése..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Felhasználói avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Azonnali Üzenetküldő"
+
+#~ msgid "English"
+#~ msgstr "Angol"
+
+#~ msgid "Belarusian"
+#~ msgstr "Fehérorosz"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgár"
+
+#~ msgid "Breton"
+#~ msgstr "Breton"
+
+#~ msgid "Czech"
+#~ msgstr "Cseh"
+
+#~ msgid "German"
+#~ msgstr "Német"
+
+#~ msgid "Greek"
+#~ msgstr "Görög"
+
+#~ msgid "British"
+#~ msgstr "Brit"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spanyol"
+
+#~ msgid "Basque"
+#~ msgstr "Baszk"
+
+#~ msgid "French"
+#~ msgstr "Francia"
+
+#~ msgid "Croatian"
+#~ msgstr "Horvát"
+
+#~ msgid "Italian"
+#~ msgstr "Olasz"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norvég (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Dán"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norvég"
+
+#~ msgid "Polish"
+#~ msgstr "Lengyel"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugál"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazíliai portugál"
+
+#~ msgid "Russian"
+#~ msgstr "Orosz"
+
+#~ msgid "Serbian"
+#~ msgstr "Szerb"
+
+#~ msgid "Slovak"
+#~ msgstr "Szlovák"
+
+#~ msgid "Swedish"
+#~ msgstr "Svéd"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kínai (Ch)"
+
+#~ msgid "Hungarian"
+#~ msgstr "Magyar"
+
+#~ msgid "Spelling language"
+#~ msgstr "Beszélt nyelv"
+
+#, fuzzy
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+
+#, fuzzy
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Change the value to change the size of latex formulae displayed. The "
+#~ "higher is larger."
+
+#, fuzzy
+#~ msgid "all or space separated status"
+#~ msgstr "all or space separated status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', or 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' or ''"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Becenév nem megengedett: %s"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "feliratkoztunk ide: %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "leiratkoztunk innen: %s"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Ellenőrizd a kapcsolatod vagy próbáld meg később"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Hiba a futtatás közben \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "hiba: nem lehet megnyitni %s olvasásra"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Nem lehet lefoglalni a portot %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Elképzelhető hogy fut még egy Gajim a háttérben. Fileátvitel meg lesz "
+#~ "szakítva."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Egy GTK+ jabber kliens"
+
+#~ msgid "Condition"
+#~ msgstr "Kondíció"
+
+#~ msgid "when I am "
+#~ msgstr "Amint én "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "pybonjour szükséges (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "gpg és python-GnuPGInterface szükséges hozzá."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#, fuzzy
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transform LaTeX expressions between $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires texlive-latex-base and dvipng. 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."
+
+#, 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."
+#~ msgstr ""
+#~ "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to "
+#~ "set 'use_latex' to True in the Advanced Configuration Editor."
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "python-farsight szükséges."
+
+#~ msgid "Contacts"
+#~ msgstr "Partnerek"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Lemezírási hiba"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Tárgy: %s"
+
+#~ msgid "Mood: %s"
+#~ msgstr "Hangulat: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "Tevékenység: %s"
diff --git a/po/it.po b/po/it.po
index be0c03aa5..b27732124 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,15 +6,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-08-19 23:53+0200\n"
 "Last-Translator: neoex <neoex.dc@gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -24,313 +20,305 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Stato"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Informazioni personali"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Inizia chat..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Entra in chat di _gruppo..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Esegui comando..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Modifica account"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Apri posta ricevuta"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Informazioni personali"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Inizia chat..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Stato"
+msgid "_Modify Account"
+msgstr "_Modifica account"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Assistente creazione account"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Connessione al server</b>\n"
-"\n"
-"Attendere prego..."
+"È necessario avere un account per connettersi\n"
+"alla rete Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+msgid "I want to _register for a new account"
+msgstr "Voglio _registrare un nuovo account"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Scegliere una delle seguenti opzioni:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Inserire i dati per il nuovo account</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Selezionare un server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Password:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Ricorda la pass_word"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Usa autenticazione"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Connettiti alla pressione di Fine"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "ID _Jabber:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Assistente creazione account"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Usa autenticazione"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Selezionare un server</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gestisci..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Usa hostname/porta personalizzati"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "Nome dell'_host: "
 
 #: ../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"
+msgid "_Port:"
+msgstr "_Porta:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avanzato"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"È necessario avere un account per connettersi\n"
-"alla rete Jabber."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Fine"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Nome dell'_host: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Connessione al server</b>\n"
+"\n"
+"Attendere prego..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "ID _Jabber:"
+msgid "Connect when I press Finish"
+msgstr "Connettiti alla pressione di Fine"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Password:"
+msgid "Set my profile when I connect"
+msgstr "Configura il mio profilo appena effettuata la connessione"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "_Finish"
+msgstr "_Fine"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Varie</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Nessuno"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Informazioni personali</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Privacy</b>"
+msgid "Accounts"
+msgstr "Account"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 #, fuzzy
-msgid "A_djust to status"
-msgstr "_Modifica lo stato"
+msgid "Add"
+msgstr "Indirizzo"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Account"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Elimina"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Account"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Ri_nomina"
 
-#: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Operazioni amministrative"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+#, fuzzy
+msgid "_Enable"
+msgstr "Abilita"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Usa autenticazione"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"La risorsa viene inviata al server Jabber per distinguere tra due o più "
+"client connessi allo stesso account. In questa maniera, è possibile "
+"connettersi allo stesso account con risorse 'Casa' e 'Lavoro' "
+"contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi. "
+"(vedi sotto)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Riconnetti automaticamente quando si perde la connessione"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Sincronizza contatti"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "C_onsulta"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Clicca per richiedere l'autorizzazione a tutti i contatti di un altro account"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_onnetti all'avvio di Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "_Cambia password"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Clicca per cambiare la password dell'account"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+msgid "Administration operations"
+msgstr "Operazioni amministrative"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Scegliere il file da inviare..."
+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 ""
+"La priorità si usa in Jabber per determinare chi riceve gli eventi dal "
+"server Jabber quando due o più client sono connessi usando lo stesso "
+"account; il client con la maggiore priorità riceverà gli eventi"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Scegli _chiave..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Modifica lo stato"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Clicca per cambiare la password dell'account"
+msgid "Priority will change automatically according to your status."
+msgstr "La priorità cambierà automaticamente in funzione del tuo stato."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Clicca per richiedere l'autorizzazione a tutti i contatti di un altro account"
+msgid "Priori_ty:"
+msgstr "Priori_tà:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Nome utente non valido"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "C_onnetti all'avvio di Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Connessione"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Nome:"
+msgid "Resour_ce:"
+msgstr "_Risorsa: "
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "C_onsulta"
 
 #: ../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 ""
-"Se marcato, Gajim annuncerà alcuni IP in più oltre a quello della macchina "
-"su cui viene eseguito, di modo che il trasferimento file abbia maggiori "
-"possibilità di funzionare correttamente."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Questo messaggio è cifrato]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se marcato, Gajim ricorderà la password per questo account"
+msgid "Client certificate"
+msgstr "Nome utente non valido"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Account"
 
 #: ../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 ""
-"Se marcato, Gajim invierà dei pacchetti di keep-alive per prevenire il "
-"timeout che provoca una disconnessione"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onnetti all'avvio di Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -341,6 +329,18 @@ msgstr ""
 "usando questo account"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Riconnetti automaticamente quando si perde la connessione"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "_Registra le conversazioni con tutti i contatti"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -349,185 +349,214 @@ msgstr ""
 "Se marcato, ogni cambio allo stato globale (gestito dal menu a tendina sotto "
 "la lista contatti) cambierà anche lo stato di questo account"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se la porta predefinita usata per i messaggi in entrata non si adatta alle "
-"tue configurazioni puoi selezionarne un'altra qui.\n"
-"Potresti considerare di cambiare la configurazione del firewall"
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "ID Jabber: "
+msgid "Use file transfer proxies"
+msgstr "Usa proxy per il trasferimento file"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Cognome:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Se marcato, Gajim annuncerà alcuni IP in più oltre a quello della macchina "
+"su cui viene eseguito, di modo che il trasferimento file abbia maggiori "
+"possibilità di funzionare correttamente."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Unisci account"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Generale"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Nessuna chiave selezionata"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Informazioni personali"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Manage..."
+msgstr "Gestisci..."
+
+#: ../data/gui/accounts_window.ui.h:40
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Privacy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tà:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"La priorità si usa in Jabber per determinare chi riceve gli eventi dal "
-"server Jabber quando due o più client sono connessi usando lo stesso "
-"account; il client con la maggiore priorità riceverà gli eventi"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "La priorità cambierà automaticamente in funzione del tuo stato."
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Invia pacchetti di keep-alive"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Ri_nomina"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Se marcato, Gajim invierà dei pacchetti di keep-alive per prevenire il "
+"timeout che provoca una disconnessione"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "_Risorsa: "
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Usa hostname/porta personalizzati"
 
 #: ../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 ""
-"La risorsa viene inviata al server Jabber per distinguere tra due o più "
-"client connessi allo stesso account. In questa maniera, è possibile "
-"connettersi allo stesso account con risorse 'Casa' e 'Lavoro' "
-"contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi. "
-"(vedi sotto)"
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nome dell'_host: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "_Registra le conversazioni con tutti i contatti"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porta:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Varie</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Invia pacchetti di keep-alive"
+msgid "Connection"
+msgstr "Connessione"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Nessuna chiave selezionata"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
+msgid "Choose _Key..."
+msgstr "Scegli _chiave..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Sincronizza contatti"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Usa hostname/porta personalizzati"
+msgid "_Edit Personal Information..."
+msgstr "Modifica informazioni personali..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Usa porta personalizzata:"
+msgid "Information about you, as stored in the server"
+msgstr "Informazioni su di te, archiviate sul server"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Usa proxy per il trasferimento file"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Informazioni personali</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Informazioni personali"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Modifica informazioni personali..."
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onnetti all'avvio di Gajim"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Abilita"
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Nome dell'_host: "
+msgid "Use cust_om port:"
+msgstr "Usa porta personalizzata:"
 
-#: ../data/gui/accounts_window.ui.h:63
-#, fuzzy
-msgid "_Manage..."
-msgstr "Gestisci..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Se la porta predefinita usata per i messaggi in entrata non si adatta alle "
+"tue configurazioni puoi selezionarne un'altra qui.\n"
+"Potresti considerare di cambiare la configurazione del firewall"
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Nome:"
 
 #: ../data/gui/accounts_window.ui.h:65
-#, fuzzy
-msgid "_Port: "
-msgstr "_Porta:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Cognome:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "ID Jabber: "
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Unisci account"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "A_ccount:"
+msgid "Add New Contact"
+msgstr "Aggiungi nuovo contatto"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "_Permetti di vedere il mio stato"
+msgid "A_ccount:"
+msgstr "A_ccount:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Aggiungi nuovo contatto"
+msgid "_Protocol:"
+msgstr "_Protocollo:"
 
-#: ../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 "Vorrei aggiungerti alla mia lista contatti."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ID utente:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Nickname:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Gruppo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "_Permetti di vedere il mio stato"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Abbonamento"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -539,7 +568,11 @@ msgstr ""
 "protocollo. Premere il pulsante registra per\n"
 "procedere."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registra"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -547,604 +580,381 @@ msgstr ""
 "È necessario essere connesso al trasporto per poter aggiungere\n"
 " un contatto da questo protocollo."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Gruppo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Nickname:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocollo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registra"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Abbonamento"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ID utente:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Vorrei aggiungerti alla mia lista contatti."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Si è verificato un errore:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Comandi ad-hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Scegli il comando da eseguire:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Attendere durante il recupero della lista comandi..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Comandi ad-hoc - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Scegli il comando da eseguire:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Controlla ancora"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Descrizione errore..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Attendere durante l'invio del comando..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Fine"
+msgid "Please wait..."
+msgstr "Attendere..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Attendere durante il recupero della lista comandi..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Questa entità Jabber non mostra alcun comando."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Attendere durante l'invio del comando..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Si è verificato un errore:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Attendere..."
+msgid "Error description..."
+msgstr "Descrizione errore..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Questa entità Jabber non mostra alcun comando."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Fine"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Editor di configurazione avanzata"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Descrizione</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTA:</b> È necessario riavviare Gajim perché alcune impostazioni abbiano "
 "effetto"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor di configurazione avanzata"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtro:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Reimposta ai colori di default"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Elimina MOTD"
+msgid "Show _XML Console"
+msgstr "Mostra console _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Modifica liste _privacy..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Amministratore"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Invia messaggio server..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Imposta MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Mostra console _XML"
+msgid "Set MOTD..."
+msgstr "Imposta MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Aggiorna MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Aggiorna MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Amministratore"
+msgid "Delete MOTD"
+msgstr "Elimina MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Invia messaggio server..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "una finestra/tab è aperta per questo contatto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Azioni</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Condizioni</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Suoni</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Azioni avanzate"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Gestione avanzata delle notifiche"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Assente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Occupato "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Stato Contatto Cambiato"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contatto disconnesso"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Non ho "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Trasferimenti file"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Richiesta di trasferimento file"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Trasferimento file fermato"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Evidenziatura messaggi in chat di gruppo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Messaggio ricevuto in chat di gruppo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Ho "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisibile"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Lancia un comando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Non disponibile"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Uno o più stati speciali..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Online / Libero per chat"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Riproduci un suono"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nuovo messaggio privato"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Quando "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Attiva UrgencyHint del windows manager per far lampeggiare la finestra chat "
-"nell'elenco finestre"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Disabilita l'apertura automatica della finestra di chat"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Disabilita la finestra di popup esistente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Disabilita il suono esistente associato all'evento"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 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"
-msgstr "_Informami con una finestra di popup"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Apri una finestra di chat con l'utente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "Mostra evento nella lista _contatti"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "ed io "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Contatti"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "per "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Gruppo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "quando sono in"
+msgid "Deletes Message of the Day"
+msgstr "Elimina il messaggio del giorno"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Nessuno"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferenze"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Partecipa automaticamente"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Nessuno"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Preferenze"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Partecipa automaticamente"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Voce:"
+msgid "New entry received"
+msgstr "Nuova voce ricevuta"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Hai ricevuto un nuovo evento:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Nome feed:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Voce:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Ultima modifica:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Nuova voce ricevuta"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Hai ricevuto un nuovo evento:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Sblocca"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Messaggi di stato predefiniti</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
-msgstr "<b>Temi</b>"
+msgid "<b>Message:</b> "
+msgstr "<b>Messaggi di stato predefiniti</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Suoni</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Temi</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cambia password"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Inserire nuovamente per conferma:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Inserire nuova password:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Inserire nuovamente per conferma:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Scrivere il nuovo messaggio di stato</b>"
+msgid "Save as Preset..."
+msgstr "Salva come predefinito..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Attivato"
+msgid "Mood:"
+msgstr "Stanza:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Stanza:"
+msgid "Activity:"
+msgstr "Attivato"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Messaggi predefiniti:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Salva come predefinito..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Scrivere il nuovo messaggio di stato</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Entra in chat di _gruppo"
+msgid "_Copy Link Location"
+msgstr "_Copia indirizzo collegamento"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Aggiungi ai contatti..."
+msgid "_Open Link in Browser"
+msgstr "_Apri il collegamento nel browser"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copia JID/indirizzo email"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copia indirizzo collegamento"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Apri composizione email"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Apri il collegamento nel browser"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Inizia chat"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Entra in chat di _gruppo"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Aggiungi ai contatti..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Aggiunge il contatto alla lista"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "sta seguendo la conversazione"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "sta seguendo la conversazione"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Invia messaggio"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Invia"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "In_vita"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Invita amici!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Server MUC"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Selezionare un server MUC."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1152,123 +962,140 @@ msgstr ""
 "Stai per iniziare una chat di gruppo.\n"
 "Scegli i contatti che vuoi invitare"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Chiedi di poter vedere il suo stato"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Selezionare un server MUC."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Aggiungi _notifica speciale..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Server MUC"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Assegna chiave Open_PGP..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "In_vita"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Esegui comando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Inizia _chat"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Modifica _gruppi..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Invia _messaggio singolo..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Invia _file..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_vita a "
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "_Gestisci contatti"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Elimina"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Attiva cifratura Open_PGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Attiva cifratura end-to-end"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Invia s_tato personalizzato"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Esegui comando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Invia _messaggio singolo..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Gestisci contatto"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Invia _file..."
+msgid "_Rename..."
+msgstr "_Rinomina..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Imposta _avatar personalizzato..."
+msgid "Edit _Groups..."
+msgstr "Modifica _gruppi..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Inizia _chat"
+msgid "Assign Open_PGP Key..."
+msgstr "Assegna chiave Open_PGP..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Attiva cifratura end-to-end"
+msgid "Set Custom _Avatar..."
+msgstr "Imposta _avatar personalizzato..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Attiva cifratura Open_PGP"
+msgid "Add Special _Notification..."
+msgstr "Aggiungi _notifica speciale..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Abbonamento"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Permetti di _vedere il mio stato"
+#, fuzzy
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr "_Blocca"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "_Chiedi di poter vedere il suo stato"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Cronologia"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr ""
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blocca"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Gestisci contatto"
+#, fuzzy
+msgid "_Unignore"
+msgstr "nove"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Rinomina..."
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Abbonamento"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Elimina"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "nove"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Cronologia"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Completa nel form."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Completa nel form."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Modifica gruppi"
@@ -1282,57 +1109,50 @@ msgstr "<b>Descrizione</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr "<b>Lista delle possibili funzioni extra di Gajim:</b>"
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Servizi del server"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr "<b>Lista delle possibili funzioni extra di Gajim:</b>"
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
+msgid "File Transfers"
+msgstr "Trasferimenti file"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Annulla trasferimento file"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Mostra una lista dei trasferimenti di file"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Annulla il trasferimento file selezionato"
+msgid "file transfers list"
+msgstr "lista trasferimenti file"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Annulla il trasferimento file selezionato e rimuove il file incompleto"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "P_ulisci"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notifica quando un trasferimento file viene completato"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Trasferimenti file"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+"Mostra una notifica popup quando un trasferimento file viene completato"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Nasconde la finestra"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr ""
+"Rimuove dalla lista i trasferimenti di file completati, annullati e falliti"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Rimuove il trasferimento file dalla lista."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr ""
-"Rimuove dalla lista i trasferimenti di file completati, annullati e falliti"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Mostra una lista dei trasferimenti di file"
-
-#: ../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"
@@ -1340,83 +1160,108 @@ msgstr ""
 "Questa azione elimina un singolo trasferimento file dalla lista. Se il "
 "trasferimento è attivo, viene prima fermato e poi rimosso"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "P_ulisci"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pausa"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr ""
-"Mostra una notifica popup quando un trasferimento file viene completato"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Annulla il trasferimento file selezionato e rimuove il file incompleto"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continua"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Annulla trasferimento file"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notifica quando un trasferimento file viene completato"
+msgid "Cancels the selected file transfer"
+msgstr "Annulla il trasferimento file selezionato"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Apri cartella"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Nasconde la finestra"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pausa"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Continua"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista trasferimenti file"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Apri cartella"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Colori della scheda di stato chat</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Account"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Grassetto"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contatto"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Scrivendo"
+msgid "Gajim Themes Customization"
+msgstr "Personalizzazione temi di Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contatto"
+msgid "Text _color:"
+msgstr "_Colore del testo:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Stile carattere:"
+msgid "_Background:"
+msgstr "_Sfondo:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalizzazione temi di Gajim"
+msgid "Text _font:"
+msgstr "Carattere del _testo:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Andato via"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Gruppo"
+msgid "Font style:"
+msgstr "Stile carattere:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inattivo"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Grassetto"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Corsivo"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "In pausa"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Scrivendo"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inattivo"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Colori della scheda di stato chat</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Andato via"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1424,7 +1269,7 @@ msgstr ""
 "Messaggi di una\n"
 "chat di gruppo"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1432,107 +1277,101 @@ msgstr ""
 "Messaggi inviati in\n"
 "una chat di gruppo"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "In pausa"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Colore del testo:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Carattere del _testo:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Sfondo:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Cambia _nickname..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Gestisci stanza"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Cambia _oggetto..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Configura la _stanza..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "Aggiungi _segnalibro"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Elimina stanza"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Gestisci stanza"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimizza alla chiusura"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Voce"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "Aggiungi _segnalibro"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_deratore"
+msgid "_Send Private Message"
+msgstr "_Invia messaggio privato"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Azioni partecipante"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Invia _file"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Azioni partecipante"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Aggiungi ai contatti"
+msgid "_Voice"
+msgstr "_Voce"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_deratore"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Amministratore"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Bandisci"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Proprietario"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Caccia"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Membro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Proprietario"
+msgid "_Ban"
+msgstr "_Bandisci"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Invia messaggio privato"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voce"
+msgid "_Add to Roster"
+msgstr "_Aggiungi ai contatti"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Aggiungi _segnalibro"
+msgid "Show a list of formattings"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
-msgid "Change the room's subject (Alt+T)"
+msgid "Change your nickname (Ctrl+N)"
 msgstr ""
 
 #: ../data/gui/groupchat_control.ui.h:4
-msgid "Change your nickname (Ctrl+N)"
+msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
+#: ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Aggiungi _segnalibro"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crea nuovo post"
@@ -1543,11 +1382,29 @@ msgid "From:"
 msgstr "Da:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Oggetto:"
 
 #: ../data/gui/history_manager.ui.h:1
+msgid "Gajim History Logs Manager"
+msgstr "Gestore cronologia di Gajim"
+
+#: ../data/gui/history_manager.ui.h:2
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Gestore cronologia di Gajim"
+
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:6
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1564,201 +1421,189 @@ msgstr ""
 "esecuzione. Generalmente evita di eliminare conversazioni dei contatti con "
 "cui stai chattando."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Elimina"
+#: ../data/gui/history_manager.ui.h:8
+msgid "_Search Database"
+msgstr "_Cerca nel database"
 
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:9
 msgid "Export"
 msgstr "Esporta"
 
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gestore cronologia di 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"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
-msgid "_Search Database"
-msgstr "_Cerca nel database"
-
 #: ../data/gui/history_window.ui.h:1
 #, fuzzy
-msgid "All Chat Histories"
-msgstr "Vecchie storie"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Cronologia conversazione"
-
-#: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Nome contatto"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Chat di gruppo"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Vecchie storie"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Cronologia conversazione"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Cerca"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Registra i cambiamenti di stato dei contatti"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Host:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Entra automaticamente in questa stanza alla connessione"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Stanza:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Recenti:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Password:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recenti:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Entra automaticamente in questa stanza alla connessione"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Stanza:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Aggiungi _segnalibro"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Aggiungi _segnalibro"
+msgid "Bro_wse Rooms"
+msgstr "C_onsulta"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Entra"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Partecipa automaticamente"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gestisci segnalibri"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimizza automaticamente"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titolo:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Scrivi stato:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Partecipa automaticamente"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titolo:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimizza automaticamente"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1771,105 +1616,108 @@ msgid "_Configure"
 msgstr "_Continua"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Proprietà</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"Connessione HTTP\n"
+"SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Impostazioni</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"Connessione HTTP\n"
-"SOCKS5"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pass_word:"
+msgid "_Name:"
+msgstr "_Nome:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Proprietà</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Porta:"
+msgid "Use HTTP prox_y"
+msgstr "_Usa proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
-
-#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Usa proxy"
+msgid "_BOSH URL:"
+msgstr "_URL:"
 
-#: ../data/gui/manage_proxies_window.ui.h:11
+#: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usa autenticazione"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Nome utente:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-#, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL:"
+msgid "Pass_word:"
+msgstr "Pass_word:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Nome:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
+msgid "Proxy _Port:"
+msgstr "_Porta:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Nome utente:"
+msgid "<b>Settings</b>"
+msgstr "<b>Impostazioni</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Gestisci account"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Autorizza"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Disponibile"
+msgid "Version:"
+msgstr "Versione di GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Continua"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Descrizione: %s"
+msgid "Authors:"
+msgstr "_Autorizza"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1877,39 +1725,32 @@ msgid "Homepage:"
 msgstr "Homepage:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "In stallo"
+msgid "Description:"
+msgstr "Descrizione: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Continua"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "In stallo"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1923,230 +1764,293 @@ msgid "Event desc"
 msgstr "Eventi"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor di configurazione avanzata</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Applicazioni</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizzato</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Azioni</b>"
+msgid "All chat states"
+msgstr "Tutti gli stati"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Azioni</b>"
+msgid "Composing only"
+msgstr "Scrivendo"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Aspetto della chat</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Disabilitato"
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Colori della scheda di stato chat</b>"
+msgid "Never"
+msgstr "_Mai"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notifiche visuali</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Condizioni</b>"
+msgid "Always"
+msgstr "Assente"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Mostra"
 
-#. 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>Personalizzato</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notifica"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Suoni</b>"
+msgid "Show only in roster"
+msgstr "Mostra solo nella lista _contatti"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opzioni GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Messaggi di stato predefiniti</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privacy</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Aspetto lista contatti</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Messaggi di stato predefiniti</b>"
+msgid "Last state"
+msgstr "Ultimo stato: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Preferenze"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Temi</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Aggiungi una regola</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+"nelle chat di gruppo"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notifiche visuali</b>"
+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:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Avanzato"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Avanzato"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+"nelle chat di gruppo"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Tutti gli stati"
+msgid "Sort contacts by status"
+msgstr "_Ordina i contatti per stato"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Consentire invio di informazioni sull'_OS"
+#, fuzzy
+msgid "in _roster"
+msgstr "Non nei contatti"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Consentire invio di informazioni sull'_OS"
+msgid "in _group chats"
+msgstr "Entra in chat di _gruppo"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Consentire notifiche/popup quando _assente/nd/occupato/invisibile."
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Aspetto lista contatti</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Assente"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
+"emoticon grafici animati o statici"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Chiedi messaggio di stato per:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticon:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Rendi compatta la finestra dei _messaggi"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignora la formattazione dei messaggi ricevuti"
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "Messaggio di _stato:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
+"ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
 
 #: ../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"
+msgid "_Highlight misspelled words"
+msgstr "_Evidenzia parole errate"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Scrivendo"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Configura colore e tipo di carattere per l'interfaccia"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Mostra la finestra dei contatti all'avvio di Gajim"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Messaggio di _stato:"
+msgid "Show icon when your messages are received"
+msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Nome contatto"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Personalizzato</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Aspetto della chat</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Quando si riceve un nuovo evento:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Mostra notifica per i contatti che si _connettono"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Mostra notifica per i contatti che si _disconnettono"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
+"quando un contatto si disconnette"
 
-#: ../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:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Consentire notifiche/popup quando _assente/nd/occupato/invisibile."
 
 #: ../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"
+msgid "Notify on new _GMail email"
+msgstr "Notifica le nuove e-mail su _Gmail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Mostra dettagli email _extra"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
+"nuove email"
 
 #: ../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"
+msgid "Display _extra email details"
+msgstr "Mostra dettagli email _extra"
 
 #: ../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"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
+"nuove email"
 
 #: ../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"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opzioni GMail</b>"
 
 #: ../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"
+msgid "Show notification area icon:"
+msgstr "Usa _icona nell'area di notifica (vassoio di sistema)"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notifiche visuali</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Riproduci _suoni"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "_Gestisci..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Suoni</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+#, fuzzy
+msgid "Notifications"
+msgstr "Demone delle notifiche"
+
+#: ../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 "
@@ -2156,7 +2060,11 @@ 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:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "Notifica dello stato di chat in _entrata:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2166,267 +2074,185 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al contatto."
 
-#: ../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 notificherà tramite popup nell'angolo in fondo a destra dello schermo "
-"quando un contatto si disconnette"
-
-#: ../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: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:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
-"nuove email"
-
-#: ../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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+msgid "_Send chat state notifications:"
+msgstr "Notifica dello stato di chat in usci_ta:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
-"nelle chat di gruppo"
+#, fuzzy
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notifiche visuali</b>"
 
 #: ../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 ""
-"Se marcato, Gajim mostrerà il messaggio di stato di ogni membro di lista "
-"contatti e chat di gruppo sotto il suo nome"
+#, fuzzy
+msgid "Personal Events"
+msgstr "Informazioni personali"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
-"nelle chat di gruppo"
+msgid "_Away after:"
+msgstr "_Assente automaticamente dopo:"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr ""
-"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
-"nelle chat di gruppo"
+"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:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
-"nelle chat di gruppo"
+msgid "_Not available after:"
+msgstr "_Non disponibile automaticamente dopo:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
-"nelle chat di gruppo"
 
 #: ../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 ""
+msgid "minutes"
+msgstr "minuti"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Selezionare questa opzione solo se qualche utente fuori dalla lista contatti "
-"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: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:72
-#, fuzzy
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
-"nuove email"
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Se marcato, Gajim userà icone di stato specifiche per il protocollo usato. "
-"(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
-"assente, occupato, ecc...)"
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
-"emoticon grafici animati o statici"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Azioni</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Rendi compatta la finestra dei _messaggi"
+msgid "Ask status message when I:"
+msgstr "Chiedi messaggio di stato per:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "_Gestisci..."
+msgid "Sign _in"
+msgstr "C_onnessione"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Mai"
+msgid "Sign _out"
+msgstr "_Disconnessione"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Demone delle notifiche"
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Mostra notifica per i contatti che si _connettono"
+#, fuzzy
+msgid "<b>Status Messages</b>"
+msgstr "<b>Messaggi di stato predefiniti</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Mostra notifica per i contatti che si _disconnettono"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Messaggi di stato predefiniti</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notifica"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Stato"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notifica le nuove e-mail su _Gmail"
+msgid "Use system _default"
+msgstr "Usa il sistema _predefinito"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Messaggio di _stato:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Informazioni personali"
+msgid "<b>Font</b>"
+msgstr "<b>Suoni</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Riproduci _suoni"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Usa le icone dei _trasporti"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Mostra"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se marcato, Gajim userà icone di stato specifiche per il protocollo usato. "
+"(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
+"assente, occupato, ecc...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Preferenze"
+msgid "Status _iconset:"
+msgstr "_Icone di stato:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Configura colore e tipo di carattere per l'interfaccia"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Temi</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Usa _icona nell'area di notifica (vassoio di sistema)"
+msgid "Contact's nickname:"
+msgstr "Nome contatto"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Mostra solo nella lista _contatti"
+msgid "Your nickname:"
+msgstr "_Prima del nickname:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "C_onnessione"
+msgid "_Status message:"
+msgstr "Messaggio di _stato:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Disconnessione"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Reimposta ai colori di default"
 
 #: ../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 ""
-"Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
-"ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Messaggio di _stato:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "_Ordina i contatti per stato"
+msgid "Your message:"
+msgstr "Messaggio di errore: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Stato"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Evidenziatura messaggi in chat di gruppo"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "_Icone di stato:"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Colori della scheda di stato chat</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2434,560 +2260,577 @@ msgid "Style"
 msgstr "In stallo"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Azioni</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Usa le icone dei _trasporti"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Aggiungi una regola</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Usa il sistema _predefinito"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Condizioni</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Messaggio di errore: %s"
+msgid "_File manager:"
+msgstr "_File manager:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "_Prima del nickname:"
+msgid "_Mail client:"
+msgstr "_Client di posta:"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "_Assente automaticamente dopo:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Notifica dello stato di chat in _entrata:"
+msgid "<b>Custom</b>"
+msgstr "<b>Personalizzato</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Emoticon:"
+msgid "<b>Applications</b>"
+msgstr "<b>Applicazioni</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_File manager:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Evidenzia parole errate"
+#, fuzzy
+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 ""
+"Selezionare questa opzione solo se qualche utente fuori dalla lista contatti "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Consentire invio di informazioni sull'_OS"
 
 #: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ignora la formattazione dei messaggi ricevuti"
+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:128
-msgid "_Log status changes of contacts"
-msgstr "_Registra i cambiamenti di stato dei contatti"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Consentire invio di informazioni sull'_OS"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Client di posta:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "_Non disponibile automaticamente dopo:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Apri..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Reimposta ai colori di default"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Consentire invio di informazioni sull'_OS"
 
 #: ../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:134
-msgid "_Status message:"
-msgstr "Messaggio di _stato:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+msgid "<b>Privacy</b>"
+msgstr "<b>Privacy</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Registra i cambiamenti di stato dei contatti"
 
 #: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
-msgid "in _group chats"
-msgstr "Entra in chat di _gruppo"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Non nei contatti"
+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:139
-msgid "minutes"
-msgstr "minuti"
+msgid "_Open..."
+msgstr "_Apri..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor di configurazione avanzata</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avanzato"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste privacy:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Aggiungi/modifica una regola</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Lista privacy"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista di regole</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista privacy</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Attiva per questa sessione"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Attiva ad ogni avvio di Gajim"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista di regole</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "a tutti"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Aggiungi/modifica una regola</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "a tutti per abbonamento"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permetti"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Nega"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "ID Jabber"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "a tutti nel gruppo"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ordine:"
+msgid "all by subscription"
+msgstr "a tutti per abbonamento"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Lista privacy"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "a tutti"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "a tutti per abbonamento"
+msgid "to send me messages"
+msgstr "di inviarmi messaggi"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "a tutti nel gruppo"
+msgid "to send me queries"
+msgstr "di inviarmi richieste"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Entrambi"
+msgid "to view my status"
+msgstr "di vedere il mio stato"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Da"
+msgid "to send me status"
+msgstr "di inviarmi uno stato"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "uno"
+msgid "All (including subscription)"
+msgstr "a tutti per abbonamento"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "due"
+msgid "Order:"
+msgstr "Ordine:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "di inviarmi messaggi"
+#, fuzzy
+msgid "none"
+msgstr "uno"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "di inviarmi richieste"
+#, fuzzy
+msgid "both"
+msgstr "Entrambi"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "di inviarmi uno stato"
-
-#: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "di vedere il mio stato"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Aggiungi una regola</b>"
+msgid "from"
+msgstr "Da"
 
-#: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Avatar:"
+msgid "to"
+msgstr "due"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Data di nascita:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Personalizzato</b>"
+msgid "<b>Family:</b>"
+msgstr "Cognome:"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Personalizzato</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Suoni</b>"
+msgid "<b>Middle:</b>"
+msgstr "<b>Aggiungi una regola</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Dipartimento:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "E-Mail:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Privacy</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Indirizzo extra:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Cognome:"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suoni</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "Nome completo"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+#, fuzzy
+msgid "<b>Street:</b>"
+msgstr "<b>Impostazioni</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Personalizzato</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Homepage:"
+msgid "<b>State:</b>"
+msgstr "<b>Impostazioni</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+#, fuzzy
+msgid "<b>Extra Address:</b>"
+msgstr "Indirizzo extra:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Aggiungi una regola</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Codice postale:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Temi</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Suoni</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Nickname:"
+msgid "<b>Address</b>"
+msgstr "<b>Aggiungi una regola</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Telefono:"
+msgid "<b>Homepage:</b>"
+msgstr "Homepage:"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Condizioni</b>"
+msgid "<b>Name:</b>"
+msgstr "<b>Temi</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Codice postale:"
+msgid "<b>Nickname:</b>"
+msgstr "Nickname:"
 
-#. Prefix in Name
-#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Privacy</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Telefono:"
+
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-GG"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Suoni</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Data di nascita:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Impostazioni</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "E-Mail:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Impostazioni</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Avatar:"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Clicca per inserire l'avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Informazioni personali"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Suoni</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Personalizzato</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "A proposito"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Condizioni</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Clicca per inserire l'avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Dipartimento:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-GG"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Suoni</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Informazioni personali"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Cosa vuoi fare?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "A proposito"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Rimuovi l'account solo da _Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Rimuovi l'account da Gajim e dal _server"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Cosa vuoi fare?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Elimina"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Aggiungi _contatto......"
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "Fun_zioni"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Azioni"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Trasferimenti file"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Aggiungi _contatto......"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Domande frequenti (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Modifica"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Aiuto online"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Account"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profilo, a_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Visualizza"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Mostra contatti _offline"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Mostra tras_porti"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Mostra contatti _offline"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Mostra lista _contatti"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Account"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Trasferimenti file"
 
-#. 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 "_Azioni"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Aiuto"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Modifica"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Aiuto online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_Domande frequenti"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Aiuto"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Invia _messaggio singolo..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Domande frequenti (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Visualizza"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Attendere durante il recupero dei campi di ricerca..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fun_zioni"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Cerca"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Attendere durante il recupero dei campi di ricerca..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Aggiungi contatto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informazioni"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -3007,41 +2850,37 @@ msgstr "Registra a"
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Rispondi a questo  messaggio"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "A:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Invia"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Invia messaggio"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Invia messaggio e chiudi la finestra"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Rispondi"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "A:"
+msgid "Reply to this message"
+msgstr "Rispondi a questo  messaggio"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Rispondi"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Invia e _chiudi"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Invia messaggio e chiudi la finestra"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Autorizza"
+msgid "Subscription Request"
+msgstr "Richiesta di abbonamento"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autorizza il contatto affinché sappia quando sei connesso"
+msgid "_Deny"
+msgstr "_Nega"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -3050,272 +2889,284 @@ msgid ""
 msgstr ""
 "Nega l'autorizzazione al contatto cosicché non sappia quando sei connesso"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Richiesta di abbonamento"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Autorizza"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Nega"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizza il contatto affinché sappia quando sei connesso"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Sincronizza contatti"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Seleziona i contatti che vuoi sincronizzare"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sincronizzazione: scegli i contatti"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Disabilita suoni"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Invia _messaggio singolo"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Mostra tutti gli _eventi in attesa"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Seleziona i contatti che vuoi sincronizzare"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_to"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Azioni</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Invia _messaggio singolo"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Personalizzato</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Mostra tutti gli _eventi in attesa"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Impostazioni</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Disabilita suoni"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informazioni sul contatto"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID Jabber: "
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Risorsa:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Impostazioni</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Descrizione</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Personalizzato</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Commenti"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Impostazioni</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "Avatar:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Avatar personalizzato:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Contatto"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrizione</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informazioni sul contatto"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Azioni</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Ancora"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Avatar dell'utente:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Contatto"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Suoni</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Commenti"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Traffico Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Inserimento XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Richiesta (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Suoni</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Richiesta (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presenza"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Messaggio"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presenza"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Inserimento XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Modifica account..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "JID locale:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Informazioni personali"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Risorsa:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un client Jabber GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Informazioni personali"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Messaggistica istantanea Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Client IM Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Un client Jabber GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informazioni sul contatto"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Voce non valida"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 #, fuzzy
 msgid "Service changed the session identifier."
 msgstr "Il client a %s ha annullato la negoziazione della sessione."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Comandi ad-hoc - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Attivato"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Disattivato"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Intero"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Colore"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Nome preferenza"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Valore"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Nessuna)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Nascosta"
 
@@ -3326,239 +3177,178 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Hai ricevuto un nuovo evento:"
 msgstr[1] "Hai ricevuto un nuovo evento:"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Inglese"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Bielorusso"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgaro"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretone"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Ceco"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Tedesco"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Greco"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Britannico"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Spagnolo"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Basco"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francese"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Croato"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiano"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norvegese (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Olandese"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norvegese"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polacco"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portoghese"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brasiliano"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Russo"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Serbo"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovacco"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Svedese"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Cinese (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Lingua per la correzione ortografica"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Errore."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "Sottolinea"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Servizio"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "_Carattere:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informazioni sul contatto"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Cifratura attivata"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Caratteristica non disponibile sotto Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Invia file"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usa autenticazione"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usa autenticazione"
@@ -3566,68 +3356,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Negoziazione della sessione annullata"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3635,247 +3425,613 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 #, fuzzy
 msgid "Database Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Trasferimenti file"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Dimensione: "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Accetta"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Trasferimento file completato"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Invito a chat di gruppo"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina il contatto dalla lista"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Errore leggendo il file:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Trasferimento file fermato"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Trasferimento file annullato"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "La connessione non può essere stabilita."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Utilizzo: /%s, nasconde i pulsanti di chat."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Utilizzo: /%s, invia il messaggio al contatto"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s non trovato"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Assente"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Disponibile"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Utilizzo: /%s, pulisce la finestra di testo."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Attiva cifratura Open_PGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Utilizzo: /%s, invia un ping al contatto"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Clicca per vedere le conversazioni precedenti con questo contatto"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s non è un livello di log valido"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Il bus della sessione non è disponibile"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Il bus della sessione non è disponibile"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr ""
+"Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Nickname non valido"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Utilizzo: /%s <nickname>, apre una finestra di chat privata al partecipante "
+"specificato."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Nickname non trovato: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Utilizzo: /%s <nickname>, apre una finestra di chat privata al partecipante "
+"specificato."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Invia %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Non si è entrati in una chat di gruppo."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Server non valido"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "l'affiliazione è stata cambiata"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr ""
+"Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
+"corrente."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Parametro mancante \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "creazione database log"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Modifica le informazioni sullo stato"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Modifica lo stato"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Imposta tipo di presenza e descrizione"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Libero per chat"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Assente a lungo"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Offline - disconnetti"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Descrizione della presenza:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Stato modificato."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Esci dalle chat di gruppo"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s su %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Chat di gruppo"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Sei uscito dalle seguenti chat di gruppo:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Inoltra messaggi non letti"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Tutti i messaggi non letti sono stati inoltrati."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Inoltra messaggi non letti"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usa D-Bus e Notification-Daemon per mostrare le notifiche"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo in minuti dopo il quale lo stato diventa 'assente'."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo in minuti dopo il quale lo stato diventa 'non disponibile'."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Nickname non valido"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "testo del messaggio di stato"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Mostra evento nella lista _contatti"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Mostra evento nella lista _contatti"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Richiesta di trasferimento file"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Trasferimento file annullato"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr ""
+"Mostra una notifica popup quando un trasferimento file viene completato"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Invito a chat di gruppo"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Nickname non valido"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Cambio nickname"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "testo del messaggio di stato"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "predefinito"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Lingua usata dal controllo ortografico"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3885,7 +4041,7 @@ msgstr ""
 "'a volte' - scrive l'ora ogni print_ichat_every_foo_minutes minuti.\n"
 "'mai' - non scrive mai l'ora."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3895,18 +4051,18 @@ msgstr ""
 "o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno preciso. "
 "Viene usato solo se print_time è 'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
 "ma senza rimuovere * *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3915,7 +4071,7 @@ msgstr ""
 "Usa il testo annotato ReStructured per inviare HTML, più la formattazione "
 "ascii se selezionata (se si vuole usare questa opzione, installare docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3923,7 +4079,7 @@ msgstr ""
 "Carattere da aggiungere dopo il nickname quando si usa il completamento nick "
 "(tab) nella chat di gruppo."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3931,7 +4087,13 @@ msgstr ""
 "Carattere da proporre di aggiungere dopo il nickname desiderato quando il "
 "nickname desiderato è già usato da qualcun'altro nella chat di gruppo"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3942,51 +4104,61 @@ msgstr ""
 "la documentazione della funzione python strftime per ottenere documentazione "
 "completa: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caratteri scritti prima del nickname nelle conversazioni"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caratteri scritti dopo il nickname nelle conversazioni"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo della lista contatti?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quanti minuti devono durare le ultime linee dalla conversazione precedente."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3994,11 +4166,11 @@ msgstr ""
 "Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
 "(comportamento predefinito del client ICQ Mirabilis)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quante linee memorizzare per Ctrl+Alto."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4007,12 +4179,12 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4024,13 +4196,13 @@ msgstr ""
 "che sia sincronizzato con lo stato globale) basandosi sullo stato della "
 "connessione di rete."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4038,7 +4210,7 @@ msgstr ""
 "Le notifiche di stato mostrate nella finestra di chat. Possono essere una "
 "tra all, composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4046,33 +4218,35 @@ msgstr ""
 "Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
 "scriverla ogni x minuti."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Chiedere sempre prima di chiudere una finestra/scheda di chat di gruppo in "
 "questa lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Non chiedere mai prima di chiudere una scheda/finestra di chat in questa "
 "lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4082,28 +4256,34 @@ msgstr ""
 "interfacce locali, per il trasferimento file in caso di traslazione "
 "dell'indirizzo/inoltro porte."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica gli eventi nell'area di notifica."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4111,18 +4291,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4132,13 +4312,13 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Se Vero, Gajim controllerà se è il client Jabber predefinito ad ogni avvio."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4146,7 +4326,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4154,11 +4334,11 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei contatti"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4166,7 +4346,7 @@ msgstr ""
 "Se Vero, Gajim chiederà un avatar ad ogni contatto che non aveva un avatar "
 "l'ultima volta o ne ha uno troppo vecchio in cache."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4174,9 +4354,10 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
 "cambia stato o messaggio di stato."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4188,30 +4369,34 @@ msgstr ""
 "i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno "
 "entra od esce dalla chat di gruppo."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Colore di sfondo dei contatti appena collegati."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Colore di sfondo dei contatti appena scollegati."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Vero, i messaggi recuperati useranno un font più piccolo di quello "
 "predefinito."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Non mostrare l'avatar per il trasporto stesso."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Non mostrare l'account nella taskbar del sistema."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4221,7 +4406,7 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4232,7 +4417,7 @@ msgstr ""
 "SHA nella presenza sulle chat di gruppo"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4241,7 +4426,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Controlla la finestra dove vengono messi i nuovi messaggi.\n"
@@ -4253,32 +4438,40 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Nasconde la lista dei presenti nella stanza nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4286,15 +4479,15 @@ msgstr ""
 "In una chat, mostra il nickname all'inizio della riga solo quando non è "
 "quello della persona che parlava nel messaggio precedente."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentazione quando si raggruppano nickname consecutivi."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Scorrimento fluido dei messaggi nella finestra di continuazione"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4303,12 +4496,12 @@ msgstr ""
 "Lista di colori che saranno usati per colorare i nickname nelle chat di "
 "gruppo."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab va alla prossima scheda di composizione se nessuna è non letta."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4316,7 +4509,7 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4325,7 +4518,7 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4334,7 +4527,7 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4344,7 +4537,7 @@ msgstr ""
 "di modifica account. ATTENZIONE, quando si è collegati con priorità "
 "negativa, NON si riceveranno messaggi dal server."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4352,7 +4545,7 @@ msgstr ""
 "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
 "password degli account."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4361,7 +4554,7 @@ msgstr ""
 "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
 "password degli account."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4369,7 +4562,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il numero di account online e totali nelle linee "
 "degli account e dei gruppi."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4377,7 +4570,7 @@ msgstr ""
 "Può essere vuoto, 'chat' o 'normal'. Se non vuoto, tratta tutti i messaggi "
 "in iarrivo come se fossero di questo tipo"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4385,21 +4578,13 @@ msgstr ""
 "Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
 "messaggio, se la finestra di chat non è già aperta."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
-"usando dvips e convertendola prima di inserirla in una finestra di chat."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tempo di inattività richiesto prima che la finestra di cambiamento del "
 "messaggio di stato si chiuda."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4407,69 +4592,89 @@ msgstr ""
 "Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
 "più vecchie verranno cancellate."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4477,84 +4682,97 @@ msgstr ""
 "La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
 "definite nelle opzioni autopriority_*."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4562,15 +4780,32 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento file."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s vuole inviarti un file."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4578,127 +4813,157 @@ msgstr ""
 "Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
 "registrazione dei messaggi?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Usa autenticazione"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Usa autenticazione"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP è abilitato per questo contatto?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale controllare le parole sbagliate"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "tutto o stati separati da uno spazio"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', o 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Solo libero per chat."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4706,27 +4971,183 @@ 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "A"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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 ""
+"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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "richiesta di cancellazione abbonamento da %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Errore di scrittura su disco"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "La stanza è stata cancellata"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Puoi invece entrare in questa stanza: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber non valido"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "errore durante l'invio di %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Versione D-Bus sconosciuta: %s"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nuovo messaggio singolo"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nuovo messaggio singolo da %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nuovo messaggio privato"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nuovo messaggio privato dalla stanza %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Messaggio inviato da %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nuovo messaggio"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nuovo messaggio da %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s ha cambiato stato"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s è ora %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Stato Contatto Cambiato"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s connesso"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contatto connesso"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s disconnesso"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contatto disconnesso"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Impossibile caricare il modulo idle"
@@ -4738,216 +5159,194 @@ msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "La vCard è stata pubblicata correttamente"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 "Errore di scrittura su disco"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "ID Jabber non valido"
-
-#: ../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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s non è un livello di log valido"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome utente non valido"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4956,111 +5355,121 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../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:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Non è possibile connettersi a \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Connessione al proxy fallita"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Non è possibile connettersi a \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Errore durante la rimozione della lista privacy"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5069,70 +5478,70 @@ msgstr ""
 "La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
 "risorse connesse. Disattivarla e riprovare."
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Gestisci contatti"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Trasporti"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Non nei contatti"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "I binding python per D-Bus sono mancanti su questo computer"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 "D-Bus non è presente su questa macchina o il relativo modulo python è "
 "mancante"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
@@ -5150,7 +5559,7 @@ msgstr ""
 "Servizio non disponibile: Gajim non è in esecuzione, o remote_control è "
 "Falso."
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-Bus non è presente su questa macchina o il relativo modulo python è "
@@ -5333,267 +5742,294 @@ msgstr "Fine settimana"
 msgid "Weekend!"
 msgstr "Fine settimana!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Non disponibile"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:In pausa"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:In pausa"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Invisibile"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Da"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nessuna"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Proprietario"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d messaggio in attesa"
 msgstr[1] "%d messaggi in attesa"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " dalla stanza %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " dall'utente %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " da %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento in attesa"
 msgstr[1] "%d eventi in attesa"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Impossibile caricare l'immagine"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "L'immagine è troppo grande"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "%s non è un livello di log valido"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Impossibile caricare l'immagine"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configurazione della stanza"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5605,111 +6041,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s non è un livello di log valido"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Messaggi di stato preimpostati"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Dimensione: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "File: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "verde"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "errore: impossibile aprire %s per lettura"
+msgid "Error: cannot open %s for reading"
+msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "Migrazione database delle cronologie agli indici"
 
@@ -6421,54 +6871,136 @@ msgstr ""
 msgid "Writing"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "predefinito"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marino"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Sto cacciando %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Paese:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Account"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Descrizione"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Errore."
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "uno"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "stanza"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Non è possibile fare il bind alla porta %s"
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Potrebbe essere in esecuzione un altra istanza di Gajim. Il trasferimento "
-"file verrà annullato."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Errore avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6477,46 +7009,45 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Controllare se Avahi è installato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Impossibile avviare il servizio locale"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossibile collegarsi alla porta %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6529,26 +7060,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Errore durante la creazione del servizio. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Messaggi di stato preimpostati"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Abilita"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6557,222 +7088,223 @@ msgstr ""
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
 "nuovo login."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Hai aperto una chat nell'account %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
 "continuare?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Per cambiare nome account, è necessario leggere tutti gli eventi in attesa."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Questo nome è già usato da un altro account. Scegliere un altro nome."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Rinomina account"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Inserisci un nuovo nome per l'account %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6780,11 +7312,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6792,11 +7324,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6804,11 +7336,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6816,7 +7348,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6834,113 +7366,110 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Connessione al proxy fallita"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Cosa fare?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Rimuovi l'account solo da _Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Controllare di avere compilato i campi server e stanza, o eliminare questo "
 "segnalibro."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Nickname non valido"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nickname non permesso: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Server non valido"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Voce non valida"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6951,33 +7480,33 @@ msgstr ""
 "\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6987,7 +7516,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6995,81 +7524,98 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Continua"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Primo messaggio ricevuto"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7078,235 +7624,236 @@ 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:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Esci"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Ieri"
 msgstr[1] "Ieri"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Dbus non è supportato."
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Client IM Jabber"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID Jabber: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Sovrascrivere messaggio di stato?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato predefinito"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Indirizzo AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Numero GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Numero ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Indirizzo MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Indirizzo Yahoo!:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Un client jabber GTK+"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Un client Jabber GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
@@ -7314,7 +7861,7 @@ msgstr ""
 "Matteo Dell'Amico <della@linux.it>\n"
 "Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7327,271 +7874,294 @@ msgstr ""
 "\n"
 "L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Connessione"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Stai per creare un metacontatto. Continuare?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Non chiederlo più"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Il nickname contiene caratteri non consentiti."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "URI errato"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Questa non è una chat di gruppo"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Il nome account non è valido"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nickname non valido"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, 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:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, 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:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 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:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contatto connesso"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Contatto disconnesso"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nuovo messaggio"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nuovo messaggio privato"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../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:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Stato Contatto Cambiato"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "In stallo"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Elimina"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7599,193 +8169,188 @@ msgid ""
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber: "
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Aggiungi contatto"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Aggiungi contatto"
+msgstr[1] "_Aggiungi contatto"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Elimina il contatto dalla lista"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Elimina il contatto dalla lista"
+msgstr[1] "Elimina il contatto dalla lista"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Server non valido"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "Vuoi inviare questo file a %s:"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condizione"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "quando io sono "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7793,39 +8358,39 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Verifica l'identità del client remoto"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7835,78 +8400,116 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "per l'account %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Nome utente non valido"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Altri"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7914,321 +8517,306 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Server non valido"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consulta %s usando l'account %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "C_onsulta"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Esegui comando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Abbonati"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Una libreria usata per validare i certificati del server per assicurare una "
 "connessione sicura."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Richiede python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour/Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Sistema di chat senza server con i client rilevati automaticamente nella "
 "rete locale."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Richiede python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Richiede pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Comandi: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 #, fuzzy
 msgid "A script to control Gajim via commandline."
 msgstr "Uno script per controllare gajim dalla riga di comando."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Richiede 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Caratteristica non disponibile sotto Windows."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Cifratura OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Cifratura dei messaggi di chat con le chiavi gpg."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Richiede gpg e python-GnuPGInterface"
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Gestore connessione"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Riconoscimento automatico dello stato della connessione."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Richiede gnome-network-manager e python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Gestore sessioni"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "La sessione di Gajim viene salvata alla chiusura e ripristinata all'avvio."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Richiede python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Le password non coincidono"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Le password possono essere salvate in modo sicuro e non in un semplice file "
 "di testo."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 #, fuzzy
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Richiede gnome-keyring e python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 #, fuzzy
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Possibilità di connettersi ai server che usano record SRV."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Richiede dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Richiede nslookup per usare i record SRV."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Correttore ortografico"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Correzione ortografica dei messaggi."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Richiede python-dbus."
 
 #: ../src/features_window.py:85
 #, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Richiede python-dbus."
+
+#: ../src/features_window.py:86
+#, fuzzy
 msgid "Notification"
 msgstr "Demone delle notifiche"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Popup passivi che notificano nuovi eventi."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "Richiede python-notify, oppure python-dbus e notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Modifica lo stato"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Possibilità di misurare il tempo di inattività, per poter cambiare lo stato "
 "automaticamente."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Richiede python-gnome2."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
 #, fuzzy
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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."
-
-#: ../src/features_window.py:96
-#, 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 ""
-"Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
-"su Attivato nell'Editor di configurazione avanzata."
-
-#: ../src/features_window.py:97
-#, fuzzy
 msgid "End to End message encryption"
 msgstr "Attiva cifratura end-to-end"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Cifratura dei messaggi di chat."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Richiede python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Generatore RST"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8236,142 +8824,138 @@ msgstr ""
 "Genera output XHTML a partire da codice RST (vedi http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Richiede python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Richiede python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Richiede python-gnome2."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Richiede python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Disponibile"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Funzione"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Tu"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Trasferimento file completato"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Trasferimento file annullato"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "La connessione non può essere stabilita."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Trasferimento file fermato"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "File: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Descrizione: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s vuole inviarti un file:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8379,33 +8963,64 @@ 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Non si ha il permesso di creare file in questa cartella."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Salva file come..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "File: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Descrizione: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s vuole inviarti un file:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Invio del profilo..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Errore nel trasferimento file"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8413,70 +9028,107 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "messaggio"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Emoticon:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Mostra solo nella lista _contatti"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor di configurazione avanzata"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Configurazione della stanza"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.8 o superiore"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Gajim ha bisogno di PyGTK 2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim ha bisogno di GTK2.8 o superiore"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim ha bisogno di GTK2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim ha bisogno di pywin32 per essere eseguito"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8485,12 +9137,11 @@ msgstr ""
 "Assicurarsi che Pywin32 sia installato sul tuo sistema. Lo si può trovare su "
 "%s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim è già in esecuzione"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8498,79 +9149,83 @@ msgstr ""
 "Un'altra istanza di Gajim sembra essere in esecuzione\n"
 "Continuare comunque?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Mostra un aiuto su di un comando specifico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mostra aiuto sul comando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 
-#: ../src/gajim-remote-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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "account"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Scrive un elenco degli account registrati"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Cambia lo stato degli account"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "stato"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "messaggio"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8579,21 +9234,49 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia lo stato degli account"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_tà:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Voglio _registrare un nuovo account"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8603,35 +9286,30 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8641,137 +9319,134 @@ 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:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "oggetto"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 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
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Apre la finestra di inizio chat"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Inizia chat usando questo account"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Invia XML personalizzato"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8779,46 +9454,101 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Modifica lo stato"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Nickname non trovato: %s"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for 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:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+#, fuzzy
+msgid "Account in which you want to handle it"
+msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Entra in una stanza MUC"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "stanza"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "Room JID"
+msgstr "Stanza:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nickname"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Nickname non trovato: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "password"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Le password non coincidono"
+
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "Account from which you want to enter the room"
+msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#: ../src/gajim-remote.py:297
 #, 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
+#: ../src/gajim-remote.py:301
 #, 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8827,168 +9557,42 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Utilizzo: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Utilizzo: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "URI errato"
-
-#: ../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: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: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 ""
-"Restituisce il messaggio di stato corrente (quello globale se non è "
-"specificato un account)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Modifica lo stato"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Nickname non trovato: %s"
-
-#: ../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 ""
-"L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
-"tutti gli account."
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr ""
-
-#: ../src/gajim-remote.py:280
-#, fuzzy
-msgid "Account in which you want to handle it"
-msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
-
-#: ../src/gajim-remote.py:282
-#, fuzzy
-msgid "Message content"
-msgstr "contenuti messaggi"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Stanza:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Nickname non trovato: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "Le password non coincidono"
-
-#: ../src/gajim-remote.py:291
-#, fuzzy
-msgid "Account from which you want to enter the room"
-msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8997,7 +9601,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9006,10 +9610,14 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "URI errato"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -9032,181 +9640,219 @@ msgid "You cannot delete your current theme"
 msgstr "Non è possibile eliminare il tema corrente"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s è ora conosciuto come %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Cronologia conversazione"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Connessione"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s è stato cacciato: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "La stanza ora mostra i membri non disponibili"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "la stanza ora non mostra i membri non disponibili"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "La registrazione dei messaggi della stanza è stata attivata"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "La registrazione dei messaggi della stanza è stata disattivata"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "La stanza è ora completamente non anonima"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "La stanza è ora semi-anonima"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "La stanza è ora completamente anonima"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s è stato cacciato dalla stanza (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "E' stata creata una nuova stanza"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 #, fuzzy
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Il nome della stanza o del server contiene caratteri non permessi."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9214,22 +9860,22 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -9254,66 +9900,60 @@ msgstr "_Segnala bug"
 msgid "Details"
 msgstr "Dettagli"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim non è il client Jabber predefinito"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Si vuole rendere Gajim il client Jabber predefinito?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9324,201 +9964,185 @@ msgstr ""
 "chat di gruppo %s.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Sei stato bandito dalla stanza %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "La stanza %s non esiste."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Il tuo nickname è già in uso nella stanza di gruppo %s:"
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Richiesta di abbonamento"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, 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:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Disa_bbonati"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr "La stanza ora mostra i membri non disponibili"
-
-#: ../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:930
-msgid "A non-privacy-related room configuration change has occurred"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 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:934
-msgid "Room logging is now enabled"
-msgstr "La registrazione dei messaggi della stanza è stata attivata"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "La registrazione dei messaggi della stanza è stata disattivata"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "La stanza è ora completamente non anonima"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "La stanza è ora semi-anonima"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "La stanza è ora completamente anonima"
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:681
 #, fuzzy
-msgid "GPG key not trusted"
+msgid "Certificate Passphrase Required"
+msgstr "Passphrase richiesta"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Inserire la passphrase della chiave GPG per l'account %s."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Gnome Keyring è installato ma non avviato correttamente (la variabile "
 "d'ambiente è probabilmente impostata in maniera non corretta)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9528,81 +10152,66 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Elimina il contatto dalla lista"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-#, fuzzy
-msgid "Error opening file"
-msgstr "Errore leggendo il file:"
+msgid "File Transfer Failed"
+msgstr "Trasferimenti file"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "In tutti i _messaggi"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Conflitto di nomi utenti"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Errore."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9610,21 +10219,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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9632,15 +10241,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Creazione notifica speciale per %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9651,32 +10265,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 "Stai per creare un metacontatto. Continuare?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9684,108 +10279,111 @@ msgid ""
 msgstr "Stai per creare un metacontatto. Continuare?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Inserire la passphrase della chiave GPG per l'account %s."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Scelta chiave OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ti connetterai a %s senza OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Riscrivere la passphrase GPG o premere Annulla."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "creazione della cartella %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Contatti"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Messaggio"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Ripulire il database? (FORTEMENTE SCONSIGLIATO SE GAJIM È IN ESECUZIONE)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9799,99 +10397,112 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Errore di scrittura su disco"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Esportazione cronologie..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s alle %(time)s ha detto: %(message)s\n"
 
-#: ../src/history_manager.py: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] ""
-"Si vuole davvero eliminare la cronologia per il contatto selezionato?"
-msgstr[1] ""
-"Si vuole davvero eliminare la cronologia per i contatti selezionati?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Si vuole davvero eliminare il messaggio selezionato?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Si vuole davvero eliminare la cronologia per il contatto selezionato?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Questa operazione è irreversibile."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Informazioni sul contatto"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vogliono davvero eliminare i messaggi selezionati?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia conversazione con %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 #, fuzzy
 msgid "Disk Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 #, fuzzy
 msgid "Error"
 msgstr "Errore."
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Impossibile caricare l'immagine"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Scrivendo"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "L'immagine è troppo grande"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non si è connessi al server"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Si vuole davvero eliminare il messaggio selezionato?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Messaggi"
 
@@ -9903,101 +10514,112 @@ msgstr "- i messaggi saranno registrati"
 msgid "- messages will not be logged"
 msgstr "- i messaggi non saranno registrati"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s ha cambiato stato"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "nove"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s connesso"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s disconnesso"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Sto bandendo %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nuovo messaggio singolo da %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Migrazione GUI fallita"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nuovo messaggio privato dalla stanza %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Messaggio inviato da %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Questo file esiste già"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nuovo messaggio da %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "nove"
+msgid "Configuration"
+msgstr "Configurazione della stanza"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informazioni sul contatto"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-GG"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informazioni ricevute"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Invio del profilo..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informazione NON pubblicata"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10005,51 +10627,52 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorizzazione inviata"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ti connetterai a %s senza OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 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:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10057,39 +10680,39 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Annulla trasferimento file"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10098,16 +10721,16 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10115,11 +10738,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10128,69 +10751,69 @@ msgstr ""
 "Non si potranno inviare e ricevere messaggi verso i contatti di questi "
 "trasporti:%s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 #, 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10199,12 +10822,12 @@ msgstr ""
 "ti vedrà sempre offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Cosa fare?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10212,16 +10835,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10230,47 +10853,47 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni metacontatti. "
 "Perciò queste informazioni non saranno salvate al prossimo riavvio."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10280,24 +10903,29 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "File non valido"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Invia %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Rendi %s e %s metacontatti"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Rendi %s e %s metacontatti"
@@ -10307,133 +10935,133 @@ msgstr "Rendi %s e %s metacontatti"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Gestione segnalibri..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Configura la _stanza..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Invia _messaggio di gruppo"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Utenti _online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Gestisci contatti"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Invia messaggio singolo"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Gestisci trasporto"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Modifica trasporto"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
@@ -10450,25 +11078,14 @@ msgstr "Errore nella ricezione dei dati"
 msgid "No result"
 msgstr "Nessun risultato"
 
-#: ../src/session.py:136
-#, fuzzy
-msgid "Disk WriteError"
-msgstr "Errore di scrittura su disco"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Oggetto: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Conferma queste opzioni di sessione"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10480,7 +11097,7 @@ msgstr ""
 "\n"
 "\tQueste opzioni sono accettabili?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10495,147 +11112,152 @@ msgstr ""
 "\n"
 "Continuare la sessione?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "OpenPGP è abilitato per questo contatto?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Non nei contatti"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "ID Jabber: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s di questa chat di gruppo"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [bloccato]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimizzata]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Ultimo stato: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " dalle %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Disconnesso"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " dalle %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Console XML per %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Stanza:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Attivato"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Demone delle notifiche"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:In pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10643,34 +11265,34 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "dalle %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Applicazioni</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10678,7 +11300,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10686,14 +11308,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10701,19 +11323,403 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Scegliere il file da inviare..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "una finestra/tab è aperta per questo contatto"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Azioni</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Condizioni</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Azioni avanzate"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Gestione avanzata delle notifiche"
+
+#~ msgid "All statuses"
+#~ msgstr "Tutti gli stati"
+
+#~ msgid "Busy "
+#~ msgstr "Occupato "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Stato Contatto Cambiato"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contatto disconnesso"
+
+#~ msgid "Don't have "
+#~ msgstr "Non ho "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Trasferimento file fermato"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Evidenziatura messaggi in chat di gruppo"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Messaggio ricevuto in chat di gruppo"
+
+#~ msgid "Have "
+#~ msgstr "Ho "
+
+#~ msgid "Launch a command"
+#~ msgstr "Lancia un comando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Uno o più stati speciali..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Online / Libero per chat"
+
+#~ msgid "Play a sound"
+#~ msgstr "Riproduci un suono"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nuovo messaggio privato"
+
+#~ msgid "When "
+#~ msgstr "Quando "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Attiva UrgencyHint del windows manager per far lampeggiare la finestra "
+#~ "chat nell'elenco finestre"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Disabilita l'apertura automatica della finestra di chat"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Disabilita la finestra di popup esistente"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Disabilita il suono esistente associato all'evento"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Disabilita l'evento di apparizione nella lista contatti"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Disabilita l'evento di apparizione nella lista contatti"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informami con una finestra di popup"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Apri una finestra di chat con l'utente"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Mostra evento nella lista _contatti"
+
+#~ msgid "and I "
+#~ msgstr "ed io "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contatti"
+
+#~ msgid "for "
+#~ msgstr "per "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Gruppo"
+
+#~ msgid "when I'm in"
+#~ msgstr "quando sono in"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Aggiunge il contatto alla lista"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Permetti di _vedere il mio stato"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Descrizione: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Avanzato"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+#~ "nelle chat di gruppo"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+#~ "nelle chat di gruppo"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
+#~ "nelle chat di gruppo"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Invia _messaggio singolo..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Avatar dell'utente:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Messaggistica istantanea Gajim"
+
+#~ msgid "English"
+#~ msgstr "Inglese"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bielorusso"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgaro"
+
+#~ msgid "Breton"
+#~ msgstr "Bretone"
+
+#~ msgid "Czech"
+#~ msgstr "Ceco"
+
+#~ msgid "German"
+#~ msgstr "Tedesco"
+
+#~ msgid "Greek"
+#~ msgstr "Greco"
+
+#~ msgid "British"
+#~ msgstr "Britannico"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spagnolo"
+
+#~ msgid "Basque"
+#~ msgstr "Basco"
+
+#~ msgid "French"
+#~ msgstr "Francese"
+
+#~ msgid "Croatian"
+#~ msgstr "Croato"
+
+#~ msgid "Italian"
+#~ msgstr "Italiano"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norvegese (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Olandese"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norvegese"
+
+#~ msgid "Polish"
+#~ msgstr "Polacco"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portoghese"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brasiliano"
+
+#~ msgid "Russian"
+#~ msgstr "Russo"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbo"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovacco"
+
+#~ msgid "Swedish"
+#~ msgstr "Svedese"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Cinese (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Lingua per la correzione ortografica"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
+#~ "usando dvips e convertendola prima di inserirla in una finestra di chat."
+
+#~ msgid "all or space separated status"
+#~ msgstr "tutto o stati separati da uno spazio"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', o 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' o 'both'"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Controllare la connessione o riprovare più tardi"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "errore: impossibile aprire %s per lettura"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Non è possibile fare il bind alla porta %s"
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Potrebbe essere in esecuzione un altra istanza di Gajim. Il trasferimento "
+#~ "file verrà annullato."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Un client jabber GTK+"
+
+#~ msgid "Condition"
+#~ msgstr "Condizione"
+
+#~ msgid "when I am "
+#~ msgstr "quando io sono "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Richiede pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Richiede gpg e python-GnuPGInterface"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#, fuzzy
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare "
+#~ "'use_latex' su Attivato nell'Editor di configurazione avanzata."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Richiede python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Utilizzo: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Troppi parametri. \n"
+#~ "Scrivere \"%s help %s\" per maggiori informazioni"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Contatti"
+
+#, fuzzy
+#~ msgid "Disk WriteError"
+#~ msgstr "Errore di scrittura su disco"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Oggetto: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Stanza:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Attivato"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Disabilita la visualizzazione dell'evento nell'area di notifica"
 
@@ -10731,32 +11737,12 @@ msgstr " risorsa con priorità "
 #~ 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"
 
@@ -10849,9 +11835,6 @@ msgstr " risorsa con priorità "
 #~ "Contatto\n"
 #~ "Banner"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Gestisci account"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-close"
@@ -10978,9 +11961,6 @@ msgstr " risorsa con priorità "
 #~ "Tu non sei connesso o non sei visibile ad altri. Il tuo messaggio non può "
 #~ "essere inviato."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Questo messaggio è cifrato]"
-
 #~ msgid "%i days ago"
 #~ msgstr "%i giorni fa"
 
@@ -11010,12 +11990,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Commands: %s"
 #~ msgstr "Comandi: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Utilizzo: /%s, pulisce la finestra di testo."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Utilizzo: /%s, nasconde i pulsanti di chat."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -11024,12 +11998,6 @@ msgstr " risorsa con priorità "
 #~ "Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la "
 #~ "terza persona (esempio: /%s esplode)."
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Utilizzo: /%s, invia un ping al contatto"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Utilizzo: /%s, invia il messaggio al contatto"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Non esiste aiuto per /%s"
 
@@ -11046,10 +12014,6 @@ msgstr " risorsa con priorità "
 #~ msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Nickname non trovato: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -11061,13 +12025,6 @@ msgstr " risorsa con priorità "
 #~ "cacciato. NON supporta la presenza di spazi nel nickname."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Utilizzo: /%s <nickname>, apre una finestra di chat privata al "
-#~ "partecipante specificato."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -11104,15 +12061,6 @@ msgstr " risorsa con priorità "
 #~ "Utilizzo: /%s <nickname> [messaggio], apre una finestra di messaggi "
 #~ "privati ed invia il messaggio al partecipante specificato per nickname."
 
-#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-#~ msgstr ""
-#~ "Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
-
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr ""
-#~ "Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
-#~ "corrente."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11234,9 +12182,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Encryption disabled"
 #~ msgstr "Cifratura disattivata"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Clicca per vedere le conversazioni precedenti con questo contatto"
-
 #~ msgid "Invite _Friends"
 #~ msgstr "Invita _amici"
 
@@ -11263,9 +12208,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Query Builder..."
 #~ msgstr "Costruttore richieste..."
 
-#~ msgid "Accept"
-#~ msgstr "Accetta"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Invito ricevuto"
 
@@ -11343,9 +12285,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Company:"
 #~ msgstr "Società:"
 
-#~ msgid "Country:"
-#~ msgstr "Paese:"
-
 #~ msgid "Given:"
 #~ msgstr "Nome:"
 
@@ -11725,9 +12664,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizza automaticamente il contatto"
 
-#~ msgid "Send File"
-#~ msgstr "Invia file"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "_Entra in nuova stanza..."
 
@@ -11783,12 +12719,6 @@ msgstr " risorsa con priorità "
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Tutti i contatti in questo gruppo sono offline o hanno errori"
 
-#~ msgid "Size: "
-#~ msgstr "Dimensione: "
-
-#~ msgid "Session bus is not available"
-#~ msgstr "Il bus della sessione non è disponibile"
-
 #~ msgid "Sound"
 #~ msgstr "Suono"
 
@@ -12070,9 +13000,6 @@ msgstr " risorsa con priorità "
 #~ "possibile cambiare modalità premendo Alt-C. NOTA: L'ultimo stato in cui "
 #~ "viene lasciata una finestra/scheda non è permanente"
 
-#~ msgid "Show roster window on Gajim startup"
-#~ msgstr "Mostra la finestra dei contatti all'avvio di Gajim"
-
 #~ msgid "_Compact View"
 #~ msgstr "_Vista compatta"
 
diff --git a/po/ja.po b/po/ja.po
index 248820dc6..7c0d0c222 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.15 ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-22 18:48+0100\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2012-01-22 21:59+0900\n"
 "Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Japanese\n"
@@ -16,323 +16,294 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "在席状況 (_S)"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "個人イベント (_P)"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "チャットを開始する (_S)..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "グループチャットに参加する (_G)..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "相手先リストに追加する (_A)..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "サービスを探索する (_D)"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "コマンドを実行する (_E)..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "アカウントを修正する (_M)"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "Gmail の受信箱を開く (_O)"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "個人イベント (_P)"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "チャットを開始する (_S)..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "在席状況 (_S)"
+msgid "_Modify Account"
+msgstr "アカウントを修正する (_M)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: アカウント作成ウィザード"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
-msgstr ""
-"<b>サーバに接続しています</b>\n"
-"\n"
-"しばらくお待ちください..."
+"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:4
+msgid "I already have an account I want to _use"
+msgstr "既にアカウントを持っているのでそれを使う (_u)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "新しいアカウントを作成する (_r)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>下の選択肢から一つ選んでください:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>既にお持ちのアカウントの情報を入力してください</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>サーバーを選択してください</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "パスワード (_P):"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"この証明書を、信頼できる証明書一覧に加えます。\n"
-"この証明書の SHA1 指紋:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "パスワードを保存する"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "匿名の認証 (_y)"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "「完了」を押したらすぐに接続する"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "Jabber ID (_J):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: アカウント作成ウィザード"
+msgid "Anon_ymous authentication"
+msgstr "匿名の認証 (_y)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "既にアカウントを持っているのでそれを使う (_u)"
+msgid "<b>Please select a server</b>"
+msgstr "<b>サーバーを選択してください</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "新しいアカウントを作成する (_r)"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "サーバー (_S):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します"
+msgid "Prox_y:"
+msgstr "プロキシ (_y)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "管理..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:41 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284
-#: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746
-#: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406
-#: ../src/config.py:2419 ../src/config.py:3699 ../src/config.py:3774
-#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
-#: ../src/dialogs.py:532 ../src/roster_window.py:3139
-#: ../src/roster_window.py:3145 ../src/roster_window.py:3150
-msgid "None"
-msgstr "なし"
+msgid "Use custom hostname/port"
+msgstr "別のホスト名/ポート番号を使う"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "プロキシ (_y)"
+msgid "_Hostname:"
+msgstr "ホスト名 (_H):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Save pass_word"
-msgstr "パスワードを保存する"
+msgid "_Port:"
+msgstr "ポート番号 (_P):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "接続時に自分のプロフィールを設定する"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "拡張 (_A)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "別のホスト名/ポート番号を使う"
-
-#: ../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 ネットワークに接続するには、アカウントが必要です。"
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+"この証明書を、信頼できる証明書一覧に加えます。\n"
+"この証明書の SHA1 指紋:\n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:17
-msgid "_Advanced"
-msgstr "拡張 (_A)"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "完了 (_F)"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "ホスト名 (_H):"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>サーバに接続しています</b>\n"
+"\n"
+"しばらくお待ちください..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Jabber ID:"
-msgstr "Jabber ID (_J):"
+msgid "Connect when I press Finish"
+msgstr "「完了」を押したらすぐに接続する"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:65
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "_Password:"
-msgstr "パスワード (_P):"
+msgid "Set my profile when I connect"
+msgstr "接続時に自分のプロフィールを設定する"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "ポート番号 (_P):"
+msgid "_Finish"
+msgstr "完了 (_F)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-msgid "_Server:"
-msgstr "サーバー (_S):"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>その他の設定</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "なし"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>個人情報</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>プロキシ</b>"
-
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "在席状況に合わせる (_d)"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "アカウント"
-
-#: ../data/gui/accounts_window.ui.h:7
 msgid "Accounts"
 msgstr "アカウント"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3384
-#: ../src/dialogs.py:3430
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 msgid "Add"
 msgstr "追加"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Administration operations"
-msgstr "管理の操作"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "削除"
 
-#: ../data/gui/accounts_window.ui.h:10
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "名前の変更 (_n)"
+
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "有効 (_E)"
+
+#: ../data/gui/accounts_window.ui.h:7
 msgid "Anonymous authentication"
 msgstr "匿名の認証"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"リソースとは、同じサーバーに同じアカウントで複数のクライアントからの接続があ"
+"る場合に、同じ JID を区別するために送信されます。たとえば、同じアカウントでリ"
+"ソースを 'Home' と 'Work' として同時に接続しているかもしれません。最も優先順"
+"位の高いリソースがイベントを受け取ります(下記参照)。"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
+#: ../data/gui/accounts_window.ui.h:10
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "相手先を合わせる"
+
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Auto-reconnect when connection is lost"
-msgstr "切断したら自動で再接続する"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "別アカウントのすべての相手先に承認を求めるにはクリック"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "Browse..."
-msgstr "参照..."
+msgid "Chan_ge Password"
+msgstr "パスワードを変更する (_g)"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "C_onnect on Gajim startup"
-msgstr "Gajim 起動時に接続する (_o)"
+msgid "Click to change account's password"
+msgstr "アカウントのパスワードを変更するにはクリック"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Certificate is e_ncrypted"
-msgstr "証明書は暗号化されている (_n)"
+msgid "Administration operations"
+msgstr "管理の操作"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Chan_ge Password"
-msgstr "パスワードを変更する (_g)"
-
-#: ../data/gui/accounts_window.ui.h:16
 msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
+"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:16
+msgid "A_djust to status"
+msgstr "在席状況に合わせる (_d)"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Choose _Key..."
-msgstr "鍵の選択 (_K)..."
+msgid "Priority will change automatically according to your status."
+msgstr "優先順位は、在席状況に応じて自動的に変わります。"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to change account's password"
-msgstr "アカウントのパスワードを変更するにはクリック"
+msgid "Priori_ty:"
+msgstr "優先順位 (_t):"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Click to request authorization to all contacts of another account"
-msgstr "別アカウントのすべての相手先に承認を求めるにはクリック"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Client certificate"
-msgstr "クライアントの証明書"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim 起動時に接続する (_n)"
-
-#: ../data/gui/accounts_window.ui.h:22
-msgid "Connection"
-msgstr "接続"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3388
-#: ../src/dialogs.py:3485
-msgid "Delete"
-msgstr "削除"
+msgid "Resour_ce:"
+msgstr "リソース (_c):"
 
 #: ../data/gui/accounts_window.ui.h:24
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-メール:"
+msgid "_Client Cert File:"
+msgstr "クライアントの証明書ファイル (_C):"
 
 #: ../data/gui/accounts_window.ui.h:25
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "名:"
+msgid "Browse..."
+msgstr "参照..."
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:26 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1168 ../src/common/helpers.py:1180
-#: ../src/notify.py:314 ../src/notify.py:337 ../src/notify.py:387
-#: ../src/notify.py:403
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:26
+msgid "Certificate is e_ncrypted"
+msgstr "証明書は暗号化されている (_n)"
 
-#. 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:27 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
-#: ../src/roster_window.py:3081 ../src/roster_window.py:4148
-#: ../src/roster_window.py:5738
-msgid "General"
-msgstr "全般"
+#: ../data/gui/accounts_window.ui.h:27
+msgid "Client certificate"
+msgstr "クライアントの証明書"
 
-# (Mako)broadcast 困った。ここは「同報」で
 #: ../data/gui/accounts_window.ui.h:28
-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/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "アカウント"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"チェックをつけると、Gajim は seahorse など GPG エージェントからパスワードを受"
-"け取ります"
-
-#: ../data/gui/accounts_window.ui.h:31
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"チェックをつけると、Gajim はタイムアウトで接続が切れてしまうのを防ぐために生"
-"存パケットを流すようになります"
+msgid "C_onnect on Gajim startup"
+msgstr "Gajim 起動時に接続する (_o)"
 
-#: ../data/gui/accounts_window.ui.h:32
+#: ../data/gui/accounts_window.ui.h:30
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -340,7 +311,19 @@ msgstr ""
 "チェックをつけると、Gajim は起動時に、このアカウントを使って jabber に自動的"
 "に接続します"
 
+#: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "切断したら自動で再接続する"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "すべての相手先の会話記録を保存する (_l)"
+
 #: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "アカウントの在席状況を全体の在席状況に合わせる (_r)"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -349,171 +332,206 @@ msgstr ""
 "チェックをつけると、(名簿ウィンドウの最下段の選択肢による)全体の在席状況の変"
 "更がこのアカウントの在席状況の変更に反映されます。"
 
-#: ../data/gui/accounts_window.ui.h:34
-msgid ""
-"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"
-"ファイアーウォールの設定を考慮しましょう。"
+#: ../data/gui/accounts_window.ui.h:35
+msgid "Use file transfer proxies"
+msgstr "ファイル転送のプロキシを使う"
 
+# (Mako)broadcast 困った。ここは「同報」で
 #: ../data/gui/accounts_window.ui.h:36
-msgid "Information about you, as stored in the server"
-msgstr "サーバに格納する、あなたに関する情報です"
+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:37
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1869
-#: ../src/dialogs.py:837
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "全般"
 
 #: ../data/gui/accounts_window.ui.h:38
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "姓:"
+msgid "_use HTTP__PROXY environment variable"
+msgstr "環境変数 HTTP__PROXY を使う (_u)"
 
-#: ../data/gui/accounts_window.ui.h:39
-msgid "Mer_ge accounts"
-msgstr "アカウントを統合 (_g)"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "管理 (_M)..."
 
-#: ../data/gui/accounts_window.ui.h:40 ../src/config.py:1842
-#: ../src/config.py:2420
-msgid "No key selected"
-msgstr "鍵が選択されていません"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>プロキシ</b>"
 
-#: ../data/gui/accounts_window.ui.h:42 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "個人情報"
+#: ../data/gui/accounts_window.ui.h:41
+msgid "_Warn before using an insecure connection"
+msgstr "安全でない接続の前には警告する (_W)"
+
+#: ../data/gui/accounts_window.ui.h:42
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま"
+"す。"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priori_ty:"
-msgstr "優先順位 (_t):"
+msgid "Send _keep-alive packets"
+msgstr "生存パケットを送信する (_k)"
 
 #: ../data/gui/accounts_window.ui.h:44
 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"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
-"優先順位は、同じアカウントで二つ以上のクライアントから接続しているときに "
-"jabber サーバーからのイベントの受け取り先を決定するのに使われます。最も高い優"
-"先順位のクライアントがイベントを受け取ります"
+"チェックをつけると、Gajim はタイムアウトで接続が切れてしまうのを防ぐために生"
+"存パケットを流すようになります"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Priority will change automatically according to your status."
-msgstr "優先順位は、在席状況に応じて自動的に変わります。"
+msgid "Use cust_om hostname/port"
+msgstr "別のホスト名/ポート番号を使う (_o)"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5688
-msgid "Re_name"
-msgstr "名前の変更 (_n)"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "_Hostname: "
+msgstr "ホスト名 (_H):"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Resour_ce:"
-msgstr "リソース (_c):"
+msgid "_Port: "
+msgstr "ポート番号 (_P):"
 
-#: ../data/gui/accounts_window.ui.h:48
-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 ""
-"リソースとは、同じサーバーに同じアカウントで複数のクライアントからの接続があ"
-"る場合に、同じ JID を区別するために送信されます。たとえば、同じアカウントでリ"
-"ソースを 'Home' と 'Work' として同時に接続しているかもしれません。最も優先順"
-"位の高いリソースがイベントを受け取ります(下記参照)。"
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>その他の設定</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Save conversation _logs for all contacts"
-msgstr "すべての相手先の会話記録を保存する (_l)"
+msgid "Connection"
+msgstr "接続"
+
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "鍵が選択されていません"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Send _keep-alive packets"
-msgstr "生存パケットを送信する (_k)"
+msgid "Choose _Key..."
+msgstr "鍵の選択 (_K)..."
 
 #: ../data/gui/accounts_window.ui.h:52
-msgid "Synch_ronize account status with global status"
-msgstr "アカウントの在席状況を全体の在席状況に合わせる (_r)"
+msgid "Use G_PG Agent"
+msgstr "GPG エージェントを使う (_P)"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "Synchroni_ze account status with global status"
-msgstr "アカウントの在席状況を全体の在席状況に合わせる (_z)"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"チェックをつけると、Gajim は seahorse など GPG エージェントからパスワードを受"
+"け取ります"
 
 #: ../data/gui/accounts_window.ui.h:54
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "相手先を合わせる"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use G_PG Agent"
-msgstr "GPG エージェントを使う (_P)"
+msgid "_Edit Personal Information..."
+msgstr "個人情報を編集する (_E)..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om hostname/port"
-msgstr "別のホスト名/ポート番号を使う (_o)"
+msgid "Information about you, as stored in the server"
+msgstr "サーバに格納する、あなたに関する情報です"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use cust_om port:"
-msgstr "別のポート番号を使う (_o):"
+msgid "<b>Personal Information</b>"
+msgstr "<b>個人情報</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "Use file transfer proxies"
-msgstr "ファイル転送のプロキシを使う"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "個人情報"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Client Cert File:"
-msgstr "クライアントの証明書ファイル (_C):"
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 起動時に接続する (_n)"
 
 #: ../data/gui/accounts_window.ui.h:60
-msgid "_Edit Personal Information..."
-msgstr "個人情報を編集する (_E)..."
+msgid "Synchroni_ze account status with global status"
+msgstr "アカウントの在席状況を全体の在席状況に合わせる (_z)"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:61 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "有効 (_E)"
+#: ../data/gui/accounts_window.ui.h:61
+msgid "Use cust_om port:"
+msgstr "別のポート番号を使う (_o):"
 
 #: ../data/gui/accounts_window.ui.h:62
-msgid "_Hostname: "
-msgstr "ホスト名 (_H):"
+msgid ""
+"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"
+"ファイアーウォールの設定を考慮しましょう。"
 
-#: ../data/gui/accounts_window.ui.h:64 ../data/gui/preferences_window.ui.h:133
-msgid "_Manage..."
-msgstr "管理 (_M)..."
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "名:"
+
+#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "姓:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Port: "
-msgstr "ポート番号 (_P):"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-メール:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_Warn before using an insecure connection"
-msgstr "安全でない接続の前には警告する (_W)"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
 
 #: ../data/gui/accounts_window.ui.h:68
-msgid "_use HTTP__PROXY environment variable"
-msgstr "環境変数 HTTP__PROXY を使う (_u)"
+msgid "Mer_ge accounts"
+msgstr "アカウントを統合 (_g)"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "アカウント (_c):"
+msgid "Add New Contact"
+msgstr "新しい相手先を追加する"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "この相手先に自分の在席状況を見ることを許可する (_l)"
+msgid "A_ccount:"
+msgstr "アカウント (_c):"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "新しい相手先を追加する"
+msgid "_Protocol:"
+msgstr "プロトコル (_P):"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1359
-msgid "I would like to add you to my contact list."
-msgstr "あなたを私の相手先リストに追加したいと思います。"
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "ユーザー ID (_U):"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "ニックネーム (_N):"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "グループ (_G):"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "この相手先に自分の在席状況を見ることを許可する (_l)"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "在席通知申込のメッセージを保存 (_S)"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -524,7 +542,11 @@ msgstr ""
 "この中継先に登録しなければなりません。\n"
 "登録ボタンを押して次に進んでください。"
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "登録 (_R)"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -532,404 +554,371 @@ msgstr ""
 "このプロトコルの相手先を追加するためには、\n"
 "この中継先に接続していなければなりません。"
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "グループ (_G):"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "_Nickname:"
-msgstr "ニックネーム (_N):"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "プロトコル (_P):"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "登録 (_R)"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "在席通知申込のメッセージを保存 (_S)"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "ユーザー ID (_U):"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "あなたを私の相手先リストに追加したいと思います。"
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>エラーが発生しました:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc コマンド - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>実行するコマンドを選択してください:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "コマンド一覧を取得しています。しばらくお待ちください..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc コマンド - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>実行するコマンドを選択してください:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "やり直す"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "エラーの説明..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "コマンドを送信しています。しばらくお待ちください..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "完了 (_i)"
+msgid "Please wait..."
+msgstr "しばらくお待ちください..."
 
+# (Mako)entity はしかたなくカタカナで
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "コマンド一覧を取得しています。しばらくお待ちください..."
+msgid "This jabber entity does not expose any commands."
+msgstr "このエンティティはコマンドを受け付けません。"
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "コマンドを送信しています。しばらくお待ちください..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>エラーが発生しました:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "しばらくお待ちください..."
+msgid "Error description..."
+msgstr "エラーの説明..."
 
-# (Mako)entity はしかたなくカタカナで
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "このエンティティはコマンドを受け付けません。"
+msgid "F_inish"
+msgstr "完了 (_i)"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>説明</b>"
+msgid "Advanced Configuration Editor"
+msgstr "詳細設定エディタ"
 
 #: ../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 を再起動してください"
+msgid "Filter:"
+msgstr "フィルタ:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "詳細設定エディタ"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>説明</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "フィルタ:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>注意:</b> 設定を有効にするには Gajim を再起動してください"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "デフォルトの色に戻す (_R)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "MOTD を削除"
+msgid "Show _XML Console"
+msgstr "XML コンソールを表示 (_X)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "今日のメッセージを削除します"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "書庫の設定を編集 (_v)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "プライバシーリストを編集..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "管理人 (_A)"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "現在このサーバーに接続しているユーザーにメッセージを送信する"
+msgid "_Send Server Message..."
+msgstr "サーバーメッセージを送信 (_S)..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "MOTD を設定..."
+msgid "Sends a message to users currently connected to this server"
+msgstr "現在このサーバーに接続しているユーザーにメッセージを送信する"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "今日のメッセージを設定します"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "XML コンソールを表示 (_X)"
+msgid "Set MOTD..."
+msgstr "MOTD を設定..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "MOTD を更新..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "今日のメッセージを更新します"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "MOTD を更新..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "管理人 (_A)"
+msgid "Delete MOTD"
+msgstr "MOTD を削除"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "サーバーメッセージを送信 (_S)..."
+msgid "Deletes Message of the Day"
+msgstr "今日のメッセージを削除します"
 
+# Auto の選択肢
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+msgid "No"
+msgstr "しない"
 
+# Auto の選択肢
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr ""
+msgid "Yes"
+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 "自動化"
+msgid "Prefer"
+msgstr "その都度選ぶ"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
+#: ../data/gui/archiving_preferences_window.ui.h:4
 msgid "Concede"
 msgstr "認める"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "禁止する"
 
-# Auto の選択肢
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr ""
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "しない"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "その都度選ぶ"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
-# Auto の選択肢
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "する"
+#, fuzzy
+msgid "Auto"
+msgstr "自動化"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "エントリー:"
+msgid "New entry received"
+msgstr "新しいエントリーを受け取りました"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "新しいエントリーを受け取りました:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "フィード名:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "エントリー:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "最終更新:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "新しいエントリーを受け取りました"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "新しいエントリーを受け取りました:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "遮断している相手先"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5707
-#: ../src/roster_window.py:5834 ../src/roster_window.py:5967
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "遮断の解除 (_U)"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>メッセージ:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "動向の設定"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "動向の設定"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>メッセージ:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>メッセージ:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>気分:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>メッセージ:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "パスワードの変更"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "確認のためもう一度入力してください:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "新しいパスワードを入力してください:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "確認のためもう一度入力してください:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>新しい状況メッセージを入力してください</b>"
+msgid "Save as Preset..."
+msgstr "用意しておくメッセージとして保存..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "動向:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "気分:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "動向:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "用意されたメッセージ:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "用意しておくメッセージとして保存..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>新しい状況メッセージを入力してください</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "グループチャットに参加する (_G)"
+msgid "_Copy Link Location"
+msgstr "リンクの場所をコピー (_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Add to Roster..."
-msgstr "名簿に追加 (_A)..."
+msgid "_Open Link in Browser"
+msgstr "リンク先をブラウザで開く (_O)"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "JID/Eメールアドレスのコピー (_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "リンクの場所をコピー (_C)"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "メール作成画面を開く (_O)"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "リンク先をブラウザで開く (_O)"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "チャットを開始 (_S)"
 
-#: ../data/gui/chat_control.ui.h:1
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "グループチャットに参加する (_G)"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "名簿に追加 (_A)..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "感情アイコンの一覧を表示する (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "相手先を名簿に追加する (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "相手先を会話に招待する (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "相手先を会話に招待する (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "チャットの履歴を見る (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "拡張機能のメニューを表示する (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "送信 (_S)"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 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
-#: ../src/command_system/implementation/standard.py:208
-msgid "Toggle audio session"
-msgstr "音声セッションにする/しない"
-
-#: ../data/gui/chat_control.ui.h:21
-#: ../src/command_system/implementation/standard.py:218
-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:277
-msgid "_Send"
-msgstr "送信 (_S)"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "ラベル"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "招待 (_v)"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "友だちを招待 !"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "グループチャットのサーバー"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "グループチャットのサーバーを選択してください。"
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -937,120 +926,135 @@ msgstr ""
 "グループチャットを始めようとしています。\n"
 "招待したい相手先を選択してください"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "相手の在席状況を見ることを申し込む (_s)"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "グループチャットのサーバーを選択してください。"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "特別な状態通知を追加する (_N)..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "グループチャットのサーバー"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Open_PGP 鍵の割り当て..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "招待 (_v)"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "コマンドを実行 (_x)..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "チャットを開始 (_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "グループを変更 (_G)..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "単発メッセージを送信 (_M)..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "ファイルを送信 (_S)..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5643
-#: ../src/roster_window.py:5802
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "招待 (_v)"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "相手先を招待 (_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "M_anage Contact"
-msgstr "相手先を管理 (_a)"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Open_PGP 暗号化 (トグル)"
 
-#: ../data/gui/contact_context_menu.ui.h:9
-msgid "Remo_ve"
-msgstr "削除 (_v)"
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "全線暗号化(E2EE) (トグル)"
 
-#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5653
-#: ../src/roster_window.py:5891
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "個別の在席状況を送信 (_t)"
 
-#: ../data/gui/contact_context_menu.ui.h:11 ../data/gui/roster_window.ui.h:10
-msgid "Send Single _Message..."
-msgstr "単発メッセージを送信 (_M)..."
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "コマンドを実行 (_x)..."
+
+#: ../data/gui/contact_context_menu.ui.h:10
+msgid "M_anage Contact"
+msgstr "相手先を管理 (_a)"
+
+#: ../data/gui/contact_context_menu.ui.h:11
+msgid "_Rename..."
+msgstr "名前を変更 (_R)..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Send _File..."
-msgstr "ファイルを送信 (_S)..."
+msgid "Edit _Groups..."
+msgstr "グループを変更 (_G)..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Set Custom _Avatar..."
-msgstr "独自アバターを設定 (_A)..."
+msgid "Assign Open_PGP Key..."
+msgstr "Open_PGP 鍵の割り当て..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Start _Chat"
-msgstr "チャットを開始 (_C)"
+msgid "Set Custom _Avatar..."
+msgstr "独自アバターを設定 (_A)..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle End to End Encryption"
-msgstr "全線暗号化(E2EE) (トグル)"
+msgid "Add Special _Notification..."
+msgstr "特別な状態通知を追加する (_N)..."
 
 #: ../data/gui/contact_context_menu.ui.h:16
-msgid "Toggle Open_PGP Encryption"
-msgstr "Open_PGP 暗号化 (トグル)"
+msgid "_Subscription"
+msgstr "在席通知の申し込み (_S)"
+
+#: ../data/gui/contact_context_menu.ui.h:17
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "この相手先に自分の在席状況を見ることを許可する (_l)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-msgid "_Allow him/her to see my status"
-msgstr "自分の在席状況を見られることを許可する (_A)"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "相手の在席状況を見ることを申し込む (_s)"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5715
-#: ../src/roster_window.py:5840 ../src/roster_window.py:5970
-msgid "_Block"
-msgstr "遮断 (_B)"
-
-#: ../data/gui/contact_context_menu.ui.h:20
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "自分の在席状況を見られることを禁止する (_F)"
 
 #: ../data/gui/contact_context_menu.ui.h:21
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
-#: ../src/roster_window.py:6041
-msgid "_History"
-msgstr "履歴 (_H)"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "遮断 (_B)"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Ignore"
-msgstr "無視 (_I)"
+msgid "_Unignore"
+msgstr "無視しない (_U)"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "名前を変更 (_R)..."
+msgid "_Ignore"
+msgstr "無視 (_I)"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "在席通知の申し込み (_S)"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "削除 (_v)"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "無視しない (_U)"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "履歴 (_H)"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "次の欄を埋めてください。"
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "談話室の構成"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "次の欄を埋めてください。"
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "グループの編集"
@@ -1063,56 +1067,47 @@ msgstr "(<b>暗号化セッション</b> 情報)"
 msgid "_Verify"
 msgstr "検査 (_V)"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "機能"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Gajim の現在有効な機能の一覧:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "機能"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "ファイル転送の転送中、完了、中止の一覧"
+msgid "File Transfers"
+msgstr "ファイルの転送"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "ファイルの転送を中止する"
+msgid "Shows a list of file transfers between you and others"
+msgstr "ファイル転送の一覧を表示します"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "選択されたファイルの転送を中止します"
+msgid "file transfers list"
+msgstr "ファイル転送の一覧"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "選択されたファイルの転送を中止し、不完全なファイルは削除します"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "ファイル転送の転送中、完了、中止の一覧"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "消去 (_u)"
+msgid "_Notify me when a file transfer is complete"
+msgstr "ファイル転送が完了したら知らせる (_N)"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "ファイルの転送"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "ファイル転送が完了したら、ポップアップで知らせる"
 
-# (Mako)この場合は「閉じる」
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "ウィンドウを閉じる"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "一覧から完了、中止、失敗したファイル転送を削除します"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "ファイル転送を一覧から削除します。"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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"
@@ -1120,81 +1115,107 @@ msgstr ""
 "一覧からひとつのファイル転送を削除します。転送中の場合、まず転送を中止し、そ"
 "れから削除してください"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "消去 (_u)"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "一時停止 (_P)"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "ファイル転送が完了したら、ポップアップで知らせる"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "選択されたファイルの転送を中止し、不完全なファイルは削除します"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:808
-msgid "_Continue"
-msgstr "続ける (_C)"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "ファイルの転送を中止する"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "ファイル転送が完了したら知らせる (_N)"
+msgid "Cancels the selected file transfer"
+msgstr "選択されたファイルの転送を中止します"
+
+# (Mako)この場合は「閉じる」
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "ウィンドウを閉じる"
+
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "続ける (_C)"
 
 # #(Mako)Containing をどうする
-#: ../data/gui/filetransfers.ui.h:15 ../src/chat_control.py:3236
-#: ../src/filetransfers_window.py:206
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
 msgid "_Open Containing Folder"
 msgstr "フォルダを開く (_O)"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "一時停止 (_P)"
-
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "ファイル転送の一覧"
-
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>チャット状態のタブの色</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "アカウントの行"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1042
-msgid "Bold"
-msgstr "太字にする"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "グループの行"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "相手先の行"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "チャットのバナー"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "入力中"
+msgid "Gajim Themes Customization"
+msgstr "Gajim テーマのカスタマイズ"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "相手先の行"
+msgid "Text _color:"
+msgstr "文字の色 (_c):"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "フォントのスタイル:"
+msgid "_Background:"
+msgstr "背景色 (_B):"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim テーマのカスタマイズ"
+msgid "Text _font:"
+msgstr "フォント (_f):"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "終了"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "グループの行"
+msgid "Font style:"
+msgstr "フォントのスタイル:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "停止中"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "太字にする"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1043
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "イタリック"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "休止中"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "入力中"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "停止中"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>チャット状態のタブの色</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "終了"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1202,7 +1223,7 @@ msgstr ""
 "グループチャット\n"
 "メッセージ"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1210,110 +1231,98 @@ msgstr ""
 "グループチャットでの\n"
 "指示メッセージ"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "休止中"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "文字の色 (_c):"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "フォント (_f):"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "背景色 (_B):"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "ニックネームを変更 (_N)..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "談話室を管理 (_M)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "談話室の題を変更 (_S)..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "談話室を調整 (_R)..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "ブックマーク (_B)"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "談話室を閉鎖 (_D)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "談話室を管理 (_M)"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "閉じるボタンで最小化 (_M)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_control_popup_menu.ui.h:7
 msgid "_Request Voice"
 msgstr "発言権を要求 (_R)"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "ブックマーク (_B)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "_Send Private Message"
+msgstr "私信を送る (_S)"
+
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Mo_derator"
-msgstr "司会者 (_d)"
+msgid "Send _File"
+msgstr "ファイルを送信 (_F)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "在室者の操作"
 
+# (Mako)moderated room での発言する権利
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "Send _File"
-msgstr "ファイルを送信 (_F)"
+msgid "_Voice"
+msgstr "発言権 (_V)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
-msgid "_Add to Roster"
-msgstr "名簿に追加 (A)"
+msgid "Mo_derator"
+msgstr "司会者 (_d)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "メンバー (_M)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "管理人 (_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:7
-msgid "_Ban"
-msgstr "締め出し (_B)"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "主宰者 (_O)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "蹴り出し (_K)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Member"
-msgstr "メンバー (_M)"
+#: ../data/gui/gc_occupants_menu.ui.h:10
+msgid "_Ban"
+msgstr "締め出し (_B)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Owner"
-msgstr "主宰者 (_O)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:13
-msgid "_Send Private Message"
-msgstr "私信を送る (_S)"
-
-# (Mako)moderated room での発言する権利
-#: ../data/gui/gc_occupants_menu.ui.h:15
-msgid "_Voice"
-msgstr "発言権 (_V)"
+msgid "_Add to Roster"
+msgstr "名簿に追加 (A)"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "この談話室をブックマークする (Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "書式の一覧を表示する"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "ニックネームを変更する (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "この談話室をブックマークする (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1325,33 +1334,19 @@ msgid "From:"
 msgstr "差出人:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 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."
-msgstr ""
-"<b>警告:</b>\n"
-"大幅な削除を考えているなら、Gajim が起動していないときに実行してください。一"
-"般に、チャットしている最中の相手先の削除は避けてください。"
+msgid "Gajim History Logs Manager"
+msgstr "Gajim 履歴記録マネージャ"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gajim 履歴記録マネージャ</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "書き出し"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Gajim 履歴記録マネージャ"
-
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1365,26 +1360,40 @@ msgstr ""
 "このプログラムは記録の削除や書き出しのためにお使いください。左の一覧から記録"
 "を選択し、また下の欄でデータベースを検索することができます。"
 
-#: ../data/gui/history_manager.ui.h:9
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>警告:</b>\n"
+"大幅な削除を考えているなら、Gajim が起動していないときに実行してください。一"
+"般に、チャットしている最中の相手先の削除は避けてください。"
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "データベースを検索 (_S)"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "すべてのチャットの履歴"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:324
-msgid "Conversation History"
-msgstr "会話の履歴"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "書き出し"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "JID または相手先の名前を入力してください"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr "グループチャットの履歴"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "すべてのチャットの履歴"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "会話の履歴"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "検索:"
@@ -1394,142 +1403,145 @@ msgid "_In date search"
 msgstr "ある日の中で検索 (_I)"
 
 #: ../data/gui/history_window.ui.h:7
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#, fuzzy
+msgid "Searching only in the selected day "
+msgstr "選択した日の中だけでの検索 "
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "会話の履歴を記録 (_L)"
 
-#: ../data/gui/history_window.ui.h:8
-msgid "searching only in the selected day "
-msgstr "選択した日の中だけでの検索 "
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "相手先の状況変更を記録する (_L)"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
+msgid "otr"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
+msgid "concede"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "談話室を一覧 (_w)"
-
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2334
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "グループチャットに参加"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "接続時に自動的にこの談話室に参加する (_a)"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "談話室:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "ニックネーム:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "最近使った:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "最近使った:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "接続時に自動的にこの談話室に参加する (_a)"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-msgid "Room:"
-msgstr "談話室:"
+msgid "_Bookmark this room"
+msgstr "この談話室をブックマーク (_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1859
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "サーバー:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "この談話室をブックマーク (_B)"
+msgid "Bro_wse Rooms"
+msgstr "談話室を一覧 (_w)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "参加 (_J)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "A_uto join"
-msgstr "自動参加 (_u)"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "チェックをつけると、スタート時にこのグループチャットに参加します"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "ブックマークを管理"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimi_ze on Auto Join"
-msgstr "自動参加して最小化 (_z)"
+msgid "Roo_m:"
+msgstr "談話室 (_m):"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Title:"
+msgstr "タイトル (_T):"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Pr_int status:"
 msgstr "状況の表示 (_i):"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Roo_m:"
-msgstr "談話室 (_m):"
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "A_uto join"
+msgstr "自動参加 (_u)"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "チェックをつけると、スタート時にこのグループチャットに参加します"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "_Title:"
-msgstr "タイトル (_T):"
+msgid "Minimi_ze on Auto Join"
+msgstr "自動参加して最小化 (_z)"
 
 # (Mako)Personal Eventing via Pubsub
 #: ../data/gui/manage_pep_services_window.ui.h:1
@@ -1541,124 +1553,129 @@ msgid "_Configure"
 msgstr "調整 (_C)"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>プロパティ</b>"
+msgid "HTTP Connect"
+msgstr "HTTP 接続"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>設定</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP 接続"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "プロキシの設定"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "種類 (_T):"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "パスワード (_w):"
+msgid "_Name:"
+msgstr "名前 (_N):"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "プロキシのホスト (_H):"
+msgid "<b>Properties</b>"
+msgstr "<b>プロパティ</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "プロキシのポート (_P):"
+msgid "Use HTTP prox_y"
+msgstr "HTTP プロキシを利用する (_y)"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "HTTP プロキシを利用する (_y)"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "プロキシの認証を使用する (_e)"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "ユーザー名 (_U):"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "パスワード (_w):"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "名前 (_N):"
+msgid "Proxy _Host:"
+msgstr "プロキシのホスト (_H):"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "種類 (_T):"
+msgid "Proxy _Port:"
+msgstr "プロキシのポート (_P):"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "ユーザー名 (_U):"
+msgid "<b>Settings</b>"
+msgstr "<b>設定</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "相手先の管理 (_M)"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;空&gt;"
+msgid "Plugins"
+msgstr "プラグイン"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<空>"
+msgid "Install from zip"
+msgstr "zip からインストール"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "作者:"
+msgid "&lt;empty&gt;"
+msgstr "&lt;空&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Configure"
-msgstr "調整"
+msgid "Version:"
+msgstr "バージョン:"
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Description:"
-msgstr "説明: "
+msgid "<empty>"
+msgstr "<空>"
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Homepage:"
-msgstr "ホームページ:"
+msgid "Authors:"
+msgstr "作者:"
 
 #: ../data/gui/plugins_window.ui.h:7
-msgid "Install from zip"
-msgstr "zip からインストール"
+msgid "Homepage:"
+msgstr "ホームページ:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Installed"
-msgstr "インストール済"
+msgid "homepage url"
+msgstr "ホームページ URL"
 
 #: ../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 "Description:"
+msgstr "説明: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid "Plugins"
-msgstr "プラグイン"
-
-#: ../data/gui/plugins_window.ui.h:11
 msgid "Uninstall"
 msgstr "アンインストール"
 
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Configure"
+msgstr "調整"
+
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Version:"
-msgstr "バージョン:"
+msgid "Installed"
+msgstr "インストール済"
 
 #: ../data/gui/plugins_window.ui.h:13
-msgid "homepage url"
-msgstr "ホームページ URL"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+"プラグインの説明がここに表示されます。この文はプラグインウィンドウの初期化の"
+"際に消去されます。"
 
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
@@ -1669,213 +1686,274 @@ msgid "Event desc"
 msgstr "イベントの説明"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>詳細設定エディタ</b>"
+msgid "Use default applications"
+msgstr "デフォルトのアプリケーションを使う"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>アプリケーション</b>"
+msgid "Custom"
+msgstr "カスタム"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>音声</b>"
+msgid "All chat states"
+msgstr "すべてのチャット状態"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>在席状況の自動変更</b>"
+msgid "Composing only"
+msgstr "入力中のみ"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>チャットの外観</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "無効"
 
+# (Mako)systrayに表示
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>チャット行の色</b> "
+msgid "Never"
+msgstr "しない"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "チャット状態の通知"
+msgid "Only when pending events"
+msgstr "保留イベントがあるときだけ"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>接続</b>"
+msgid "Always"
+msgstr "常に"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "ポップアップする"
 
-#. 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>"
+msgid "Notify me about it"
+msgstr "それについて通知する"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>フォント</b>"
+msgid "Show only in roster"
+msgstr "名簿にのみ表示する"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail オプション</b>"
+msgid "Detached roster with detached chats"
+msgstr "名簿は別ウィンドウ、チャットは個々のウィンドウ"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "名簿は別ウィンドウ、チャットはひとつにまとめたウィンドウ"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>用意された状況メッセージ</b>"
+msgid "Single window for everything"
+msgstr "すべてをひとつのウィンドウ"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>プライバシー</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "名簿は別ウィンドウ、チャットはアカウントでまとめたウィンドウ"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>名簿の外観</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "名簿は別ウィンドウ、チャットは種類でまとめたウィンドウ"
 
+# 起動時に名簿を表示するか
 #: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>耳への通知</b>"
+msgid "Last state"
+msgstr "以前の状態"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>在席状況のメッセージ</b>"
+msgid "Preferences"
+msgstr "設定"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>テーマ</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "名簿に相手先のアバターを表示する"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>ビデオ</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"チェックをつけると、Gajim は名簿ウィンドウとグループチャットに相手先のアバ"
+"ターを表示します"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>目への通知</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "名簿に相手先の状況メッセージを表示する"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(例: stunserver.org)</i>"
+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:23
-msgid "Advanced"
-msgstr "拡張"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "名簿に相手先の位置を表示する (_l)"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "All chat states"
-msgstr "すべてのチャット状態"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "Allow client / _OS information to be sent"
-msgstr "クライアントや OS 情報の送信を許可する (_O)"
+msgid "Sort contacts by status"
+msgstr "相手先を在席状況順に並べる"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow local system time information to be sent"
-msgstr "ローカルのシステムの時刻情報の送信を許可する (_O)"
+msgid "in _roster"
+msgstr "名簿で (_r)"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "操作しない時間の送信を許可する (_i)"
+msgid "in _group chats"
+msgstr "グループチャットで (_g)"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "離席/不在/取り込み中/隠れ中のポップアップ/通知を許可する (_a)"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>名簿の外観</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "取り込み中でもサウンドを鳴らす (_b)"
+msgid "_Window behavior:"
+msgstr "ウィンドウの配置 (_W):"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "常に"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"「無効」でなければ、Gajim は ':)' のようなスマイリーを対応する画像に置き換え"
+"ます"
 
-# (Mako)語順が難しい
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "状況メッセージを求めるのは、私が "
+msgid "_Emoticons:"
+msgstr "感情アイコン (_E):"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:106
-msgid "Audio / Video"
-msgstr "音声/ビデオ"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "メッセージウィンドウを簡潔にする (_k)"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "音声入力デバイス"
+msgid "Hide all buttons in chat windows"
+msgstr "チャットウィンドウのすべてのボタンを隠します"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "音声出力デバイス"
+msgid "_Ignore rich content in incoming messages"
+msgstr "受信したメッセージの書式を無視する (_I)"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "チャットメッセージ:"
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを調べる (_d)"
+msgid "_Highlight misspelled words"
+msgstr "スペル間違いを強調表示する (_H)"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
-msgstr "入力中のみ"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "色とフォントの調整"
+msgid "_Show roster on startup:"
+msgstr "自動時に名簿を表示する (_S):"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "相手先のメッセージ:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "グループチャットのメッセージがあった際にサウンドを鳴らします。"
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "相手先のニックネーム:"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "カスタム"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>チャットの外観</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr "名簿は別ウィンドウ、チャットはアカウントでまとめたウィンドウ"
+msgid "When new event is received:"
+msgstr "新しいイベントを受信したとき:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr "名簿は別ウィンドウ、チャットは種類でまとめたウィンドウ"
+msgid "Notify me about contacts that sign _in"
+msgstr "相手先のサインインを通知する (_i)"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr "名簿は別ウィンドウ、チャットは個々のウィンドウ"
+msgid "Notify me about contacts that sign _out"
+msgstr "相手先のサインアウトを通知する (_o)"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr "名簿は別ウィンドウ、チャットはひとつにまとめたウィンドウ"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"画面の右下のポップアップウィンドウで、相手先がサインアウトしたときに通知しま"
+"す"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:171
-#: ../src/config.py:683
-msgid "Disabled"
-msgstr "無効"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "離席/不在/取り込み中/隠れ中のポップアップ/通知を許可する (_a)"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "名簿に相手先の動向を表示する (_a)"
+msgid "Notify on new _GMail email"
+msgstr "新しい GMail メールを通知する (_G)"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "メールの詳細を表示する (_e)"
+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:49
-msgid "Display _location of contacts in roster"
-msgstr "名簿に相手先の位置を表示する (_l)"
+msgid "Display _extra email details"
+msgstr "メールの詳細を表示する (_e)"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "名簿に相手先の聴いている楽曲を表示する (_t)"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr "チェックをつけると、Gajim は電子メールの送信者の情報を含めます"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "名簿に相手先のアバターを表示する"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail オプション</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "名簿に相手先の気分を表示する (_o)"
+msgid "Show notification area icon:"
+msgstr "通知エリアのアイコンの表示:"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "名簿に相手先の状況メッセージを表示する"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>目への通知</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "サウンドを鳴らす (_s)"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "設定 (_n)..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "取り込み中でもサウンドを鳴らす (_b)"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>耳への通知</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+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 "
@@ -1884,7 +1962,11 @@ msgstr ""
 "Gajim は、相手先との会話に関連するメタ情報の送受信ができます。ここでは、"
 "チャットウィンドウへのチャット状態の表示について指定します。"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "チャット状態通知を表示する (_D):"
+
+#: ../data/gui/preferences_window.ui.h:61
 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,693 +1975,619 @@ 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 ""
-"画面の右下のポップアップウィンドウで、相手先がサインアウトしたときに通知しま"
-"す"
-
-#: ../data/gui/preferences_window.ui.h:58
-msgid "Global proxy:"
-msgstr "デフォルトのプロキシ:"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid "Hide all buttons in chat windows"
-msgstr "チャットウィンドウのすべてのボタンを隠します"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr "チェックをつけると、Gajim は使用中の OS を知られることを許可します"
-
-#: ../data/gui/preferences_window.ui.h:61
-msgid "If checked, Gajim will allow others to detect the time on your system"
-msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
-
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr "チェックをつけると、Gajim は電子メールの送信者の情報を含めます"
+msgid "_Send chat state notifications:"
+msgstr "チャット状態通知を送信する (_S):"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
-"チェックをつけると、Gajim はコンピュータが使われていないとき、在席状況を「離"
-"席中」に変更します"
+msgid "<b>Chat state notifications</b>"
+msgstr "チャット状態の通知"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"チェックをつけると、Gajim はコンピュータが長い間使われていないとき、在席状況"
-"を「不在」に変更します"
+msgid "Personal Events"
+msgstr "個人イベント"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"チェックをつけると、Gajim は名簿ウィンドウとグループチャットに相手先のアバ"
-"ターを表示します"
+msgid "_Away after:"
+msgstr "「離席中」にする (_A):"
 
 #: ../data/gui/preferences_window.ui.h:66
 msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"チェックをつけると、Gajim は名簿ウィンドウとグループチャットの相手先名の下に"
-"状況メッセージを表示します"
+"チェックをつけると、Gajim はコンピュータが使われていないとき、在席状況を「離"
+"席中」に変更します"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の動向を表示します"
+msgid "_Not available after:"
+msgstr "「不在」にする (_N):"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"チェックをつけると、Gajim は名簿ウィンドウに相手先の位置情報を表示します"
+"チェックをつけると、Gajim はコンピュータが長い間使われていないとき、在席状況"
+"を「不在」に変更します"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
+msgid "minutes"
+msgstr "分後"
 
 #: ../data/gui/preferences_window.ui.h:70
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr ""
-"チェックをつけると、Gajim は名簿ウィンドウに相手先の聴いている楽曲を表示しま"
-"す"
-
-#: ../data/gui/preferences_window.ui.h:71
-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:72
-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"
+"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 は承認していない相手先からのイベントを無視します。"
-"名簿にない相手先からのすべてのメッセージを遮断しますので、注意してください。"
+"自動「離席」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しませ"
+"ん。\n"
+"$S は前の状況メッセージに置き換えられます\n"
+"$T は自動離席の設定時間に置き換えられます"
 
 #: ../data/gui/preferences_window.ui.h:73
 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 は暗号化されたメッセージを記録に残します。終端間暗"
-"号化 (E2EE) の場合は相手先が記録に同意していなければなりません。そうでなけれ"
-"ば記録しないでください。"
-
-#: ../data/gui/preferences_window.ui.h:74
-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:75
-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...)"
+"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 はプロトコル特有の在席状況アイコンを使用します "
-"(例: MSN からの相手先にはオンライン、離席、取り込み中...などの対応する MSN の"
-"アイコンがあります)"
+"自動「不在」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しませ"
+"ん\n"
+"$S は前の状況メッセージに置き換えられます\n"
+"$T は自動不在の設定時間に置き換えられます"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"チェックをつけると、Gajim は状況メッセージを要求しません。かわりに対応するデ"
-"フォルトのメッセージが使われます。"
+msgid "<b>Auto Status</b>"
+msgstr "<b>在席状況の自動変更</b>"
 
+# (Mako)語順が難しい
 #: ../data/gui/preferences_window.ui.h:77
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr ""
-"「無効」でなければ、Gajim は ':)' のようなスマイリーを対応する画像に置き換え"
-"ます"
+msgid "Ask status message when I:"
+msgstr "状況メッセージを求めるのは、私が "
 
-# 起動時に名簿を表示するか
+# (Mako)"Ask status message when I:" に続く語
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Last state"
-msgstr "以前の状態"
+msgid "Sign _in"
+msgstr "サインインしたとき (_i)"
 
+# (Mako)"Ask status message when I:" に続く語
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Log _encrypted chat session"
-msgstr "暗号化チャットを記録する (_e)"
+msgid "Sign _out"
+msgstr "サインアウトしたとき (_o)"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Ma_ke message windows compact"
-msgstr "メッセージウィンドウを簡潔にする (_k)"
+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:81
-msgid "Ma_nage..."
-msgstr "設定 (_n)..."
+msgid "<b>Status Messages</b>"
+msgstr "<b>在席状況のメッセージ</b>"
 
-# (Mako)systrayに表示
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Never"
-msgstr "しない"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>用意された状況メッセージ</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notifications"
-msgstr "通知"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "在席状況"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify me about contacts that sign _in"
-msgstr "相手先のサインインを通知する (_i)"
+msgid "Use system _default"
+msgstr "システムのデフォルトを使う (_d)"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Notify me about contacts that sign _out"
-msgstr "相手先のサインアウトを通知する (_o)"
+msgid "Chat message:"
+msgstr "チャットメッセージ:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Notify me about it"
-msgstr "それについて通知する"
+msgid "<b>Font</b>"
+msgstr "<b>フォント</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Notify on new _GMail email"
-msgstr "新しい GMail メールを通知する (_G)"
+msgid "Use _transports icons"
+msgstr "中継先のアイコンを使う (_t)"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Only when pending events"
-msgstr "保留イベントがあるときだけ"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. 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:89
-msgid "Personal Events"
-msgstr "個人イベント"
+msgid "Status _iconset:"
+msgstr "状況アイコン (_i):"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid "Play _sounds"
-msgstr "サウンドを鳴らす (_s)"
+msgid "Configure color and font of the interface"
+msgstr "色とフォントの調整"
 
 #: ../data/gui/preferences_window.ui.h:91
-msgid "Pop it up"
-msgstr "ポップアップする"
+msgid "T_heme:"
+msgstr "テーマ (_h):"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "Preferences"
-msgstr "設定"
+msgid "<b>Themes</b>"
+msgstr "<b>テーマ</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
-"STUN サーバー。空なら、Gajim はサーバーから探索\n"
-"しようとします。"
+msgid "Contact's nickname:"
+msgstr "相手先のニックネーム:"
+
+#: ../data/gui/preferences_window.ui.h:94
+msgid "Your nickname:"
+msgstr "あなたのニックネーム:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "STUN server:"
-msgstr "STUN サーバー:"
+msgid "_Status message:"
+msgstr "状況メッセージ (_S):"
 
+# (Mako)あえてカッコ書き
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Show notification area icon:"
-msgstr "通知エリアのアイコンの表示:"
+msgid "_URL highlight:"
+msgstr "URL 強調表示 (_U):"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Show only in roster"
-msgstr "名簿にのみ表示する"
+msgid "_Reset to Default Colors"
+msgstr "デフォルトの色に戻す (_R)"
 
-# (Mako)"Ask status message when I:" に続く語
 #: ../data/gui/preferences_window.ui.h:98
-msgid "Sign _in"
-msgstr "サインインしたとき (_i)"
+msgid "Contact's message:"
+msgstr "相手先のメッセージ:"
 
-# (Mako)"Ask status message when I:" に続く語
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sign _out"
-msgstr "サインアウトしたとき (_o)"
+msgid "Your message:"
+msgstr "あなたのメッセージ:"
 
 #: ../data/gui/preferences_window.ui.h:100
-msgid "Single window for everything"
-msgstr "すべてをひとつのウィンドウ"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "グループチャットのメッセージの強調"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"メッセージが装飾(書式や色など)を含んでいる場合があります。チェックをつける"
-"と、Gajim はそのままのメッセージ文を表示します。"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>チャット行の色</b> "
 
 #: ../data/gui/preferences_window.ui.h:102
-msgid "Sort contacts by status"
-msgstr "相手先を在席状況順に並べる"
+msgid "Style"
+msgstr "スタイル"
 
-#: ../data/gui/preferences_window.ui.h:103 ../src/config.py:401
-msgid "Status"
-msgstr "在席状況"
+#: ../data/gui/preferences_window.ui.h:103
+msgid "Audio input device"
+msgstr "音声入力デバイス"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid "Status _iconset:"
-msgstr "状況アイコン (_i):"
+msgid "Audio output device"
+msgstr "音声出力デバイス"
 
 #: ../data/gui/preferences_window.ui.h:105
-msgid "Style"
-msgstr "スタイル"
+msgid "<b>Audio</b>"
+msgstr "<b>音声</b>"
 
 #: ../data/gui/preferences_window.ui.h:106
-msgid "T_heme:"
-msgstr "テーマ (_h):"
+msgid "Video input device"
+msgstr "ビデオ入力デバイス"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"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"
-"$S は前の状況メッセージに置き換えられます\n"
-"$T は自動離席の設定時間に置き換えられます"
+msgid "Video output device"
+msgstr "ビデオ出力デバイス"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "ビデオのフレームレート"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "ビデオの大きさ"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid ""
-"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"
+msgid "View own video source"
 msgstr ""
-"自動「不在」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しませ"
-"ん\n"
-"$S は前の状況メッセージに置き換えられます\n"
-"$T は自動不在の設定時間に置き換えられます"
+
+#: ../data/gui/preferences_window.ui.h:111
+msgid "<b>Video</b>"
+msgstr "<b>ビデオ</b>"
+
+#: ../data/gui/preferences_window.ui.h:112
+msgid "STUN server:"
+msgstr "STUN サーバー:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Use _transports icons"
-msgstr "中継先のアイコンを使う (_t)"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(例: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Use default applications"
-msgstr "デフォルトのアプリケーションを使う"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Use system _default"
-msgstr "システムのデフォルトを使う (_d)"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+"STUN サーバー。空なら、Gajim はサーバーから探索\n"
+"しようとします。"
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video framerate"
-msgstr "ビデオのフレームレート"
+msgid "<b>Connection</b>"
+msgstr "<b>接続</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "Video input device"
-msgstr "ビデオ入力デバイス"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "音声/ビデオ"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Video output device"
-msgstr "ビデオ出力デバイス"
+msgid "_File manager:"
+msgstr "ファイルマネージャ (_F):"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Video size"
-msgstr "ビデオの大きさ"
+msgid "_Mail client:"
+msgstr "メールクライアント (_M):"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "When new event is received:"
-msgstr "新しいイベントを受信したとき:"
-
-#: ../data/gui/preferences_window.ui.h:121
-msgid "Your message:"
-msgstr "あなたのメッセージ:"
+msgid "_Browser:"
+msgstr "ブラウザ (_B):"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "Your nickname:"
-msgstr "あなたのニックネーム:"
+msgid "<b>Custom</b>"
+msgstr "<b>カスタム</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Away after:"
-msgstr "「離席中」にする (_A):"
+msgid "<b>Applications</b>"
+msgstr "<b>アプリケーション</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_Browser:"
-msgstr "ブラウザ (_B):"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "名簿にない相手先からのイベントを無視する (_I)"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Display chat state notifications:"
-msgstr "チャット状態通知を表示する (_D):"
+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:126
-msgid "_Emoticons:"
-msgstr "感情アイコン (_E):"
+msgid "Allow client / _OS information to be sent"
+msgstr "クライアントや OS 情報の送信を許可する (_O)"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_File manager:"
-msgstr "ファイルマネージャ (_F):"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "チェックをつけると、Gajim は使用中の OS を知られることを許可します"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Highlight misspelled words"
-msgstr "スペル間違いを強調表示する (_H)"
+msgid "Allow local system time information to be sent"
+msgstr "ローカルのシステムの時刻情報の送信を許可する (_O)"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Ignore events from contacts not in the roster"
-msgstr "名簿にない相手先からのイベントを無視する (_I)"
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Ignore rich content in incoming messages"
-msgstr "受信したメッセージの書式を無視する (_I)"
+msgid "Log _encrypted chat session"
+msgstr "暗号化チャットを記録する (_e)"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Log status changes of contacts"
-msgstr "相手先の状況変更を記録する (_L)"
+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 は暗号化されたメッセージを記録に残します。終端間暗"
+"号化 (E2EE) の場合は相手先が記録に同意していなければなりません。そうでなけれ"
+"ば記録しないでください。"
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Mail client:"
-msgstr "メールクライアント (_M):"
+msgid "Allow my _idle time to be sent"
+msgstr "操作しない時間の送信を許可する (_i)"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Not available after:"
-msgstr "「不在」にする (_N):"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr "デフォルトのプロキシ:"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Open..."
-msgstr "開く (_O)..."
+msgid "<b>Privacy</b>"
+msgstr "<b>プライバシー</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Reset to Default Colors"
-msgstr "デフォルトの色に戻す (_R)"
+msgid "_Log status changes of contacts"
+msgstr "相手先の状況変更を記録する (_L)"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "_Send chat state notifications:"
-msgstr "チャット状態通知を送信する (_S):"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "_Show roster on startup:"
-msgstr "自動時に名簿を表示する (_S):"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを調べる (_d)"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "_Status message:"
-msgstr "状況メッセージ (_S):"
+msgid "_Open..."
+msgstr "開く (_O)..."
 
-# (Mako)あえてカッコ書き
 #: ../data/gui/preferences_window.ui.h:140
-msgid "_URL highlight:"
-msgstr "URL 強調表示 (_U):"
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>詳細設定エディタ</b>"
 
 #: ../data/gui/preferences_window.ui.h:141
-msgid "_Window behavior:"
-msgstr "ウィンドウの配置 (_W):"
-
-#: ../data/gui/preferences_window.ui.h:142
-msgid "in _group chats"
-msgstr "グループチャットで (_g)"
-
-#: ../data/gui/preferences_window.ui.h:143
-msgid "in _roster"
-msgstr "名簿で (_r)"
-
-#: ../data/gui/preferences_window.ui.h:144
-msgid "minutes"
-msgstr "分後"
+msgid "Advanced"
+msgstr "拡張"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "プライバシーリスト:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>規則の追加/編集</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "プライバシーリスト"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>規則の一覧</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>プライバシーリスト</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "このセッションで有効"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "起動ごとに有効"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>規則の一覧</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "すべて"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>規則の追加/編集</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "すべて (在席通知を含む)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "許可する"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "拒否する"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "グループが"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "順位:"
+msgid "all by subscription"
+msgstr "在席通知の状態が"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3979
-msgid "Privacy List"
-msgstr "プライバシーリスト"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "すべて"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "在席通知の状態が"
+msgid "to send me messages"
+msgstr "メッセージを私に送信すること"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "グループが"
+msgid "to send me queries"
+msgstr "クエリーを私に送信すること"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "相互に承認"
+msgid "to view my status"
+msgstr "私の状況を見ること"
 
-# (Mako)相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "こちらが承認"
+msgid "to send me status"
+msgstr "状況を私に送信すること"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "なし"
+msgid "All (including subscription)"
+msgstr "すべて (在席通知を含む)"
 
-# (Mako)相手先の情報で、subscriptionの有無なので、「相手先が承認」としたい
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "相手先が承認"
+msgid "Order:"
+msgstr "順位:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "メッセージを私に送信すること"
+msgid "none"
+msgstr "なし"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "クエリーを私に送信すること"
+msgid "both"
+msgstr "相互に承認"
 
+# (Mako)相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "状況を私に送信すること"
+msgid "from"
+msgstr "こちらが承認"
 
+# (Mako)相手先の情報で、subscriptionの有無なので、「相手先が承認」としたい
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "私の状況を見ること"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>住所</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>アバター:</b>"
+msgid "to"
+msgstr "相手先が承認"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>誕生日:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>市(町村):</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>姓:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>会社:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Country:</b>"
-msgstr "<b>国:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Middle:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>Department:</b>"
-msgstr "<b>部署:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>E-Mail:</b>"
-msgstr "<b>メールアドレス:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefix:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:13
-msgid "<b>Extra Address:</b>"
-msgstr "<b>建物名など:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>名:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:15
-msgid "<b>Family:</b>"
-msgstr "<b>姓:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suffix:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>名前(フルネーム)</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>町丁名・番地:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Given:</b>"
-msgstr "<b>名:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>市(町村):</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:19
-msgid "<b>Homepage:</b>"
-msgstr "<b>ホームページ:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>州(県):</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>建物名など:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Middle:</b>"
-msgstr "<b>Middle:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>郵便番号:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Name:</b>"
-msgstr "<b>名前:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>国:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Nickname:</b>"
-msgstr "<b>ニックネーム:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>住所</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Phone No.:</b>"
-msgstr "<b>電話番号:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>ホームページ:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Position:</b>"
-msgstr "<b>役職:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>名前:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:27
-msgid "<b>Postal Code:</b>"
-msgstr "<b>郵便番号:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>ニックネーム:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>電話番号:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:29
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "書式: YYYY-MM-DD"
 
-# (Mako)vcard では「職種」が適切
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>Role:</b>"
-msgstr "<b>職種:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>誕生日:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:32
-msgid "<b>State:</b>"
-msgstr "<b>州(県):</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>メールアドレス:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:34
-msgid "<b>Street:</b>"
-msgstr "<b>町丁名・番地:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>アバター:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "アバターの設定"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:38
-msgid "<b>Suffix:</b>"
-msgstr "<b>Suffix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "個人情報"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/profile_window.ui.h:30
 #: ../data/gui/vcard_information_window.ui.h:42
-msgid "About"
-msgstr "概略"
+msgid "<b>Company:</b>"
+msgstr "<b>会社:</b>"
+
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>役職:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "アバターの設定"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>部署:</b>"
 
+# (Mako)vcard では「職種」が適切
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "Format: YYYY-MM-DD"
-msgstr "書式: YYYY-MM-DD"
+#: ../data/gui/vcard_information_window.ui.h:45
+msgid "<b>Role:</b>"
+msgstr "<b>職種:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "Personal Info"
-msgstr "個人情報"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "職業"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>あなたがやりたいことは ?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "概略"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "アカウントを Gajim からのみ削除 (_o)"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "アカウントを Gajim とサーバーからも削除 (_s)"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>あなたがやりたいことは ?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5725
-#: ../src/roster_window.py:5850 ../src/roster_window.py:5980
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "削除 (_R)"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "名簿の項目の交換"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2587,112 +2595,113 @@ 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 "メッセージ本文 <現在使われていないため、デフォルトで表示されません>"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "名簿の項目の交換"
-
 # (Mako)ほかの項目との並びで、バランスを考えてあえてカッコでつけ加えている
-#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "OK (_O)"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "相手先リストに追加する (_C)..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "機能 (_t)"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "ファイルの転送 (_T)"
-
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "よくある質問(オンライン)"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "操作 (_A)"
 
 #: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "ヘルプ(オンライン)"
+msgid "Add _Contact..."
+msgstr "相手先リストに追加する (_C)..."
 
-#: ../data/gui/roster_window.ui.h:8
-msgid "P_lugins"
-msgstr "プラグイン (_l)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "編集 (_E)"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "プロフィールとアバター"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "アカウント (_A)"
 
 #: ../data/gui/roster_window.ui.h:11
-msgid "Show Only _Active Contacts"
-msgstr "アクティブな相手先のみ表示 (_A)"
+msgid "Profile, A_vatar"
+msgstr "プロフィールとアバター"
 
 #: ../data/gui/roster_window.ui.h:12
-msgid "Show T_rans_ports"
-msgstr "中継先を表示 (_r)"
+msgid "P_lugins"
+msgstr "プラグイン (_l)"
 
 #: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "表示 (_V)"
+
+#: ../data/gui/roster_window.ui.h:14
 msgid "Show _Offline Contacts"
 msgstr "オフラインの相手先を表示 (_O)"
 
-#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
-msgid "Show _Roster"
-msgstr "名簿を表示 (_R)"
-
 #: ../data/gui/roster_window.ui.h:15
-msgid "_Accounts"
-msgstr "アカウント (_A)"
+msgid "Show Only _Active Contacts"
+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:16
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "操作 (_A)"
+#, fuzzy
+msgid "Show T_ransports"
+msgstr "中継先を表示 (_r)"
+
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
+msgid "Show _Roster"
+msgstr "名簿を表示 (_R)"
 
 #: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "ファイルの転送 (_T)"
+
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "ヘルプ (_H)"
+
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "目次 (_C)"
 
-#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "編集 (_E)"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "ヘルプ(オンライン)"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:22
-msgid "_Help"
-msgstr "ヘルプ (_H)"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "よくある質問(オンライン)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "表示 (_V)"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "しばらくお待ちください…"
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "機能 (_t)"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "検索"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "しばらくお待ちください…"
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "相手先リストに追加 (_A)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5992
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "情報 (_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "検索 (_S)"
 
@@ -2712,41 +2721,37 @@ msgstr "登録 "
 msgid "_Cancel"
 msgstr "中止 (_C)"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "このメッセージへの返信"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "宛先:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "送信 (_d)"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "メッセージを送信する"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "メッセージを送信してウィンドウを閉じる"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "返信 (_R)"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "宛先:"
+msgid "Reply to this message"
+msgstr "このメッセージへの返信"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "返信 (_R)"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "送信 & 閉じる (_S)"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "メッセージを送信してウィンドウを閉じる"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "承認する (_t)"
+msgid "Subscription Request"
+msgstr "在席通知の申し込み"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "承認すると、あなたが接続したときに相手先はそのことを知ることができます"
+msgid "_Deny"
+msgstr "拒否する (_D)"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2755,262 +2760,272 @@ msgid ""
 msgstr ""
 "承認しないと、あなたが接続したときに相手先はそのことを知ることができません"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "在席通知の申し込み"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "承認する (_t)"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "拒否する (_D)"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "承認すると、あなたが接続したときに相手先はそのことを知ることができます"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "相手先を合わせる"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "合わせたいアカウントを選択してください"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "合わせたい相手先を選択してください"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "同調: 相手先の選択"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "サウンドのミュート"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "単発メッセージの送信 (_M)"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "すべての保留イベントの表示 (_E)"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "合わせたい相手先を選択してください"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "状態 (_t)"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "グループチャット (_G)"
 
-# (Mako)pending の意味か
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>保留中の申し込み:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "単発メッセージの送信 (_M)"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>クライアント:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "すべての保留イベントの表示 (_E)"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Configured avatar:</b>"
-msgstr "<b>設定したアバター:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "サウンドのミュート"
 
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Contact time:</b>"
-msgstr "<b>通話時間:</b>"
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "相手先の情報"
 
-#: ../data/gui/vcard_information_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>リソース:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>在席状況:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:36
-msgid "<b>Subscription:</b>"
-msgstr "<b>在席通知:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>クライアント:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:39
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>システム:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>通話時間:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>User avatar:</b>"
 msgstr "<b>ユーザーのアバター:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-msgid "Comments"
-msgstr "備考"
+#: ../data/gui/vcard_information_window.ui.h:9
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>設定したアバター:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "相手先"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>在席通知:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:45
-msgid "Contact Information"
-msgstr "相手先の情報"
+# (Mako)pending の意味か
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>保留中の申し込み:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "その他の情報"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>フィルタ</b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "相手先"
+
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "備考"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber トラヒック</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML 入力</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "IN スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "IQ スタンザを表示しない"
+msgid "Hide OUT stanzas"
+msgstr "OUT スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "Message スタンザを表示しない"
+msgid "Hide Presence stanzas"
+msgstr "Presence スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "OUT スタンザを表示しない"
+msgid "Hide IQ stanzas"
+msgstr "IQ スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "Presence スタンザを表示しない"
+msgid "Hide Message stanzas"
+msgstr "Message スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "情報/クエリー (Info/Query)"
+msgid "<b>Filter</b>"
+msgstr "<b>フィルタ</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "情報/クエリー (Info/Query)"
+
+# (Mako)あえて訳さない
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presence"
+
 # (Mako)あえて訳さない
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Message"
 
-# (Mako)あえて訳さない
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presence"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML 入力</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "アカウントを編集 (_M)"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "ローカル jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "個人"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "リソース:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "在席状況:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber クライアント"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "個人"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim インスタントメッセンジャ"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM クライアント"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber クライアント"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "中止の確認"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "コマンドの実行中です。本当に中止してもいいですか ?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 msgid "Invalid Form"
 msgstr "フォームが正しくありません"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 msgid "The form is not filled correctly."
 msgstr "フォームが正しく入力されていません。"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "サービスは不正なデータを送信しました"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "サービスはセッション ID を変更しました。"
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc コマンド - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "サービスはエラーを返しました。"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "真"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "偽"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "真偽型"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "整数型"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "文字列型"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1062
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "色"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "設定名"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "値"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "種類"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(なし)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "(非表示)"
 
@@ -3021,261 +3036,187 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "新しいエントリーを受け取りました (%d 件が表示されません):"
 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)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:85
-msgid "English"
-msgstr "英語"
-
-#: ../src/chat_control.py:85
-msgid "Belarusian"
-msgstr "ベラルーシ語"
-
-#: ../src/chat_control.py:85
-msgid "Bulgarian"
-msgstr "ブルガリア語"
-
-#: ../src/chat_control.py:85
-msgid "Breton"
-msgstr "ブルトン語"
-
-#: ../src/chat_control.py:85
-msgid "Czech"
-msgstr "チェコ語"
-
-#: ../src/chat_control.py:85
-msgid "German"
-msgstr "ドイツ語"
-
-#: ../src/chat_control.py:85
-msgid "Greek"
-msgstr "ギリシア語"
-
-#: ../src/chat_control.py:85
-msgid "British"
-msgstr "英語 (イギリス)"
-
-#: ../src/chat_control.py:85
-msgid "Esperanto"
-msgstr "エスペラント"
-
-#: ../src/chat_control.py:85
-msgid "Spanish"
-msgstr "スペイン語"
-
-#: ../src/chat_control.py:85
-msgid "Basque"
-msgstr "バスク語"
-
-#: ../src/chat_control.py:85
-msgid "French"
-msgstr "フランス語"
-
-#: ../src/chat_control.py:85
-msgid "Croatian"
-msgstr "クロアチア語"
-
-#: ../src/chat_control.py:85
-msgid "Italian"
-msgstr "イタリア語"
-
-#: ../src/chat_control.py:85
-msgid "Norwegian (b)"
-msgstr "ノルウェー語 (b)"
-
-#: ../src/chat_control.py:85
-msgid "Dutch"
-msgstr "オランダ語"
-
-#: ../src/chat_control.py:85
-msgid "Norwegian"
-msgstr "ノルウェー語"
-
-#: ../src/chat_control.py:85
-msgid "Polish"
-msgstr "ポーランド語"
-
-#: ../src/chat_control.py:85
-msgid "Portuguese"
-msgstr "ポルトガル語"
-
-#: ../src/chat_control.py:85
-msgid "Brazilian Portuguese"
-msgstr "ポルトガル語 (ブラジル)"
-
-#: ../src/chat_control.py:85
-msgid "Russian"
-msgstr "ロシア語"
-
-#: ../src/chat_control.py:85
-msgid "Serbian"
-msgstr "セルビア語"
-
-#: ../src/chat_control.py:85
-msgid "Slovak"
-msgstr "スロバキア語"
-
-#: ../src/chat_control.py:85
-msgid "Swedish"
-msgstr "スウェーデン語"
-
-#: ../src/chat_control.py:85
-msgid "Chinese (Ch)"
-msgstr "中国語 (Ch)"
-
-#: ../src/chat_control.py:228
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/chat_control.py:233
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s)"
 
-#: ../src/chat_control.py:238
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "エラー"
 
-#: ../src/chat_control.py:574
-msgid "Spelling language"
-msgstr "スペルチェックの言語"
-
 #. we are not connected
-#: ../src/chat_control.py:606 ../src/chat_control.py:822
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "接続は有効ではありません"
 
-#: ../src/chat_control.py:607 ../src/chat_control.py:823
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "接続するまでメッセージは送信されません。"
 
-#: ../src/chat_control.py:1044
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "下線"
 
-#: ../src/chat_control.py:1045
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "抹消線"
 
-#: ../src/chat_control.py:1068
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "フォント"
 
-#: ../src/chat_control.py:1077
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "書式のクリア"
 
-#: ../src/chat_control.py:1154
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "ファイルを送信しますか ?"
 
-#: ../src/chat_control.py:1155
+#: ../src/chat_control.py:1158
 #, 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:1638 ../src/chat_control.py:2172
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG 暗号化は有効"
 
-#: ../src/chat_control.py:1659 ../src/chat_control.py:1662
-msgid "Requires python-farsight."
-msgstr "python-farsight が必要です。"
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "この相手先はファイル転送をサポートしていません。"
 
 #. Add to roster
-#: ../src/chat_control.py:1702 ../src/common/contacts.py:149
-#: ../src/common/contacts.py:270 ../src/common/helpers.py:67
-#: ../src/common/helpers.py:261 ../src/dialogs.py:1099 ../src/dialogs.py:2228
-#: ../src/dialogs.py:2257 ../src/gui_interface.py:472
-#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:405
-#: ../src/roster_window.py:767 ../src/roster_window.py:1687
-#: ../src/roster_window.py:1689 ../src/roster_window.py:2022
-#: ../src/roster_window.py:3557 ../src/roster_window.py:3584
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "名簿にありません"
 
-#: ../src/chat_control.py:1734
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "音声セッションにする/しない"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "ビデオセッションにする/しない"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Windows ではこの機能は無効です。"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "ファイルを送信 (_F)"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "この相手先はファイル転送をサポートしていません。"
 
-#: ../src/chat_control.py:1737
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "ファイル転送を行なうには、本当の JID を知っている必要があります。"
 
-#: ../src/chat_control.py:1851
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s の状態: %(state)s  理由: %(reason)s"
 
-#: ../src/chat_control.py:2042
+#: ../src/chat_control.py:2098
 #, 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:2152 ../src/dialogs.py:5040
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "GPG 鍵が割り当てられていません"
 
-#: ../src/chat_control.py:2153
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "この相手先に GPG 鍵が割り当てられていないため、メッセージを GPG で暗号化する"
 "ことができません。"
 
-#: ../src/chat_control.py:2162
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG 暗号化は無効"
 
-#: ../src/chat_control.py:2188
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "セッションは記録されます"
 
-#: ../src/chat_control.py:2190
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "セッションは記録されません"
 
 # (Mako)暗号化は有効 %s、
 #. encryption %s active
-#: ../src/chat_control.py:2207
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "で"
 
-#: ../src/chat_control.py:2207
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "でなく"
 
 # #. チャットは記録 %s。
 #. chat session %s be logged
-#: ../src/chat_control.py:2209
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "記録されます"
 
-#: ../src/chat_control.py:2209
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "記録されません"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2213
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "認証されています"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2294
 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:2224
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3284,31 +3225,31 @@ msgstr ""
 "%(type)s の暗号化は有効%(status)s、%(authenticated)s。\n"
 "チャットは%(logged)s。"
 
-#: ../src/chat_control.py:2351
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "セッションの確率を中止しました"
 
-#: ../src/chat_control.py:2361
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "セッションはサーバーに記録されます"
 
-#: ../src/chat_control.py:2363
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "セッションはサーバーに記録されません"
 
-#: ../src/chat_control.py:2372
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "このセッションは暗号化されています"
 
-#: ../src/chat_control.py:2375
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " かつ、記録されます"
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " かつ、記録されません"
 
-#: ../src/chat_control.py:2382
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3316,39 +3257,39 @@ msgstr ""
 "遠くの相手先の同一性は検証されませんでした。詳しくは盾ボタンをクリックしてく"
 "ださい。"
 
-#: ../src/chat_control.py:2384
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "終端間暗号化 (E2EE) は無効"
 
-#: ../src/chat_control.py:2432 ../src/chat_control.py:2445
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "次のメッセージは暗号化されませんでした"
 
-#: ../src/chat_control.py:2438
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "次のメッセージは暗号化されました"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2707
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" さんから新しいメッセージを受信しました"
 
-#: ../src/chat_control.py:2708
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "このタブを閉じると、記録を残さない設定の場合、このメッセージは失われます。"
 
-#: ../src/chat_control.py:2875 ../src/common/connection_handlers_events.py:887
-#: ../src/common/connection_handlers.py:942
-#: ../src/common/connection_handlers.py:1054 ../src/common/connection.py:456
-#: ../src/common/logger.py:1144 ../src/gajim.py:210 ../src/session.py:100
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "データベースのエラー"
 
-#: ../src/chat_control.py:2876
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3357,7 +3298,7 @@ msgstr ""
 "データベースファイル (%s) を読むことができません。修復するか、または削除(すべ"
 "ての履歴は失われます)してください。"
 
-#: ../src/chat_control.py:3112 ../src/gui_interface.py:1061
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3366,48 +3307,53 @@ msgstr ""
 "%s さんからのメッセージを復号できません\n"
 "改竄の可能性があります。"
 
-#: ../src/chat_control.py:3145
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s さんは現在、%(status)s"
 
-#: ../src/chat_control.py:3204
+#: ../src/chat_control.py:3321
 msgid "File transfer"
 msgstr "ファイルの転送"
 
-#: ../src/chat_control.py:3207
+#: ../src/chat_control.py:3324
 msgid "Size"
 msgstr "サイズ"
 
-#: ../src/chat_control.py:3209
+#: ../src/chat_control.py:3326
 msgid "_Accept"
 msgstr "了承する (_A)"
 
-#: ../src/chat_control.py:3232 ../src/filetransfers_window.py:204
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
 msgid "File transfer completed"
 msgstr "ファイルの転送が完了しました"
 
-#: ../src/chat_control.py:3260 ../src/gui_interface.py:932
-#: ../src/roster_window.py:1934
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "グループチャットへの招待"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
 msgid "Remote contact stopped transfer"
 msgstr "遠くの相手先が転送を中止しました"
 
-#: ../src/chat_control.py:3262 ../src/gui_interface.py:935
-#: ../src/roster_window.py:1936
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
 msgid "Error opening file"
 msgstr "ファイルを開く際のエラー"
 
-#: ../src/chat_control.py:3264 ../src/filetransfers_window.py:240
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
 msgid "File transfer stopped"
 msgstr "ファイルの転送が中断しました"
 
-#: ../src/chat_control.py:3267 ../src/filetransfers_window.py:219
-#: ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
 msgid "File transfer cancelled"
 msgstr "ファイルの転送が中止されました"
 
-#: ../src/chat_control.py:3268 ../src/filetransfers_window.py:219
-#: ../src/filetransfers_window.py:227
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
 msgid "Connection with peer cannot be established."
 msgstr "ピア接続は確立できませんでした。"
 
@@ -3423,6 +3369,10 @@ msgstr "シェル内で表現を実行し、結果を表示します"
 msgid "Execute expression inside a shell, send output"
 msgstr "シェル内で表現を実行し、結果を送信します"
 
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
 #: ../src/command_system/implementation/standard.py:50
 msgid "Hide the chat buttons"
 msgstr "チャットボタンを隠します"
@@ -3453,13 +3403,15 @@ msgstr "%s: 見つかりません"
 msgid "Limit must be an integer"
 msgstr "制限は整数である必要があります"
 
-#: ../src/command_system/implementation/standard.py:140
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+#, fuzzy
 msgid ""
 "\n"
-"    Set current the status\n"
+"    Set the current status\n"
 "\n"
-"    Status can be given as one of the following values: online, away,\n"
-"    chat, xa, dnd.\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
 "    "
 msgstr ""
 "\n"
@@ -3469,115 +3421,123 @@ msgstr ""
 "    chat (チャット可), xa (不在), dnd (取り込み中).\n"
 "    "
 
-#: ../src/command_system/implementation/standard.py:153
+#: ../src/command_system/implementation/standard.py:148
 msgid "Set the current status to away"
 msgstr "在席状況を「離席中」に設定します"
 
-#: ../src/command_system/implementation/standard.py:156
-#: ../src/common/commands.py:109 ../src/common/helpers.py:249
-#: ../src/tooltips.py:194
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
 msgid "Away"
 msgstr "離席中"
 
-#: ../src/command_system/implementation/standard.py:161
+#: ../src/command_system/implementation/standard.py:162
 msgid "Set the current status to online"
 msgstr "在席状況を「在席」に設定します"
 
-#: ../src/command_system/implementation/standard.py:164
+#: ../src/command_system/implementation/standard.py:165
 msgid "Available"
 msgstr "在席"
 
-#: ../src/command_system/implementation/standard.py:178
-#: ../src/command_system/implementation/standard.py:255
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
 #, fuzzy
 msgid "Clear the text window"
 msgstr "ウィンドウを閉じる"
 
-#: ../src/command_system/implementation/standard.py:183
-msgid "Toggle the GPG encryption"
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
 msgstr "GPGP 暗号化 (トグル)"
 
-#: ../src/command_system/implementation/standard.py:188
+#: ../src/command_system/implementation/standard.py:195
 msgid "Send a ping to the contact"
 msgstr "相手先に ping を送信します"
 
-#: ../src/command_system/implementation/standard.py:191
+#: ../src/command_system/implementation/standard.py:198
 msgid "Command is not supported for zeroconf accounts"
 msgstr "コマンドは、zeroconf アカウントには使えません"
 
-#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:202
 msgid "Send DTMF sequence through an open audio session"
 msgstr "接続している音声セッションに DTMF 手順を送信します"
 
-#: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:205
 msgid "No open audio sessions with the contact"
 msgstr "この相手先と接続している音声セッションがありません"
 
-#: ../src/command_system/implementation/standard.py:201
+#: ../src/command_system/implementation/standard.py:208
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s は有効なトーンではありません"
 
-#: ../src/command_system/implementation/standard.py:211
+#: ../src/command_system/implementation/standard.py:218
 msgid "Audio sessions are not available"
 msgstr "音声セッションは有効ではありません"
 
-#: ../src/command_system/implementation/standard.py:221
+#: ../src/command_system/implementation/standard.py:228
 msgid "Video sessions are not available"
 msgstr "ビデオセッションは有効ではありません"
 
-#: ../src/command_system/implementation/standard.py:262
+#: ../src/command_system/implementation/standard.py:235
+#, fuzzy
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr "相手先にメッセージを送信します"
+
+#: ../src/command_system/implementation/standard.py:274
 msgid "Change your nickname in a group chat"
 msgstr "グループチャットでニックネームを変更します"
 
 #. invalid char
-#: ../src/command_system/implementation/standard.py:267 ../src/config.py:3392
-#: ../src/dialogs.py:2075
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
 msgid "Invalid nickname"
 msgstr "ニックネームは有効ではありません"
 
-#: ../src/command_system/implementation/standard.py:272
+#: ../src/command_system/implementation/standard.py:284
 msgid "Open a private chat window with a specified occupant"
 msgstr "指定した在室者との私信のウィンドウを開きます"
 
-#: ../src/command_system/implementation/standard.py:278
-#: ../src/command_system/implementation/standard.py:287
-#: ../src/command_system/implementation/standard.py:341
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
 msgid "Nickname not found"
 msgstr "ニックネームは見つかりません"
 
-#: ../src/command_system/implementation/standard.py:281
+#: ../src/command_system/implementation/standard.py:293
 msgid ""
 "Open a private chat window with a specified occupant and send him a message"
 msgstr "指定した在室者との私信のウィンドウを開き、メッセージを送信します"
 
-#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:302
 msgid "Display or change a group chat topic"
 msgstr "グループチャットの題を表示または変更します"
 
-#: ../src/command_system/implementation/standard.py:298
+#: ../src/command_system/implementation/standard.py:310
 msgid "Invite a user to a room for a reason"
 msgstr "理由を添えて、談話室に招待します"
 
-#: ../src/command_system/implementation/standard.py:301
+#: ../src/command_system/implementation/standard.py:313
 #, python-format
 msgid "Invited %s to %s"
 msgstr "%s を %s に招待しました"
 
-#: ../src/command_system/implementation/standard.py:304
+#: ../src/command_system/implementation/standard.py:316
 msgid "Join a group chat given by a jid, optionally using given nickname"
 msgstr ""
 "指定する JID のグループチャットに参加します (ニックネームが指定されていればそ"
 "れを使って)"
 
-#: ../src/command_system/implementation/standard.py:321
+#: ../src/command_system/implementation/standard.py:333
 msgid ""
 "Leave the groupchat, optionally giving a reason, and close tab or window"
 msgstr ""
 "グループチャットから退出し (理由があればそれを送信します)、タブまたはウィンド"
 "ウを閉じます"
 
-#: ../src/command_system/implementation/standard.py:326
+#: ../src/command_system/implementation/standard.py:338
 msgid ""
 "\n"
 "    Ban user by a nick or a jid from a groupchat\n"
@@ -3592,134 +3552,184 @@ msgstr ""
 "    ニックネームが見つからなければ JID として扱います。\n"
 "    "
 
-#: ../src/command_system/implementation/standard.py:338
+#: ../src/command_system/implementation/standard.py:350
 msgid "Kick user by a nick from a groupchat"
 msgstr "ニックネームで指定するユーザーをグループチャットから蹴り出します"
 
-#: ../src/command_system/implementation/standard.py:345
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+#, fuzzy
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+"\n"
+"    在席状況を設定します\n"
+"\n"
+"    在席状況は次のいずれかの値です: online (在席), away (離席中),\n"
+"    chat (チャット可), xa (不在), dnd (取り込み中).\n"
+"    "
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "サーバー名が正しくありません"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+#, fuzzy
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+"\n"
+"    在席状況を設定します\n"
+"\n"
+"    在席状況は次のいずれかの値です: online (在席), away (離席中),\n"
+"    chat (チャット可), xa (不在), dnd (取り込み中).\n"
+"    "
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "分掌を変更しました"
+
+#: ../src/command_system/implementation/standard.py:383
 msgid "Display names of all group chat occupants"
 msgstr "グループチャットのすべての在室者の名前を表示します"
 
-#: ../src/command_system/implementation/standard.py:367
+#: ../src/command_system/implementation/standard.py:405
 msgid "Forbid an occupant to send you public or private messages"
 msgstr "在室者がメッセージ (私信も含む) を送ってくることを禁止します"
 
-#: ../src/command_system/implementation/standard.py:372
+#: ../src/command_system/implementation/standard.py:410
 msgid "Allow an occupant to send you public or private messages"
 msgstr "在室者がメッセージ (私信も含む) を送ってくることを許可します"
 
-#: ../src/common/check_paths.py:38
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "引数 \"contact_jid\" がありません"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "記録データベースを作っています"
 
-#: ../src/common/check_paths.py:86
+#: ../src/common/check_paths.py:87
 msgid "creating cache database"
 msgstr "キャッシュデータベースを作ります"
 
-#: ../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:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s はファイルです。ディレクトリでなければなりません"
 
-#: ../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:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
+#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim は終了します"
 
-#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s はディレクトリです。ファイルでなければなりません"
 
-#: ../src/common/check_paths.py:352
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "ディレクトリ %s を作ります"
 
-#: ../src/common/commands.py:85
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "在席状況の変更"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "在席状況を変更する"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "在席状況の種類と説明の設定"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "チャットできます"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "オンライン"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "長時間不在です"
 
-#: ../src/common/commands.py:111
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "邪魔しないでください"
 
-#: ../src/common/commands.py:112
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "オフライン - 切断中"
 
-#: ../src/common/commands.py:117
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "在席状況の説明:"
 
-#: ../src/common/commands.py:152 ../src/common/commands.py:320
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "在席状況が変更されました。"
 
-#: ../src/common/commands.py:184 ../src/common/commands.py:210
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "グループチャットから退出"
 
-#: ../src/common/commands.py:200
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(room_jid)s の %(nickname)s さん"
 
-#: ../src/common/commands.py:204
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "グループチャットに参加していません。"
 
-#: ../src/common/commands.py:211
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "退出したいグループチャットを選択してください"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:215 ../src/common/contacts.py:128
-#: ../src/common/helpers.py:67 ../src/roster_window.py:820
-#: ../src/roster_window.py:1691 ../src/roster_window.py:1693
-#: ../src/roster_window.py:2557 ../src/roster_window.py:5610
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "グループチャット"
 
-#: ../src/common/commands.py:256
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "次のグループチャットから退出しました:"
 
-#: ../src/common/commands.py:268
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "未読メッセージの転送"
 
-#: ../src/common/commands.py:290
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "すべての未読メッセージが転送されました。"
 
-#: ../src/common/commands.py:298
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr "未読メッセージを転送してから切断"
 
@@ -3744,7 +3754,8 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (操作のない状態が $T 分以上になった結果としての離席)"
 
 #: ../src/common/config.py:83
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S は現在の状況メッセージに置き換えられます。$T は自動離席の時間です。"
 
 #: ../src/common/config.py:85
@@ -3756,7 +3767,8 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (操作のない状態が $T 分以上になった結果としての不在)"
 
 #: ../src/common/config.py:86
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S は現在の状況メッセージに置き換えられます。$T は自動不在の時間です。"
 
 #: ../src/common/config.py:89
@@ -3793,42 +3805,92 @@ msgid "Status message text color."
 msgstr "状況メッセージ文の色。"
 
 #: ../src/common/config.py:102
+msgid "Contact signed in notification color."
+msgstr ""
+
+#. limegreen
+#: ../src/common/config.py:103
+msgid "Contact signout notification color"
+msgstr ""
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "新着のメッセージをポップアップ通知に表示するかどうか。"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "ファイル転送の要求"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "ファイルの転送が中止されました"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "ファイル転送が完了したら、ポップアップで知らせる"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "グループチャットへの招待"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "受信のニックネームのフォント。"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "送信のニックネームのフォント。"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "受信の文のフォント。"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "送信の文のフォント。"
 
-#: ../src/common/config.py:106
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "状況メッセージの文のフォント。"
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折り畳む(アカウントやグループチャットの)行の一覧(空白で区切る)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:108 ../src/common/config.py:504
-#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
-#: ../src/common/optparser.py:526 ../src/gui_interface.py:2668
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "デフォルト"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "スペルチェックのための言語"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3839,7 +3901,7 @@ msgstr ""
 "す。\n"
 "'never'(なし) - 時刻を印さない。"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:125
 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. "
@@ -3849,18 +3911,18 @@ msgstr ""
 "あいまい時計を使いません。1 が最も正確な時計で、4 が最も正確ではありません。"
 "print_time が 'sometimes'(時々) の場合のみ使われます。"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "* / _ の組を、書式指定の文字として扱う。"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "真なら、*/_ を除去しません. たとえば *abc* は太字になりますが * * は除かれま"
 "せん。"
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3872,7 +3934,7 @@ msgstr ""
 "\"restructuredtext.html を参照してください (これを使うには docutils をインス"
 "トールが必要です)。"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3880,7 +3942,7 @@ msgstr ""
 "グループチャットで、ニックネーム補完(タブ)を使うとき、ニックネームの後ろにつ"
 "け加えられる文字。"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3888,15 +3950,16 @@ msgstr ""
 "グループチャットで、希望したニックネームが他の誰かに使われていた場合、希望し"
 "たニックネームの後ろにつけ加えられる文字。"
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
+"If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
 "真なら、Gajim は名簿を閉じる際にその位置を保存し、開く際にはその位置に戻しま"
 "す。"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3906,48 +3969,51 @@ msgstr ""
 "%M] \" は \"[hour:minute] \" となります。詳しくは python の strftime に関する"
 "文書をご覧ください: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "会話の中で、ニックネームの前に表示される文字列"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "会話の中で、ニックネームの後に表示される文字列"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:177
 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:169
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "* と [n] を名簿の題に追加するかどうか。"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr "チャットのタブまたはウィンドウを再び開いたとき、覚えている行数。"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "前の会話の最後から持続しておく時間(単位は分)。"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:182
+#, fuzzy
 msgid ""
-"How many lines to request to server when entering a groupchat. -1 means no "
+"How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
 "グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし。"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:183
+#, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "グループチャットに参加するとき、記録を遡る時間(単位は分)。-1 は制限なし。"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3955,12 +4021,12 @@ msgstr ""
 "切断されてからグループチャットに自動で再参加を試みるまでの待機時間(単位は"
 "秒)。"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:185
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr "談話室から蹴り出された場合、自動で再参加するか。"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3968,11 +4034,11 @@ msgstr ""
 "Ctrl+Enter をメッセージ送信として、Enter を改行とします (Mirabilis ICQ クライ"
 "アントのデフォルトの挙動)。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+KeyUP で遡ることのできる行数。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3981,11 +4047,11 @@ msgstr ""
 "独自の辞書の URL (%s を含めます。ここで %s は語/フレーズです)。または、"
 "WIKTIONARY を使う場合は単に 'WIKTIONARY' としてください。"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "チェックをつけると、Gajim を gajim-remote を使って遠隔操作できます。"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:195
 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 "
@@ -3996,7 +4062,7 @@ msgstr ""
 "もとに、相手先の在席状況を更新します(相手先が listen_to_network_manager を"
 "「偽」にしておらず、全体の在席状況に同調させている場合)。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
@@ -4004,7 +4070,7 @@ msgstr ""
 "disabled (通知しない) のいずれか。"
 
 # (Mako)この場合 Disabled は「表示しない」とするべきか
-#: ../src/common/config.py:187
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4012,7 +4078,7 @@ msgstr ""
 "チャットウィンドウに表示されるチャット状態通知。all (すべての状態)、"
 "composing_only (入力中のみ)、disabled (通知しない) のいずれか。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4020,35 +4086,38 @@ msgstr ""
 "個々のメッセージに時刻を印すのではない場合(print_time==sometimes (時々))、時"
 "刻を印す時間間隔 (単位:分)。"
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "グループチャットのタブまたはウィンドウを閉じる前に確認を求めます。"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "グループチャット JID の一覧(空白で区切る)にあるグループチャットのタブまたは"
 "ウィンドウを閉じる前には、必ず確認を求めます。"
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "グループチャット JID の一覧(空白で区切る)にあるグループチャットのタブまたは"
 "ウィンドウを閉じる前には、決して確認を求めません。"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "タブのあるチャットウィンドウを閉じる前に、それがデータを失う操作であることの"
 "確認を求めます"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4056,27 +4125,33 @@ msgstr ""
 "ローカルのインターフェースに加えて、アドレス変換 / ポートフォワーディングの場"
 "合にファイル転送に用いるホストの一覧(コンマ区切り)。"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規格で、KiB は 1024 バイト、KB は 1000 バイト。"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "システムの通知エリアでイベントを通知します。"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "ひとつだけの会話のときもタブを表示するかどうか。"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "チャットウィンドウにタブつき帳面の縁を表示するかどうか。"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "閉じるボタンをタブに表示するかどうか。"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:220
 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 "
@@ -4088,16 +4163,16 @@ msgstr ""
 "です。大きな数値ほど安全ですが、セッションを始める際に計算に時間がかかりま"
 "す。"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "新着のメッセージをポップアップ通知に表示するかどうか。"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "グループチャットで強調表示する語の一覧(セミコロンで区切る)。A"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:247
 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."
@@ -4105,14 +4180,14 @@ msgstr ""
 "真なら、ウィンドウマネージャの×ボタンがクリックされた場合に Gajim を終了しま"
 "す。この設定は通知アイコンが使用されているときのみ適用されます。"
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "真なら、Gajim は起動するたびにデフォルトの jabber クライアントであるかを調べ"
 "ます。"
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4120,7 +4195,7 @@ msgstr ""
 "真なら、Gajim は未読メッセージのあるタブにアイコンを表示します。テーマに依存"
 "し、アイコンが動画のものもあります。"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4128,11 +4203,11 @@ msgstr ""
 "真なら、Gajim は名簿ウィンドウの相手先の名前の下に在席状況メッセージを(それが"
 "空でなければ)表示します。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "名簿でのアバターの表示位置。left(左)またはright(右)"
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:257
 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."
@@ -4140,7 +4215,7 @@ msgstr ""
 "真なら、前回アバターのない相手先または受け取ってから時間の経ち過ぎている相手"
 "先に対して、 Gajim はアバターを要求します。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:258
 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."
@@ -4148,9 +4223,10 @@ msgstr ""
 "偽なら、相手先が在席状況や状況メッセージを変更しても、Gajim はチャットに在席"
 "状況を表示しません。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4163,34 +4239,34 @@ msgstr ""
 "\"in_and_out\"(入退室のみ)なら、Gajim はグループチャットへの参加/退出のみを表"
 "示します。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:261
 msgid "Log XHTML messages instead of plain text messages."
 msgstr "プレーンテキストのメッセージではなく XHTML のメッセージを記録する。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "相手先がちょうどサインインしたときの背景色。"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "相手先がちょうどサインアウトしたときの背景色。"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "真なら、復元されたメッセージはデフォルトのフォントより小さいフォントを使いま"
 "す。"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "中継先そのもののアバターを表示しません。"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "システムのタスクバーに名簿を表示しません。"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:268
 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 "
@@ -4201,7 +4277,7 @@ msgstr ""
 "のデフォルトです)。"
 
 # (Mako) sha がよくわからない。とりあえずそのままで。presence はとりあえず「相手先」
-#: ../src/common/config.py:247
+#: ../src/common/config.py:270
 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 "
@@ -4212,7 +4288,8 @@ msgstr ""
 "先に sha を送るのをやめます。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:250
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4220,7 +4297,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "新着メッセージを置くウィンドウの制御。\n"
@@ -4233,7 +4310,7 @@ msgstr ""
 "'pertype'(種類ごと) - メッセージの種類(たとえばチャット、グループチャット)ご"
 "とにそれぞれのウィンドウに。"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:274
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -4245,32 +4322,32 @@ msgstr ""
 "'never'(なし) - 名簿を表示しない。\n"
 "'last_state'(以前の状態) - 前の名簿の表示状態の通りにする。"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "偽なら、チャットウィンドウにアバターは表示されません。"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "真なら、エスケープキーを押すことでタブまたはウィンドウを閉じます。"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "チャットウィンドウのボタンを表示しません。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "グループチャットのバナーを表示しません"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "一対一チャットのウィンドウのバナーを表示しません"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "グループチャットウィンドウで、在室者一覧を表示しません。"
 
 # (Mako)chat は group chat のことか?
-#: ../src/common/config.py:258
+#: ../src/common/config.py:281
 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."
@@ -4278,25 +4355,25 @@ msgstr ""
 "チャットで、前のメッセージと別の人の場合のみ、行の先頭にニックネームを表示し"
 "ます。"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "連続するニックネームを統合する際の字下げ幅。"
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "会話ウィンドウのスクロールをなめらかにします"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "グループチャットのニックネームに使われる色。\":\"で区切ってください。"
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "未読のものがない場合、Ctrl-Tab で次の入力タブに移動します。"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4304,7 +4381,7 @@ msgstr ""
 "メタ相手先の作成の確認のダイアログを表示するかどうか。空文字ならダイアログを"
 "表示しません。"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4312,7 +4389,7 @@ msgstr ""
 "相手先の遮断の確認のダイアログを表示するかどうか。空文字ならダイアログを表示"
 "しません。"
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4320,7 +4397,7 @@ msgstr ""
 "個別の在席状況の確認のダイアログを表示するかどうか。空文字ならダイアログを表"
 "示しません。"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:289
 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 "
@@ -4330,7 +4407,7 @@ msgstr ""
 "す。【注意】負の優先順位のままログインすると、サーバーからどんなメッセージも"
 "受信しません。"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4338,7 +4415,7 @@ msgstr ""
 "真なら、Gajim はアカウントのパスワードを保存する際に Gnome Keyring (もしあれ"
 "ば) を使います。"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4346,7 +4423,7 @@ msgstr ""
 "真なら Gajim はアカウントのパスワードを保持する際に KDE Wallet (もし "
 "kwalletcli があれば) を使います。"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4354,7 +4431,7 @@ msgstr ""
 "真なら、Gajim はアカウントとグループの行にオンラインと総計の相手先の数を表示"
 "します。"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4362,7 +4439,7 @@ msgstr ""
 "空白、'chat'(チャット)、'normal'(普通) のいずれか。もし空でなければ、すべての"
 "受信メッセージをこのタイプとして扱います"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4370,42 +4447,28 @@ msgstr ""
 "真なら、チャットウィンドウが開いていない場合に、最新のメッセージをあなたに"
 "送った相手先をスクロールして選択します。"
 
-#: ../src/common/config.py:272
-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:273
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "在籍情況変更ウィンドウを閉じるまでの活動停止の時間。"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "表示された会話の最大行数。古いほうから削除されます。"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 "真なら、notification-daemon からの通知は通知アイコンの脇に表示されます。"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "操作しない状態をチェックする時間間隔。"
 
-#: ../src/common/config.py:277
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr "LaTeX の数式表示のサイズ。高い値ほど大きくなります。"
-
-#: ../src/common/config.py:278
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4413,20 +4476,21 @@ msgstr ""
 "正当な URI スキーム。この一覧にあるスキームだけが”実際の”URIとして扱われます"
 "(mailto と xmpp は別々に扱います)。"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "アカウントの接続が確立した際、すべてのオフラインの相手先にオフラインの状況"
 "メッセージを求めます。注意: 大量の送信すべきリクエストを発生させることがあり"
 "ます!"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "真なら、グループチャットでの補完をシェルの自動補完のようにします。"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4435,16 +4499,20 @@ msgstr ""
 "に)、\"when_other_resource\"(リソースが異なる場合)、\"never\"(表示しない)のい"
 "ずれか。"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 "jingle の出力のビデオのフレームレート (オプション)。例: 10/1 または 25/2"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "jingle の出力のビデオの大きさ (オプション). 例: 320x240"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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."
@@ -4453,11 +4521,11 @@ msgstr ""
 "バーは \"stun_server\" オプションか、または jabber サーバーによって与えられま"
 "す。"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr "jingle を使う際に利用する STUN サーバー"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
@@ -4465,7 +4533,7 @@ msgstr ""
 "真なら、Gajim はグループチャットの参加者の分掌をステータスアイコンに色付き四"
 "角をつけて表示します。"
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:315
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
@@ -4473,7 +4541,26 @@ msgstr ""
 "アカウントで正しいプロキシの設定がなされていない場合に、外向きの通信に使われ"
 "るプロキシ"
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"チェックをつけると、Gajim は状況メッセージを要求しません。かわりに対応するデ"
+"フォルトのメッセージが使われます。"
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4481,7 +4568,7 @@ msgstr ""
 "在席状況に応じて優先順位を自動的に変更します。優先順位は autopriority_* オプ"
 "ションで定義します。"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:340
 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"
@@ -4491,42 +4578,42 @@ msgstr ""
 "このオプションは restore_last_status が無効のときのみ使われます"
 
 # (Mako) If enabled は If True であるべきだろう
-#: ../src/common/config.py:316
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "真なら、最後に使われた在席状況を復元します。"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "真なら、相手先の承認の要求は自動的に了承されます。"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "偽なら、このアカウントを無効にして、チャットウィンドウにアバターを表示しませ"
 "ん。"
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr "偽なら、たとえ GPG が設定されていても、GPG 鍵による署名を行いません。"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "このアカウントの暗号化セッションを有効にします。"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim は(可能なら)自動的に暗号化セッションを始めるべきかどうか。"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr "試みる接続の種類の順番(空白で区切る)。「tls」「ssl」または「plain」"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:352
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -4534,22 +4621,22 @@ msgstr ""
 "暗号化されない接続の場合、パスワードを送る前に警告のダイアログを表示します。"
 "「warn」(警告する)「connect」(接続する)または「disconnect」(接続しない)"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "標準の SSL ライブラリを使う前に警告のダイアログを表示します。"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:354
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "暗号化されない接続で平文でパスワードを送る前に、警告のダイアログを表示しま"
 "す。"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "無視すべき SSL のエラーの一覧(空白で区切って)。"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:362
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -4557,7 +4644,7 @@ msgstr ""
 "記録を保存しない JID の一覧(空白で区切って)。アカウント名を加えることもでき、"
 "そのアカウントについて記録を残しません。"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:363
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -4565,26 +4652,27 @@ msgstr ""
 "相手が記録しないことを望む場合、記録しない会話を受け入れる JID の一覧(空白で"
 "区切って)。"
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "活動停止状態の後に送られる空白"
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "活動停止状態の後に XMPP ping を送ります"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr "生存パケットを送ってから再接続を試みるまで待機する時間(単位は秒)。"
 
 #. yes, no, ask
-#: ../src/common/config.py:350
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 対策"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4592,7 +4680,7 @@ msgstr ""
 "チェックをつけると、Gajim はあなたの IP とプロキシを使います。プロキシはファ"
 "イル転送のために file_transfer_proxies オプションで定義します。"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:379
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
@@ -4601,24 +4689,24 @@ msgstr ""
 "います。Openfire のプロキシは(正常に機能する場合でも)このテストに失敗すること"
 "がわかっています。"
 
-#: ../src/common/config.py:368
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "受領確認に応じる"
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "受領確認を求める"
 
-#: ../src/common/config.py:378
+#: ../src/common/config.py:403
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Gajim が使用中の OS を通知することを許可します。"
 
-#: ../src/common/config.py:379
+#: ../src/common/config.py:404
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim があなたの現地時間を通知することを許可します。"
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4626,15 +4714,15 @@ msgstr ""
 "暗号化セッションを確立しようとする際、メッセージの記録をとりたいと仮定するか"
 "どうか"
 
-#: ../src/common/config.py:383
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr "追加したい相手先に送られるメッセージ"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr "サーバーの履歴に同期した最後の時刻"
 
-#: ../src/common/config.py:385
+#: ../src/common/config.py:410
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
@@ -4642,7 +4730,7 @@ msgstr ""
 "真にすると(かつサーバーがこの機能をサポートしている場合)、Gajim はほかのリ"
 "ソースによって送受されたメッセージを受信します。"
 
-#: ../src/common/config.py:386
+#: ../src/common/config.py:411
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -4650,23 +4738,32 @@ msgstr ""
 "真にすると、Gajim は相手先がファイル転送を行うためにあなたのローカル IP アド"
 "レスを送信します。"
 
-#: ../src/common/config.py:387
+#: ../src/common/config.py:412
 msgid "Latest token for Oauth2 authentication."
 msgstr "最近の Oauth2 認証のトークン"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:413
 msgid "client_id for Oauth2 authentication."
 msgstr "Oauth2 認証のクライアント id"
 
-#: ../src/common/config.py:389
+#: ../src/common/config.py:414
 msgid "redirect_url for Oauth2 authentication."
 msgstr "Oauth2 認証のリダイレクト URL"
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:415
+#, fuzzy
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+"相手が記録しないことを望む場合、記録しない会話を受け入れる JID の一覧(空白で"
+"区切って)。"
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "この相手先に OpenPGP を使えるかどうか"
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4674,13 +4771,30 @@ msgstr ""
 "Gajim はこの相手先について自動的に(可能なら)暗号化セッションを始めるべきかど"
 "うか"
 
-#: ../src/common/config.py:453 ../src/common/config.py:456
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "スペル間違いを調べたい言語"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:483
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし。"
+
+#: ../src/common/config.py:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"グループチャットに参加するとき、記録を遡る時間(単位は分)。-1 は制限なし。"
+
+#: ../src/common/config.py:487
+#, fuzzy
+msgid ""
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
@@ -4688,83 +4802,83 @@ msgstr ""
 "す)。このオプションをプラグインの有効化/無効化のために使用してはいけません。"
 "代わりに GUI を使用してください。"
 
-#: ../src/common/config.py:464 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "睡眠中"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "すぐに戻ります"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "数分後に戻ります。"
 
-#: ../src/common/config.py:466 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "食事"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "食事のため、しばらく離れます。"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "映画"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "ただいま映画鑑賞中です。"
 
-#: ../src/common/config.py:468 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "仕事中"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "仕事中です。"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "電話中"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "電話中です。"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "外出中"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "出かけています。"
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "在席しています。"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "チャットできます。"
 
-#: ../src/common/config.py:483 ../src/config.py:1652
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "すぐ戻ります。"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "不在です。"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "邪魔しないでください。"
 
-#: ../src/common/config.py:486 ../src/common/config.py:487
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "バイバイ !"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:526
 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."
@@ -4772,31 +4886,31 @@ msgstr ""
 "グループチャットのメッセージに、muc_highlight_words で設定した語、またはあな"
 "たのニックネームが含まれる場合にサウンドを鳴らします。"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "グループチャットのメッセージがあった際にサウンドを鳴らします。"
 
-#: ../src/common/config.py:507 ../src/common/optparser.py:310
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:511 ../src/common/optparser.py:296
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:515
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:519
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:526
+#: ../src/common/config.py:555
 msgid "Tor"
 msgstr ""
 
-#: ../src/common/connection_handlers_events.py:367
+#: ../src/common/connection_handlers_events.py:370
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4806,23 +4920,23 @@ msgstr ""
 "は、http://jru.jabberstudio.org/ のような名簿管理ツールを使ってください。"
 
 # (Mako) 実際に使われている場所を確認していないが、強引に訳す
-#: ../src/common/connection_handlers_events.py:799
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s から継読中止の要求"
 
-#: ../src/common/connection_handlers_events.py:884
-#: ../src/common/connection_handlers.py:334
-#: ../src/common/connection_handlers.py:940
-#: ../src/common/connection_handlers.py:1052 ../src/common/connection.py:453
-#: ../src/common/logger.py:1142 ../src/gajim.py:392
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "ディスクの書き込みエラー"
 
-#: ../src/common/connection_handlers_events.py:888
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1055 ../src/common/connection.py:457
-#: ../src/common/logger.py:1145 ../src/gajim.py:211 ../src/session.py:101
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4834,160 +4948,162 @@ msgstr ""
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:909
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "談話室は閉鎖されました"
 
-#: ../src/common/connection_handlers_events.py:917
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "代わりに次の談話室に参加します: %s"
 
-#: ../src/common/connection_handlers_events.py:1001
-#: ../src/common/connection_handlers_events.py:1033
-#: ../src/common/connection_handlers_events.py:1049
-#: ../src/common/connection.py:263 ../src/config.py:2149 ../src/config.py:2158
-#: ../src/config.py:2226 ../src/config.py:3663 ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3092
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID が正しくありません"
 
-#: ../src/common/connection_handlers_events.py:1002
-#: ../src/common/connection_handlers_events.py:1034
-#: ../src/common/connection_handlers_events.py:1050
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "正しくない JID からメッセージが届きました。無視します。"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1076
-#: ../src/gui_interface.py:420 ../src/gui_interface.py:434
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s を送信する際にエラー ( %(error)s )"
 
-#: ../src/common/connection_handlers_events.py:1508
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知の SSL エラー: %d"
 
-#: ../src/common/connection_handlers_events.py:2040 ../src/dialogs.py:2779
-#: ../src/notify.py:263
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "新着の単発メッセージ"
 
-#: ../src/common/connection_handlers_events.py:2042
+#: ../src/common/connection_handlers_events.py:2213
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "%(nickname)s からの新しい単発メッセージ"
 
-#: ../src/common/connection_handlers_events.py:2046 ../src/dialogs.py:2780
-#: ../src/notify.py:264
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "新着の私信"
 
-#: ../src/common/connection_handlers_events.py:2048
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "グループチャット %s からの新着の私信"
 
-#: ../src/common/connection_handlers_events.py:2051
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s さん: %(message)s"
 
-#: ../src/common/connection_handlers_events.py:2054
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s さんからのメッセージ"
 
-#: ../src/common/connection_handlers_events.py:2058 ../src/dialogs.py:2779
-#: ../src/notify.py:263
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Message"
 msgstr "新着メッセージ"
 
-#: ../src/common/connection_handlers_events.py:2060
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s さんからの新着メッセージ"
 
-#: ../src/common/connection_handlers_events.py:2189
+#: ../src/common/connection_handlers_events.py:2375
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s さんの在席状況が変わりました"
 
-#: ../src/common/connection_handlers_events.py:2191
-#: ../src/groupchat_control.py:205 ../src/groupchat_control.py:1766
-#: ../src/history_window.py:448
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s さんは現在 %(status)s"
 
-#: ../src/common/connection_handlers_events.py:2196 ../src/dialogs.py:2791
-#: ../src/notify.py:277
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
 msgid "Contact Changed Status"
 msgstr "相手先が在席状況を変更"
 
-#: ../src/common/connection_handlers_events.py:2198
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s さんがサインインしました"
 
 #. default value
-#: ../src/common/connection_handlers_events.py:2203 ../src/dialogs.py:2775
-#: ../src/notify.py:259
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
 msgid "Contact Signed In"
 msgstr "相手先がサインインしました"
 
-#: ../src/common/connection_handlers_events.py:2205
+#: ../src/common/connection_handlers_events.py:2389
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s さんがサインアウトしました"
 
-#: ../src/common/connection_handlers_events.py:2210 ../src/dialogs.py:2777
-#: ../src/notify.py:261
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
 msgid "Contact Signed Out"
 msgstr "相手先がサインアウトしました"
 
 # (Mako) idle をどうする
-#: ../src/common/connection_handlers.py:88
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "アイドルモジュールをロードできません"
 
-#: ../src/common/connection_handlers.py:121
+#: ../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:129
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "登録が完了しました"
 
-#: ../src/common/connection_handlers.py:130
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "エージェント %s の登録は成功しました"
 
-#: ../src/common/connection_handlers.py:139
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "登録が失敗しました"
 
-#: ../src/common/connection_handlers.py:140
+#: ../src/common/connection_handlers.py:146
 #, 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:571 ../src/common/connection.py:1540
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "「隠れています」はサポートされていません"
 
-#: ../src/common/connection_handlers.py:572 ../src/common/connection.py:1541
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "アカウント %s は「隠れています」をサポートしていません。"
 
-#: ../src/common/connection_handlers.py:1714
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "あなたを私の名簿に追加したいと思っています。"
 
@@ -5120,27 +5236,28 @@ msgstr "証明書署名に鍵の使い方が含まれていません"
 msgid "Application verification failure"
 msgstr "アプリケーションの検証に失敗しました"
 
-#: ../src/common/connection.py:264 ../src/dialogs.py:3093
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "%s さんにメッセージを送ることができません。JID が正しくありません。"
 
 # (Mako) ここでは presence を「相手先」と訳す
-#: ../src/common/connection.py:286
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "相手先が署名していないか、鍵が割り当てられていません。"
 
-#: ../src/common/connection.py:289
+#: ../src/common/connection.py:307
 #, 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:342
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[このメッセージは *暗号化されています* (参考 :XEP:`27`]"
 
-#: ../src/common/connection.py:440
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5149,73 +5266,77 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:850
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "アカウント \"%s\" での接続が切れました"
 
-#: ../src/common/connection.py:851
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "手動で再接続してください。"
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "サーバー %(name)s は登録要求に対してエラーを返しました:  %(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:904
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "サーバー %s は異なる登録フォームを提供しています"
 
-#: ../src/common/connection.py:921
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "応答が正しくありません"
 
-#: ../src/common/connection.py:922
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "中継先 %(name)s は登録要求に対してエラーを返しました:  %(error)s"
 
-#: ../src/common/connection.py:1197 ../src/common/connection.py:1349
-#: ../src/common/connection.py:1976
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "%s に接続できませんでした"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "%s に接続できませんでした"
 
-#: ../src/common/connection.py:1198 ../src/gui_interface.py:529
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "設定を確認するか、時間をおいて試してください。"
 
-#: ../src/common/connection.py:1203
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "サーバの応答: %s"
 
-#: ../src/common/connection.py:1218
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "プロキシへの接続に失敗"
 
-#: ../src/common/connection.py:1256 ../src/common/connection.py:1328
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "アカウント %s に接続できません"
 
-#: ../src/common/connection.py:1257 ../src/common/connection.py:1329
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "アカウント %s での接続が切れました。再接続を試みます。"
 
-#: ../src/common/connection.py:1282
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s の証明書の真正性は検証できませんでした。"
 
-#: ../src/common/connection.py:1285
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -5224,7 +5345,7 @@ msgstr ""
 "\n"
 "SSL エラー: <b>%s</b>"
 
-#: ../src/common/connection.py:1287
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -5233,7 +5354,7 @@ msgstr ""
 "\n"
 "未知の SSL エラー: %d"
 
-#: ../src/common/connection.py:1310
+#: ../src/common/connection.py:1420
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -5242,94 +5363,97 @@ msgstr ""
 "%s の証明書の真正性は検証できませんでした。\n"
 "この証明書はこのドメインをカバーしていません。"
 
-#: ../src/common/connection.py:1350
-msgid "Check your connection or try again later"
-msgstr "接続を確認するか、または後で再度試してください"
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "%s に接続できませんでした"
 
 # (Mako) %s はアカウントか
-#: ../src/common/connection.py:1385
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" の認証に失敗しました"
 
-#: ../src/common/connection.py:1386
-msgid "Please check your login and passwordfor correctness."
+#: ../src/common/connection.py:1499
+#, fuzzy
+msgid "Please check your login and password for correctness."
 msgstr "整合性のために、ログインとパスワードを確認してください。"
 
-#: ../src/common/connection.py:1461
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "プライバシーリストを削除する際のエラー"
 
-#: ../src/common/connection.py:1462
-#, python-format
+#: ../src/common/connection.py:1575
+#, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and tryagain."
+"connected resources. Deactivate it and try again."
 msgstr ""
 "プライバシーリスト %s は削除されませんでした。現在の接続に使用されているよう"
 "です。使用をやめてから再び試してください。"
 
-#: ../src/common/connection.py:1843
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "送った相手先: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1846
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "送った相手先:"
 
-#: ../src/common/connection.py:1993 ../src/common/connection.py:2016
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "「隠れ中」のため取得できません"
 
-#: ../src/common/connection.py:2575
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "登録解除に失敗"
 
-#: ../src/common/connection.py:2576
+#: ../src/common/connection.py:2827
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "サーバー %(server)s での登録解除に失敗しました: %(error)s"
 
 # (Mako)承認なしに名簿にある状態
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:67
-#: ../src/gui_interface.py:472
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "オブザーバ"
 
-#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
-#: ../src/common/helpers.py:67 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:859
-#: ../src/roster_window.py:1579 ../src/roster_window.py:1683
-#: ../src/roster_window.py:1685 ../src/roster_window.py:1847
-#: ../src/roster_window.py:2525
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "中継先"
 
-#: ../src/common/contacts.py:366
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "名簿にありません"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 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:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim の D-Bus に関する性能を使用できません。"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "このコンピュータでは D-Bus が正しく機能していません"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 "このコンピュータでは D-Bus が正しく機能していません: システムバスがありません"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
 "このコンピュータでは D-Bus が正しく機能していません: セッションバスがありませ"
@@ -5345,7 +5469,7 @@ msgstr ""
 "サービスがありません: Gajim が起動していないか、あるいは remote_control が"
 "「偽」に設定されています"
 
-#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "このコンピュータに D-Bus がないか、あるいは python のモジュールがありません"
@@ -5563,7 +5687,7 @@ msgstr "リソースに不正な文字が含まれています。"
 msgid "_Busy"
 msgstr "取り込み中 (_B)"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:196
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "取り込み中"
 
@@ -5571,7 +5695,7 @@ msgstr "取り込み中"
 msgid "_Not Available"
 msgstr "不在 (_N)"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:198
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
 msgid "Not Available"
 msgstr "不在"
 
@@ -5579,7 +5703,7 @@ msgstr "不在"
 msgid "_Free for Chat"
 msgstr "チャット可 (_F)"
 
-#: ../src/common/helpers.py:237 ../src/tooltips.py:192
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "チャット可"
 
@@ -5587,7 +5711,7 @@ msgstr "チャット可"
 msgid "?user status:_Available"
 msgstr "在席 (_A)"
 
-#: ../src/common/helpers.py:242 ../src/tooltips.py:190
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "在席"
 
@@ -5603,7 +5727,7 @@ msgstr "離席中 (_w)"
 msgid "_Offline"
 msgstr "オフライン (_O)"
 
-#: ../src/common/helpers.py:254 ../src/tooltips.py:200
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "オフライン"
 
@@ -5680,20 +5804,20 @@ msgstr "傍聴者"
 msgid "Visitor"
 msgstr "傍聴者"
 
-#: ../src/common/helpers.py:316 ../src/tooltips.py:211
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "なし"
 
-#: ../src/common/helpers.py:318 ../src/tooltips.py:217
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "主宰者"
 
-#: ../src/common/helpers.py:320 ../src/tooltips.py:215
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "管理人"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: ../src/common/helpers.py:322 ../src/tooltips.py:213
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "メンバー"
 
@@ -5795,33 +5919,33 @@ msgstr[1] "保留イベント %d 件"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1361
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "こんにちは。私は $name です。"
 
-#: ../src/common/helpers.py:1471 ../src/common/helpers.py:1480
-#: ../src/common/helpers.py:1534
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
 msgid "Timeout loading image"
 msgstr "画像の読み込みに失敗しました"
 
-#: ../src/common/helpers.py:1490 ../src/common/helpers.py:1532
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
 msgid "Image is too big"
 msgstr "画像が大きすぎます"
 
-#: ../src/common/helpers.py:1500
+#: ../src/common/helpers.py:1507
 msgid "PyCURL is not installed"
 msgstr "pyCURL がインストールされていません"
 
-#: ../src/common/helpers.py:1536
+#: ../src/common/helpers.py:1543
 msgid "Error loading image"
 msgstr "画像読み込みエラー"
 
-#: ../src/common/jingle_rtp.py:109
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 設定エラー"
 
-#: ../src/common/jingle_rtp.py:110
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5840,11 +5964,11 @@ msgstr ""
 "エラー:\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:208
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "GStreamer エラー"
 
-#: ../src/common/jingle_rtp.py:208
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5853,107 +5977,115 @@ msgstr ""
 "エラー: %s\n"
 "デバッグ: %s"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "音声入力"
 
-#: ../src/common/jingle_rtp.py:341
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "音声出力"
 
-#: ../src/common/jingle_rtp.py:384
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "ビデオ入力"
 
-#: ../src/common/jingle_rtp.py:393
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "ビデオ出力"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "\"%(command)s\" の実行中にエラー: %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s は正しいログレベルではありません"
 
-#: ../src/common/multimedia_helpers.py:39
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr " デフォルトのデバイス"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:60
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "音声テスト"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:79
-#: ../src/common/multimedia_helpers.py:93
-#: ../src/common/multimedia_helpers.py:111
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "自動検出"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
 #, fuzzy, python-format
 msgid "Pulse: %s"
 msgstr "Pulse: %s"
 
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:77
-#: ../src/common/multimedia_helpers.py:105
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "偽の音声出力"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:90
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "ビデオのテスト"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#: ../src/common/multimedia_helpers.py:108
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "green"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "ビデオ出力"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X ウィンドウシステム (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:110
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X ウィンドウシステム (without Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
+msgid "Error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
 # (Mako) create index のこと
-#: ../src/common/optparser.py:385
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "記録データベースからインデックスを作成します"
 
@@ -6590,19 +6722,115 @@ msgstr "勉強中"
 msgid "Writing"
 msgstr "執筆中"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "デフォルト"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "隠密"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "アカウント"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "アカウントの行"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "説明"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "エラー"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "1"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "談話室"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "不明"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "不明"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "不明"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6611,20 +6839,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> <i>%(artist)s</i>\n"
 "( <i>%(source)s</i> より)"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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 が起動しているようです。ファイル転送は中止されました。"
-
 #. we're not english
-#: ../src/common/stanza_session.py:424
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6673,45 +6889,43 @@ msgstr "avahi-daemon が起動しているか確認してください。"
 msgid "Could not change status of account \"%s\""
 msgstr "アカウント \"%s\" の在席状況を変更できませんでした"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:352
-#: ../src/common/zeroconf/connection_zeroconf.py:392
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "メッセージを送信できませんでした。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:366
-#: ../src/common/zeroconf/connection_zeroconf.py:406
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "相手先はオフラインです。メッセージを送信できませんでした。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:433
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "ホストへの接続を確立できませんでした: データ送信中の時間切れです。"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:193
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "サービスの追加中のエラーです。%s"
 
-#: ../src/config.py:407
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "デフォルトのメッセージ"
 
-#: ../src/config.py:416
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "有効"
 
-#: ../src/config.py:469 ../src/config.py:473 ../src/config.py:3159
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../src/config.py:757 ../src/dialogs.py:1493
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "言語 %s の辞書はありません"
 
-#: ../src/config.py:758
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6720,213 +6934,214 @@ msgstr ""
 "スペルチェックを行なうには %s の辞書をインストールしなければなりません。ある"
 "いは、speller_language オプションで別の言語を選択してください。"
 
-#: ../src/config.py:1238
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "状況メッセージのタイトル"
 
-#: ../src/config.py:1238
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "状況メッセージの文"
 
 #. Name column
-#: ../src/config.py:1566 ../src/dialogs.py:2536 ../src/dialogs.py:2603
-#: ../src/dialogs.py:3395 ../src/disco.py:886 ../src/disco.py:1744
-#: ../src/disco.py:2046 ../src/history_window.py:91
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "名前"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "今すぐ再ログインしますか ?"
 
-#: ../src/config.py:1662
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "すべての変更を直ちに有効にするには、再ログインしてください。"
 
-#: ../src/config.py:1816 ../src/config.py:1949
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP はこのコンピュータでは使えません。"
 
-#: ../src/config.py:1989 ../src/config.py:2036
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "未読のイベント"
 
-#: ../src/config.py:1990
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "このアカウントを削除する前にすべての保留イベントを読みます。"
 
-#: ../src/config.py:2019
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "アカウント %s でチャット中です"
 
-#: ../src/config.py:2020
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "すべてのチャットとグループチャットのウィンドウを閉じます。続けてもいいです"
 "か ?"
 
-#: ../src/config.py:2032 ../src/config.py:2574 ../src/config.py:2611
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "現在サーバーに接続している状態です"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "アカウント名を変更するには、接続を切らなければなりません。"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "アカウント名を変更するには、保留されているすべてのイベントを読まなければなり"
 "ません。"
 
-#: ../src/config.py:2043
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "アカウン名は既に使われています"
 
-#: ../src/config.py:2044
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "この名前は別のアカウントで既に使われています。別の名前にしてください。"
 
-#: ../src/config.py:2048 ../src/config.py:2052
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "アカウント名が正しくありません"
 
-#: ../src/config.py:2049
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "アカウント名は空白にできません。"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "アカウント名にスペースを含めることはできません。"
 
-#: ../src/config.py:2130
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "アカウントの変更"
 
-#: ../src/config.py:2131
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "%s さんの新しい名前を入力してください"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID は \"user@サーバー名\" の形をしていなければなりません。"
 
-#: ../src/config.py:2382 ../src/config.py:3709
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "入力内容が正しくありません"
 
-#: ../src/config.py:2383 ../src/config.py:3710
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "ポートは番号で指定しなければなりません。"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "秘密鍵が見つかりません"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "利用できる OpenPGP の秘密鍵がありません。"
 
-#: ../src/config.py:2439
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP キーの選択"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "OpenPGP の鍵を選択してください"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "そのアカウントは無効です"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "個人情報を編集するには、その前にアカウントを作成しなければなりません。"
 
-#: ../src/config.py:2455 ../src/dialogs.py:2287 ../src/dialogs.py:2525
-#: ../src/dialogs.py:2713 ../src/disco.py:515 ../src/profile_window.py:361
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "サーバに接続していません"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "接続していない状態では個人情報の編集はできません。"
 
-#: ../src/config.py:2460
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "このサーバーは Vcard をサポートしていません"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "このサーバーは個人情報を保持できません。"
 
-#: ../src/config.py:2575 ../src/config.py:2612
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "アカウントを無効にするには、接続を切らなければなりません。"
 
-#: ../src/config.py:2581
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "アカウント Local は既に存在しています。"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "ローカルの伝送を有効にするには、名前の変更または削除を行ってください。"
 
-#: ../src/config.py:2739
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "%s を編集"
 
-#: ../src/config.py:2741
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "%s を登録"
 
 #. list at the beginning
-#: ../src/config.py:2777
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "追放者の一覧"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "メンバーの一覧"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "主宰者の一覧"
 
-#: ../src/config.py:2779
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "管理人の一覧"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2843 ../src/disco.py:893 ../src/history_manager.py:207
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2853
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "理由"
 
-#: ../src/config.py:2860
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "ニックネーム"
 
-#: ../src/config.py:2866
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "役"
 
-#: ../src/config.py:2893
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "締め出し中..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2895
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6934,11 +7149,11 @@ msgstr ""
 "<b>誰を締め出したいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2897
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "メンバーを追加..."
 
-#: ../src/config.py:2898
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6946,11 +7161,11 @@ msgstr ""
 "<b>誰をメンバーにしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2900
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "主宰者を追加..."
 
-#: ../src/config.py:2901
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6958,11 +7173,11 @@ msgstr ""
 "<b>誰を主宰者にしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2903
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "管理人を追加..."
 
-#: ../src/config.py:2904
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6970,7 +7185,7 @@ msgstr ""
 "<b>誰を管理人にしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2905
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6986,105 +7201,105 @@ msgstr ""
 "4. ドメイン (ドメインの合致。どんな user@domain や domain/resource や\n"
 "サブドメインを含んでも可)"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "アカウント %s を削除します"
 
-#: ../src/config.py:3021
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "アカウントは無効です"
 
-#: ../src/config.py:3022
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 "サーバーから登録を解除するには、アカウントを有効にしなければなりません。"
 
-#: ../src/config.py:3035 ../src/gui_interface.py:283
-#: ../src/gui_interface.py:701
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "パスワードが必要です"
 
-#: ../src/config.py:3036 ../src/gui_interface.py:681
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s のパスワードを入力してください"
 
-#: ../src/config.py:3037 ../src/gui_interface.py:701
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "パスワードを保存する"
 
-#: ../src/config.py:3047
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "アカウント \"%s\" はサーバに接続しています"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "削除すると、接続が失われます。"
 
-#: ../src/config.py:3062
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "サーバー %s への接続に失敗しました"
 
-#: ../src/config.py:3063
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "何をしたいですか ?"
 
-#: ../src/config.py:3064
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "アカウントを Gajim からのみ削除"
 
-#: ../src/config.py:3065
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "何も削除できません。あとで再び試みます"
 
-#: ../src/config.py:3159
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "すべて"
 
-#: ../src/config.py:3160
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "入退室のみ"
 
-#: ../src/config.py:3161
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "なし"
 
-#: ../src/config.py:3233
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "新しいグループチャット"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "このブックマークは不正なデータを含んでいます"
 
-#: ../src/config.py:3267
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "サーバーと談話室の欄を正しく入力するか、このブックマークを削除してください。"
 
-#: ../src/config.py:3393 ../src/config.py:3404 ../src/config.py:3413
-#: ../src/config.py:3424 ../src/config.py:3432
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "使えない文字です"
 
-#: ../src/config.py:3404 ../src/config.py:3412 ../src/config.py:3424
-#: ../src/config.py:3685
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "サーバー名が正しくありません"
 
-#: ../src/config.py:3431
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "談話室名が正しくありません"
 
-#: ../src/config.py:3601
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "アカウントは無事に追加されました"
 
-#: ../src/config.py:3602 ../src/config.py:3608
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -7093,32 +7308,32 @@ msgstr ""
 "「拡張」ボタンで、詳細なオプションの設定ができます。また後で、メインウィンド"
 "ウの「編集」メニューの「アカウント」を選択して設定することができます。"
 
-#: ../src/config.py:3607
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "新しいアカウントは無事に作られました"
 
-#: ../src/config.py:3646
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "ユーザー名が正しくありません"
 
-#: ../src/config.py:3648
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "このアカウントを編集するには、ユーザー名を指定しなければなりません。"
 
-#: ../src/config.py:3686
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "登録したいサーバーを指定してください。"
 
-#: ../src/config.py:3742 ../src/gui_interface.py:1203
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "証明書はファイルにあります"
 
-#: ../src/config.py:3743 ../src/gui_interface.py:1204
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "この証明書は既にファイル %s にあります。再び追加することはできません。"
 
-#: ../src/config.py:3831
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7133,7 +7348,7 @@ msgstr ""
 "SSL エラー: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/config.py:3837 ../src/gui_interface.py:1232
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7144,77 +7359,89 @@ msgstr ""
 "この証明書の SHA1 指紋:\n"
 "%s"
 
-#: ../src/config.py:3869 ../src/config.py:3903
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "アカウント作成時にエラーが起きました"
 
-#: ../src/config.py:3968
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "アカウント名は使われています"
 
-#: ../src/config.py:3969
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "この名前のアカウントは既に存在しています。"
 
-#: ../src/config.py:4099
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP ノードは削除されませんでした"
 
-#: ../src/config.py:4100
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP ノード %(node)s は削除されませんでした: %(message)s"
 
-#: ../src/config.py:4128
+#: ../src/config.py:4147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "%s を調整"
 
-#: ../src/config.py:4144 ../src/plugins/gui.py:74
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "有効"
 
-#: ../src/config.py:4152
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "イベント"
 
-#: ../src/config.py:4187
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "最初のメッセージを受信した"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "最初のメッセージを受信した"
 
-#: ../src/config.py:4188
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "開いているチャットで、その次のメッセージを受信した"
 
-#: ../src/config.py:4190
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "開いていないチャットで、その次のメッセージを受信した"
 
-#: ../src/config.py:4191
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "相手先が接続した"
 
-#: ../src/config.py:4192
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "相手先が切断した"
 
-#: ../src/config.py:4193
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "メッセージを送信した"
 
-#: ../src/config.py:4194
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "グループチャットのメッセージの強調"
 
-#: ../src/config.py:4195
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "グループチャットのメッセージを受信した"
 
-#: ../src/config.py:4196
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail メールを受信した"
 
-#: ../src/conversation_textview.py:603
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -7224,7 +7451,7 @@ msgstr ""
 "示すものです。もし長時間表示されたままなら、メッセージは\n"
 "失われたと考えられます。"
 
-#: ../src/conversation_textview.py:622
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -7232,45 +7459,45 @@ msgstr ""
 "この線より下の文は、このグループチャットを\n"
 "最後に読んだとき以降に発生したものです"
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "引用 (_Q)"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\" に対する操作 (_A)"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia の項を読む"
 
-#: ../src/conversation_textview.py:767
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "辞書を引く (_D)"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:835
 #, 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:797
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web 検索の URL に \"%s\" が含まれていません"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Web で検索する (_S)"
 
-#: ../src/conversation_textview.py:806
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "リンクとして開く (_L)"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1319
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7278,190 +7505,190 @@ msgstr[0] "昨日"
 msgstr[1] "%(nb_days)i日前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1368 ../src/history_window.py:481
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "件名: %s\n"
 
-#: ../src/dataforms_widget.py:565
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "画像をロードできません"
 
-#: ../src/dataforms_widget.py:567
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "メディアタイプはサポートされていません: %s"
 
-#: ../src/dataforms_widget.py:582
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "この欄は必須項目です"
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID は一覧にあります"
 
-#: ../src/dataforms_widget.py:628
+#: ../src/dataforms_widget.py:638
 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:639
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "相手先名: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:197
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "グループ"
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "グループ内"
 
-#: ../src/dialogs.py:295
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "鍵 ID"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "名前"
 
-#: ../src/dialogs.py:475
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "気分の設定"
 
-#: ../src/dialogs.py:595
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s の状況メッセージ"
 
-#: ../src/dialogs.py:609
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "状況メッセージ"
 
-#: ../src/dialogs.py:800
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "状況メッセージを上書きしますか ?"
 
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "この名前は既に使われています。この状況メッセージを上書きしますか ?"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "用意しておく状況メッセージとして保存"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "この状況メッセージの名前を入力してください"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM アドレス:"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG 番号:"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ 番号:"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN アドレス:"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! アドレス:"
 
-#: ../src/dialogs.py:879
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "アカウント %s に追加したい相手先の情報を入力してください"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "追加したい相手先の情報を入力してください"
 
-#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
-#: ../src/dialogs.py:3628
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "ユーザー ID が正しくありません"
 
-#: ../src/dialogs.py:1081
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ユーザー ID にはリソースを含めません。"
 
-#: ../src/dialogs.py:1086
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "あなた自身を名簿に追加することはできません。"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "相手先は既に名簿にあります"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "この相手先は既に名簿に登録されています。"
 
-#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ユーザー ID:"
 
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1279
 msgid "A GTK+ Jabber/XMPP client"
 msgstr "GTK+ Jabber/XMPP クライアント"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ バージョン:"
 
-#: ../src/dialogs.py:1275
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK バージョン:"
 
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "現在の開発者:"
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "過去の開発者:"
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "謝意:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1305
 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:1311
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Mako (mako AT pasero.net)"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7474,244 +7701,289 @@ msgstr ""
 "\n"
 "スペル間違いの強調表示は使われません"
 
-#: ../src/dialogs.py:1877
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "安全でない接続"
+
+#: ../src/dialogs.py:1846
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"安全でない接続でアカウント %(account)s (サーバー %(server)s) に接続しようとし"
+"ています。これは、すべての会話が暗号化されずに交わされること意味します。この"
+"タイプの接続はまったくおすすめしません。\n"
+"あなたがやりたいことですか ?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "はい。安全でないまま接続したいです"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr "このボックスにチェックしなければ、Gajim は接続しません"
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "次回から質問しない (_D)"
+
+#: ../src/dialogs.py:1950
 msgid "_Resume"
 msgstr "残す (_R)"
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:1958
 msgid "Re_place"
 msgstr "置換する (_p)"
 
-#: ../src/dialogs.py:2076 ../src/dialogs.py:2477
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "ニックネームに使用できない文字が含まれています。"
 
-#: ../src/dialogs.py:2195
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "アカウント %(account)s に対して、%(jid)s さんからの在席通知の申し込み"
 
-#: ../src/dialogs.py:2198
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s さんから在席通知の申し込み"
 
-#: ../src/dialogs.py:2282 ../src/gui_interface.py:1959
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "既にグループチャット %s に参加しています。"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "接続しないと、グループチャットに参加できません。"
 
-#: ../src/dialogs.py:2332
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "アカウント %s でグループチャットに参加"
 
-#: ../src/dialogs.py:2463
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "uri が間違っています"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "グループチャットではありません"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "アカウントが正しくありません"
 
-#: ../src/dialogs.py:2464
+#: ../src/dialogs.py:2599
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "グループチャット参加に使用するアカウントを選択してください。"
 
-#: ../src/dialogs.py:2476
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "ニックネームが正しくありません"
 
-#: ../src/dialogs.py:2481 ../src/dialogs.py:2487
-#: ../src/groupchat_control.py:2092
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "グループチャットの JID が正しくありません"
 
-#: ../src/dialogs.py:2482
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "グループチャットの JID を、room@server のように、入力してください。"
 
-#: ../src/dialogs.py:2488 ../src/groupchat_control.py:2093
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "グループチャットの JID に使えない文字が含まれています。"
 
-#: ../src/dialogs.py:2493 ../src/gui_interface.py:1941
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "グループチャットではありません"
 
-#: ../src/dialogs.py:2494 ../src/gui_interface.py:1942
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s はグループチャット名ではありません。"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "接続していないと、相手先を合わせることはできません。"
 
-#: ../src/dialogs.py:2539
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "サーバー"
 
-#: ../src/dialogs.py:2575
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "このアカウントはサーバに接続していません"
 
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "接続していないと、相手先に合わせることはできません。"
 
-#: ../src/dialogs.py:2601
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "同調"
 
-#: ../src/dialogs.py:2662
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "アカウント %s でチャットを開始する"
 
-#: ../src/dialogs.py:2664
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "チャットを開始する"
 
-#: ../src/dialogs.py:2665
+#: ../src/dialogs.py:2802
 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:2692 ../src/dialogs.py:3073 ../src/dialogs.py:3308
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "接続していません"
 
-#: ../src/dialogs.py:2693 ../src/dialogs.py:3074 ../src/dialogs.py:3309
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" に接続していることを確認してください。"
 
-#: ../src/dialogs.py:2702 ../src/dialogs.py:2705
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "JID が正しくありません"
 
-#: ../src/dialogs.py:2705
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "\"%s\" を解析できません。"
 
-#: ../src/dialogs.py:2714
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "接続しないと、パスワードは変更できません。"
 
-#: ../src/dialogs.py:2733
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "パスワードが正しくありません。"
 
-#: ../src/dialogs.py:2733
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "パスワードを入力してください。"
 
-#: ../src/dialogs.py:2737
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../src/dialogs.py:2738
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "ふたつの欄のパスワードは同一でなければなりません。"
 
-#: ../src/dialogs.py:2780 ../src/gui_interface.py:842 ../src/notify.py:273
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "新着メール"
 
-#: ../src/dialogs.py:2782 ../src/gui_interface.py:897 ../src/notify.py:266
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "ファイル転送の要求"
 
-#: ../src/dialogs.py:2784 ../src/gui_interface.py:804
-#: ../src/gui_interface.py:868 ../src/notify.py:268
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "ファイル転送のエラー"
 
-#: ../src/dialogs.py:2786 ../src/gui_interface.py:943
-#: ../src/gui_interface.py:966 ../src/gui_interface.py:983
-#: ../src/notify.py:270
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "ファイルの転送の完了"
 
-#: ../src/dialogs.py:2787 ../src/gui_interface.py:946 ../src/notify.py:271
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "ファイルの転送の中断"
 
-#: ../src/dialogs.py:2789 ../src/gui_interface.py:614 ../src/notify.py:275
-msgid "Groupchat Invitation"
-msgstr "グループチャットへの招待"
-
-#: ../src/dialogs.py:2992
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "アカウント %s で単発メッセージ"
 
-#: ../src/dialogs.py:2994
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "アカウント %s での単発メッセージ"
 
-#: ../src/dialogs.py:2996
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "単発メッセージ"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2999
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "%s を送信する"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3022
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3185
 #, 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:3129
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:3130
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:3189
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "%s の XML コンソール"
 
-#: ../src/dialogs.py:3191
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML コンソール"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "追加"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "変更"
 
-#: ../src/dialogs.py:3339
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "削除"
 
-#: ../src/dialogs.py:3368
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7721,171 +7993,180 @@ msgstr ""
 "b> を行うよう、求めています。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3386 ../src/dialogs.py:3461
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "変更"
 
-#: ../src/dialogs.py:3392
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3398
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "グループ"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3506
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "あなたを名簿に追加するよう、%s さんは私に勧めました。"
 
-#: ../src/dialogs.py:3520
-#, python-format
-msgid "Added  %s contacts"
-msgstr "%s の相手先を追加しました"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "%s の相手先を追加しました"
+msgstr[1] "%s の相手先を追加しました"
 
-#: ../src/dialogs.py:3557
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "%s の相手先を削除しました"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "%s の相手先を削除しました"
+msgstr[1] "%s の相手先を削除しました"
 
-#: ../src/dialogs.py:3597 ../src/dialogs.py:3774
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s の書庫の設定"
 
-#: ../src/dialogs.py:3637
+#: ../src/dialogs.py:3779
 msgid "Invalid expire value"
 msgstr "期限の値が正しくありません"
 
-#: ../src/dialogs.py:3638
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr "期限は正の整数でなければなりません。"
 
-#: ../src/dialogs.py:3685
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr "書式に誤りがあります"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr "誤りがあります"
 
-#: ../src/dialogs.py:3973
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "プライバシーリスト <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3977
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s のプライバシーリスト"
 
-#: ../src/dialogs.py:4044
+#: ../src/dialogs.py:4186
 #, 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:4049
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順位: %(order)s, 操作: %(action)s"
 
-#: ../src/dialogs.py:4100
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>規則の編集</b>"
 
-#: ../src/dialogs.py:4211
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>規則の追加</b>"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s のプライバシーリスト"
 
-#: ../src/dialogs.py:4312
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "プライバシーリスト"
 
-#: ../src/dialogs.py:4401
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "リスト名が正しくありません"
 
-#: ../src/dialogs.py:4402
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "プライバシーリストを作成するには、名前を入力しなければなりません。"
 
-#: ../src/dialogs.py:4434
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "グループチャットへの招待を受けました"
 
-#: ../src/dialogs.py:4437
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact さんがあなたを議論に参加するよう招待しています"
 
-#: ../src/dialogs.py:4439
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact さんがあなたをグループチャット %(room_jid)s へ招待しています"
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
 
-#: ../src/dialogs.py:4449
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "招待に応じますか ?"
 
-#: ../src/dialogs.py:4511
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "#PCKS12 形式のクライアント証明書の選択"
 
-#: ../src/dialogs.py:4521 ../src/dialogs.py:4563 ../src/dialogs.py:4619
-#: ../src/dialogs.py:4707
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../src/dialogs.py:4526
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "PKCS12 形式のファイル"
 
-#: ../src/dialogs.py:4553
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "サウンドの選択"
 
-#: ../src/dialogs.py:4568
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "WAV サウンド"
 
-#: ../src/dialogs.py:4606
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "画像の選択"
 
-#: ../src/dialogs.py:4624
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "画像"
 
-#: ../src/dialogs.py:4694
+#: ../src/dialogs.py:4847
 msgid "Choose Archive"
 msgstr "書庫の選択"
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4865
 msgid "Zip files"
 msgstr "Zip ファイル"
 
-#: ../src/dialogs.py:4738
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s が次のようになったとき:"
 
-#: ../src/dialogs.py:4740
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "%s の特別通知の追加"
 
-#: ../src/dialogs.py:4960
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7896,19 +8177,19 @@ msgstr ""
 "\n"
 "このチャットの認証文字列 (SAS)は <b>%(sas)s</b> です。"
 
-#: ../src/dialogs.py:4963
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "相手先の同一性を既に確認しています。"
 
-#: ../src/dialogs.py:4969 ../src/dialogs.py:5053
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "相手先の同一性を確認しました"
 
-#: ../src/dialogs.py:4975
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "再検証中..."
 
-#: ../src/dialogs.py:4980
+#: ../src/dialogs.py:5133
 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 "
@@ -7918,19 +8199,19 @@ msgstr ""
 "を送ることができることを確実にするため、その人が本人であることを検証する必要"
 "があります。次のボタンをクリックしてください。"
 
-#: ../src/dialogs.py:4983 ../src/dialogs.py:5034 ../src/dialogs.py:5047
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "相手先の同一性を確認していません"
 
-#: ../src/dialogs.py:4988
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "検証中..."
 
-#: ../src/dialogs.py:4999
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "相手先の同一性を確認しましたか ?"
 
-#: ../src/dialogs.py:5000
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7944,52 +8225,57 @@ msgstr ""
 "\n"
 "この接続の認証文字列は <b>%(sas)s</b> です。"
 
-#: ../src/dialogs.py:5001
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "遠くの相手先と話して、認証文字列(SAS)を確認しましたか ?"
 
-#: ../src/dialogs.py:5035
+#: ../src/dialogs.py:5189
 #, 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:5041
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "この相手先に対して GPG 鍵は割り当てられていません。そのため、メッセージは暗号"
 "化されません。 "
 
-#: ../src/dialogs.py:5048
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "この相手先に対して GPG 鍵が割り当てられています。しかし、<b>この鍵を信頼して"
 "いません</b>。メッセージは暗号化<b>されません</b>。鍵に信頼を与えるには GPG "
 "クライアントを使ってください。"
 
-#: ../src/dialogs.py:5054
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "この相手先に対して GPG 鍵が割り当てられています。その鍵を信頼して、メッセージ"
 "は暗号化されます。"
 
-#: ../src/dialogs.py:5119
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "音声とビデオ"
 
-#: ../src/dialogs.py:5121
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "音声"
 
-#: ../src/dialogs.py:5123
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "ビデオ"
 
-#: ../src/dialogs.py:5127
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7998,12 +8284,12 @@ msgstr ""
 "%(contact)s さんは、%(type)s でセッションを始めようとしています。呼び出しに応"
 "えますか ?"
 
-#: ../src/dialogs.py:5195
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
 #, python-format
 msgid "Certificate for account %s"
 msgstr "アカウント %s の証明書"
 
-#: ../src/dialogs.py:5195
+#: ../src/dialogs.py:5376
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -8042,37 +8328,42 @@ msgstr ""
 "<b>指紋</b>\n"
 "SHA1 指紋: %(sha1)s"
 
-#: ../src/dialogs.py:5229 ../src/dialogs.py:5246
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
 msgid "View cert..."
 msgstr "証明書を表示..."
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "クライアントの証明書"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "その他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "会議室(グループチャット)"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "接続しないと、サービスを見ることはできません"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "アカウント %s でサービス探索"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "サービス探索"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "サービスが見つかりません"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8080,94 +8371,94 @@ msgstr ""
 "あなたが入力したアドレスにサービスが見つからないか、または応答がありません。"
 "アドレスを確認し、もういちどお試しください。"
 
-#: ../src/disco.py:765 ../src/disco.py:1102
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "このサービスを見ることはできません"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 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:806 ../src/disco.py:816
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "サーバー名が正しくありません"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "アカウント %(account)s で %(address)s を眺める"
 
-#: ../src/disco.py:914
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "一覧 (_B)"
 
-#: ../src/disco.py:1103
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "このサービスには表示すべき項目がありません。"
 
-#: ../src/disco.py:1343
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "コマンド実行 (_E)"
 
-#: ../src/disco.py:1353 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "登録 (_g)"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "走査中 %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "ユーザー数"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "説明"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2477
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "既にブックマーク"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2478
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "グループチャット \"%s\" は既にブックマークにあります。"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2492
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "ブックマークが追加されました"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2493
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "ブックマークは、名簿の「アクション」メニューから管理できます。"
 
-#: ../src/disco.py:2055
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "継読中"
 
-#: ../src/disco.py:2063
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "ノード"
 
 # (Mako)pubsubのところ
-#: ../src/disco.py:2127
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "新しい投稿"
 
-#: ../src/disco.py:2133
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "継読 (_S)"
 
-#: ../src/disco.py:2139
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "継読の取り消し (_U)"
 
@@ -8221,17 +8512,19 @@ msgstr "python-dbus が必要です。"
 
 #: ../src/features_window.py:61 ../src/features_window.py:69
 #: ../src/features_window.py:73 ../src/features_window.py:77
-#: ../src/features_window.py:89 ../src/features_window.py:109
-#: ../src/features_window.py:113 ../src/features_window.py:117
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Windows ではこの機能は無効です。"
 
 #: ../src/features_window.py:62
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenGPG メッセージ暗号化"
 
 #: ../src/features_window.py:63
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "チャットメッセージを gpg 鍵で暗号化します。"
 
 #: ../src/features_window.py:64
@@ -8344,47 +8637,22 @@ msgid "Requires python2.5."
 msgstr "python2.5 が必要です。"
 
 #: ../src/features_window.py:94
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:95
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "$$ $$ で囲まれた LaTeX 表現を変換します。"
-
-#: ../src/features_window.py:96
-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 と ImageMagick) が必要です。詳細設定エディ"
-"タ 'use_latex' を「真」に設定しなければなりません。"
-
-#: ../src/features_window.py:97
-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 と ImageMagick) が必要です (どちらも "
-"MikTeX に含まれています)。 詳細設定エディタ 'use_latex' を「真」に設定しなけ"
-"ればなりません。"
-
-#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "全線暗号化"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "チャットのメッセージを終端間で暗号化します(E2EE)。"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "python-crypto が必要です。"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST 生成器"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8392,180 +8660,199 @@ msgstr ""
 "RST コードから XHTML 出力を生成します (http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html を参照してください)。"
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "python-docutils が必要です。"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "音声・ビデオチャットの可能性。"
 
-#: ../src/features_window.py:108
-msgid "Requires python-farsight and gstreamer-plugins-bad."
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Requires python-farstream and gstreamer-plugins-bad."
 msgstr "python-farsight と gstreamer-plugins-bad が必要です。"
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "UPnP-IGD"
 msgstr "UPnP-IGD"
 
-#: ../src/features_window.py:111
+#: ../src/features_window.py:107
 msgid "Ability to request your router to forward port for file transfer."
 msgstr "ファイル転送のフォワードポートのためのルーターの要求を可能にします。"
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:108
 msgid "Requires python-gupnp-igd."
 msgstr "python-gupnp-igd が必要です。"
 
-#: ../src/features_window.py:114
+#: ../src/features_window.py:110
 msgid "UPower"
 msgstr "UPower"
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
 msgid "Ability to disconnect properly just before suspending the machine."
 msgstr "コンピュータをサスペンドする直前に適切に切断するか。"
 
-#: ../src/features_window.py:116
+#: ../src/features_window.py:112
 msgid "Requires upower and python-dbus."
 msgstr "upower と python-dbus が必要です。"
 
-#: ../src/features_window.py:124
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "有効"
 
-#: ../src/features_window.py:131
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "機能"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "ファイル"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "時間"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "進捗"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "ファイル名: %s"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:400
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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:189 ../src/filetransfers_window.py:199
-#: ../src/history_manager.py:541
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "あなた"
 
-#: ../src/filetransfers_window.py:190
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "送信者: %s"
 
-#: ../src/filetransfers_window.py:191 ../src/filetransfers_window.py:637
-#: ../src/tooltips.py:743
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "受取人: "
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存場所: %s"
 
 # (Mako) とりあえず「受取人」で
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "受取人: %s"
 
-#: ../src/filetransfers_window.py:239
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "エラーメッセージ: %s"
 
-#: ../src/filetransfers_window.py:268
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
+
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "転送するファイルを選択..."
 
-#: ../src/filetransfers_window.py:284 ../src/tooltips.py:781
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "説明: "
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "このファイルにアクセスできません"
 
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "このファイルは別のプログラムが使用中です。"
 
-#: ../src/filetransfers_window.py:336 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "既存のファイル \"%s\" に上書きできない"
 
-#: ../src/filetransfers_window.py:337 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "この名前のファイルは既に存在し、かつ上書きの権限がありません。"
 
-#: ../src/filetransfers_window.py:354 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "そのファイルは既に存在しています"
 
-#: ../src/filetransfers_window.py:354 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:365 ../src/gtkgui_helpers.py:862
+#: ../src/filetransfers_window.py:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "ディレクトリ \"%s\" に書き込む権限がありません"
 
-#: ../src/filetransfers_window.py:366 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "このディレクトリにファイルを作成する権限がありません。"
 
-#: ../src/filetransfers_window.py:377
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "ファイルの保存..."
 
-#: ../src/filetransfers_window.py:397
+#: ../src/filetransfers_window.py:450
 #, python-format
 msgid "File: %s"
 msgstr "ファイル: %s"
 
-#: ../src/filetransfers_window.py:403
+#: ../src/filetransfers_window.py:456
 #, python-format
 msgid "Type: %s"
 msgstr "種類: %s"
 
-#: ../src/filetransfers_window.py:405
+#: ../src/filetransfers_window.py:458
 #, python-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ../src/filetransfers_window.py:406
+#: ../src/filetransfers_window.py:459
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s さんがファイルを転送したがっています:"
 
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "プロフィールを送信しています..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "ファイル転送のエラー"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:469
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8573,65 +8860,107 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:562
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/秒)"
 
-#: ../src/filetransfers_window.py:605 ../src/filetransfers_window.py:608
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "ファイルが正しくありません"
 
-#: ../src/filetransfers_window.py:605
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "ファイル: "
 
-#: ../src/filetransfers_window.py:609
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "空のファイルを転送することはできません"
 
-#: ../src/filetransfers_window.py:633 ../src/tooltips.py:733
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "名前: "
 
-#: ../src/filetransfers_window.py:635 ../src/tooltips.py:737
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "送信者: "
 
-#: ../src/filetransfers_window.py:797
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../src/gajim.py:194
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "メッセージ"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "感情アイコン (_E):"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "名簿にのみ表示する"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "詳細設定エディタ"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s 設定エラー"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "%s を調整"
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim には X server が必要です。終了します..."
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "PyGTK のインポートに失敗しました: %s"
 
-#: ../src/gajim.py:237
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim には PyGTK 2.16 以上が必要です"
 
-#: ../src/gajim.py:238
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim には PyGTK 2.16 またはそれ以上が必要です。終了します..."
 
-#: ../src/gajim.py:240
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim には GTK 2.16 以上が必要です"
 
-#: ../src/gajim.py:241
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim には GTK 2.16 またはそれ以上が必要です。終了します..."
 
-#: ../src/gajim.py:250
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim には pywin32 が必要です"
 
-#: ../src/gajim.py:251
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8640,74 +8969,75 @@ msgstr ""
 "システムに Pywin32 がインストールされているか確認してください。%s から入手で"
 "きます"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:367
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim は既に起動しています"
 
-#: ../src/gajim.py:368
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr "別の Gajim が既に起動しているようですそれでも起動しますか ?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "指定のコマンドに対するヘルプを表示します"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "コマンド"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "コマンドのヘルプを表示します"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "名簿ウィンドウの表示/非表示"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "次の保留イベントをポップアップウィンドウに表示します"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "名簿にある相手先をすべて表示します。それぞれの相手先は空行で区切られます"
 
-#: ../src/gajim-remote.py: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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "アカウント"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "指定されたアカウントの相手先のみ表示します"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "登録アカウントの一覧の表示します"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "アカウントの在席状況の変更します"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "在席状況"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:110
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -8717,11 +9047,18 @@ msgstr ""
 "away (離席中)、xa (不在)、dnd (邪魔しないで)、invisible (隠れ中)。\n"
 "設定されなければ、アカウントの以前の状況が使われます"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "メッセージ"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "状況メッセージ"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8730,19 +9067,20 @@ msgstr ""
 "合、\"sync with global status\" オプションが設定されているアカウントすべての"
 "在席状況を変更します。"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "アカウントの優先順位を変更します"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "優先順位"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "アカウントに設定したい優先順位"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:122
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -8750,25 +9088,25 @@ msgstr ""
 "アカウントの優先順位を変更します。アカウントが指定されない場合、\"sync with "
 "global status\" オプションの設定されたアカウントすべての優先順位を変更します"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "チャットのダイアログを表示し、相手先にメッセージを送信できます"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "チャットしたい相手先の JID"
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "指定した場合、相手先はこのアカウントの相手先一覧から選択します"
 
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 "メッセージの内容。アカウントを指定していなければなりません。そうでない場合は"
 "\"\"としなければなりません"
 
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:140
 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 "
@@ -8778,29 +9116,29 @@ msgstr ""
 "らもなくてもかまいません。 'アカウント' だけを設定して 'OpenPGP 鍵' を設定し"
 "たくない場合、'OpenPGP 鍵' は '' としてください。"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "メッセージの内容"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp 鍵"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "指定した場合、メッセージはこのアカウントを使って送られます"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8810,135 +9148,135 @@ msgstr ""
 "しなくてもかまいません。アカウント(account)だけを指定して'OpenPGP 鍵'を指定し"
 "たくない場合は、'OpenPGP 鍵'は単に '' としてください。"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "件名"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "メッセージの件名"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "参加しているグループチャットに新しいメッセージを送信します。"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "メッセージを受け取る談話室そのものの JID"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "相手先の詳細情報を取得します"
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "相手先の JID"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "アカウントの詳細情報を取得します"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "アカウント名"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "相手先にファイルを転送します"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "ファイル"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "ファイルの場所"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "指定した場合、このアカウントを使ってファイルを転送します"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "すべての設定項目とその値の一覧を表示します"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "項目 'key' の値に 'value' を設定します。"
 
 # (Mako)訳さずにそのままにしよう
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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.py:208
 msgid "Deletes a preference item"
 msgstr "設定項目を削除します"
 
 # (Mako)訳さずにそのままにしよう
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "削除する設定項目の名前"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim の設定の現在の状態を .config ファイルに書き出します"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "相手先を名簿から削除します"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "相手先を名簿に追加します"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "このアカウントに新しい相手先を追加します"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "現在の在席状況を返します (もしアカウントが指定されなければ、全体の在席状況を"
 "返します)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "現在の状況メッセージを返します (もしアカウントが指定されなければ、全体の状況"
 "メッセージを返します)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "未読メッセージ数を返します"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "'チャットを開始する' のダイアログを開きます"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "このアカウントでチャットを開始します"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "独自の XML を送信します"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "送信する XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8946,15 +9284,15 @@ msgstr ""
 "XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
 "されます"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "アバターを変更する"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "使いたい画像"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -8962,71 +9300,74 @@ msgstr ""
 "アバターを設定するアカウント。指定されない場合、アバターはすべてのアカウント"
 "に設定されます"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "xmpp:/ の URI を取り扱います"
 
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "取り扱う URI"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr "URI を取り扱うアカウント"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "メッセージの内容"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "談話室に参加します"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "談話室"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "談話室JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "ニックネーム"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "使いたいニックネーム"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "パスワード"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "談話室のパスワード"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 msgid "Account from which you want to enter the room"
 msgstr "談話室の参加に使うアカウント"
 
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Gajim が起動しているかチェックします"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "ipython ウィンドウの表示/非表示"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "引数 \"contact_jid\" がありません"
 
-#: ../src/gajim-remote.py:349
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -9035,15 +9376,15 @@ msgstr ""
 "'%s' は名簿にありません。\n"
 "メッセージを送るためのアカウントを指定してください。"
 
-#: ../src/gajim-remote.py:352
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "有効になっているアカウントがありません"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim が起動していないようです。そのため gajim-remote は使えません。"
 
-#: ../src/gajim-remote.py:432
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -9052,25 +9393,27 @@ msgstr ""
 "使い方: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "引数:"
 
-#: ../src/gajim-remote.py:440
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s は見つかりません"
 
-#: ../src/gajim-remote.py:446
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "使い方: %s コマンド [引数]\n"
 "コマンドは次のいずれか:\n"
 
-#: ../src/gajim-remote.py:515
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9079,7 +9422,7 @@ msgstr ""
 "引数が多すぎます。\n"
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9088,11 +9431,11 @@ msgstr ""
 "引数 \"%(arg)s\" が指定されていません。\n"
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
-#: ../src/gajim-remote.py:539
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "uri がありません"
 
-#: ../src/gajim-remote.py:541
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "uri が間違っています"
 
@@ -9118,216 +9461,221 @@ msgid "You cannot delete your current theme"
 msgstr "現在のテーマを削除することはできません"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "まず、現在のテーマとして別のものを選んでください。"
 
-#: ../src/groupchat_control.py:179 ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s さんは現在 %(new_nick)s さんと認識されました"
 
-#: ../src/groupchat_control.py:233
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "私信の送信に失敗しました"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:235
+#: ../src/groupchat_control.py:238
 #, 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:563
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "ニックネームの挿入"
 
 # (Mako) 語順が問題。コロンでごまかしてみる
-#: ../src/groupchat_control.py:746
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "会話中: "
 
-#: ../src/groupchat_control.py:748
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "会話中"
 
-#: ../src/groupchat_control.py:1225
+#: ../src/groupchat_control.py:1268
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s さんは題を %(subject)s に設定しました"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1243 ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "在室者の誰もがあなたのフルJID を知ることができます"
 
-#: ../src/groupchat_control.py:1246
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "談話室はメンバー以外にも見えます"
 
-#: ../src/groupchat_control.py:1248
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "談話室はメンバー以外には見えません"
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1293
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "談話室の構成の変更(プライバシー関連ではない)がありました"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "談話室の記録を取りはじめます"
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "談話室の記録を止めます"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "談話室は非匿名です"
 
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "談話室は半匿名です"
 
-#: ../src/groupchat_control.py:1264
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "談話室は完全匿名です"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s は退出しました (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1515
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "談話室の会話は記録されています"
 
-#: ../src/groupchat_control.py:1517
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "新しい談話室が作成されました"
 
-#: ../src/groupchat_control.py:1520
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "サーバーはあなたの談話室ニックネームを割り当て(または変更し)ました"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1526
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s は蹴り出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1529
+#: ../src/groupchat_control.py:1606
 #, 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:1538
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s は締め出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1541
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s は %(who)s: によって締め出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1552 ../src/groupchat_control.py:1656
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "あなたは %s と認識されました"
 
-#: ../src/groupchat_control.py:1610 ../src/groupchat_control.py:1615
-#: ../src/groupchat_control.py:1621
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s は退出しました (%(reason)s)"
 
-#: ../src/groupchat_control.py:1612
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "分掌を変更しました"
 
-#: ../src/groupchat_control.py:1617
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "談話室はメンバー制に変更されました"
 
-#: ../src/groupchat_control.py:1623
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "システムのシャットダウン"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1795
 #, 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:1710
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s さんの分掌は %(affiliation)s に設定されました"
 
 # (Mako)ここでの role は「役」
-#: ../src/groupchat_control.py:1725
+#: ../src/groupchat_control.py:1814
 #, 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:1729
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s さんの役は %(role)s に設定されました"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s さんが退出しました"
 
-#: ../src/groupchat_control.py:1764
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s さんが参加しました"
 
-#: ../src/groupchat_control.py:2019
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "本当にグループチャット \"%s\" から退出してもいいですか ?"
 
-#: ../src/groupchat_control.py:2021
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "このウィンドウを閉じると、このグループチャットから切断されます。"
 
-#: ../src/groupchat_control.py:2025 ../src/gui_interface.py:673
-#: ../src/gui_interface.py:1311 ../src/gui_interface.py:1351
-#: ../src/gui_interface.py:1392 ../src/message_window.py:224
-#: ../src/roster_window.py:2989 ../src/roster_window.py:3667
-#: ../src/roster_window.py:4473
-msgid "_Do not ask me again"
-msgstr "次回から質問しない (_D)"
-
-#: ../src/groupchat_control.py:2059
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "題の変更"
 
-#: ../src/groupchat_control.py:2060
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "新しい題を入力してください:"
 
-#: ../src/groupchat_control.py:2067
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "ニックネームの変更"
 
-#: ../src/groupchat_control.py:2068
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "使いたい新しいニックネームを入力してください:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "グループチャットの JID に使えない文字が含まれています。"
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2099
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "%s の閉鎖"
 
-#: ../src/groupchat_control.py:2100
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9335,22 +9683,22 @@ msgstr ""
 "この談話室を閉鎖しようとしています。\n"
 "下に理由を入力できます:"
 
-#: ../src/groupchat_control.py:2102
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "また、代替の談話室を入力することもできます:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2297
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "%s を蹴り出し"
 
-#: ../src/groupchat_control.py:2298 ../src/groupchat_control.py:2630
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "下に理由を書くことができます:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2629
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "%s を締め出し"
@@ -9373,65 +9721,59 @@ msgstr "バグを報告する (_R)"
 msgid "Details"
 msgstr "詳細"
 
-#. we talk about file
-#: ../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:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "ファイル読み込みエラー:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "ファイル解析エラー:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:392
+#: ../src/gtkgui_helpers.py:393
 #, 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:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim はデフォルトの Jabber クライアントではありません"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Gajim をデフォルトの Jabber クライアントにしますか ?"
 
-#: ../src/gtkgui_helpers.py:768
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを常にチェック"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "拡張はサポートされていません"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "画像の保存..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:131 ../src/gui_interface.py:295
-#: ../src/gui_interface.py:304 ../src/gui_interface.py:310
-#: ../src/gui_interface.py:313 ../src/gui_interface.py:316
-#: ../src/gui_interface.py:321
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "グループに参加できません"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9442,86 +9784,86 @@ msgstr ""
 "す。\n"
 "別のニックネームを下に入力してください:"
 
-#: ../src/gui_interface.py:135
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "衝突が生じたときはいつもこのニックネームを使う"
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "この申し込みを承認しますか ?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "アカウント %s への申し込みを承認しますか ?"
 
-#: ../src/gui_interface.py:157
+#: ../src/gui_interface.py:160
 #, 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:200 ../src/notify.py:279
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: ../src/gui_interface.py:284
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "談話室 %s に参加するにはパスワードが必要です。入力してください。"
 
-#: ../src/gui_interface.py:296
+#: ../src/gui_interface.py:299
 #, python-format
 msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "<b>%s</b> の人数の上限に達しています"
 
-#: ../src/gui_interface.py:305
+#: ../src/gui_interface.py:308
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "グループチャット <b>%s</b> から締め出されています。"
 
-#: ../src/gui_interface.py:311
+#: ../src/gui_interface.py:314
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "グループチャット <b>%s</b> は存在しません。"
 
-#: ../src/gui_interface.py:314
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "グループチャットの作成は制限されています。"
 
-#: ../src/gui_interface.py:317
+#: ../src/gui_interface.py:320
 #, python-format
 msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "登録したニックネームは、グループチャット <b>%s</b> で使われます。"
 
-#: ../src/gui_interface.py:322
+#: ../src/gui_interface.py:325
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "あなたはグループチャット %s のメンバー一覧にありません。"
 
-#: ../src/gui_interface.py:405 ../src/gui_interface.py:409
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "エラー %(code)s: %(msg)s"
 
-#: ../src/gui_interface.py:461 ../src/notify.py:281
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "在席通知申込"
 
-#: ../src/gui_interface.py:486
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "承認が得られました"
 
-#: ../src/gui_interface.py:487
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "相手先 %s さんは、あなたが在席状況を見ることを承認しました。"
 
-#: ../src/gui_interface.py:495
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "相手先 \"%s\" さんは、あなたからの申し込みを却下しました。"
 
-#: ../src/gui_interface.py:496
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9529,57 +9871,71 @@ msgstr ""
 "この相手先を常にオフラインとして見ることになります。\n"
 "相手先一覧から削除しますか ?"
 
-#: ../src/gui_interface.py:517 ../src/notify.py:283
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "在席通知の取り消し"
 
-#: ../src/gui_interface.py:528
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" との接続は確立できませんでした"
 
-#: ../src/gui_interface.py:626
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "Gajim は GPG エージェントを使用するよう設定されました。しかし、GPG エージェン"
 "トが起動していないか、あるいはパスフレーズが間違っています。\n"
 
-#: ../src/gui_interface.py:628 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "現在、OpenPGP 鍵を使わずに接続しています。"
 
-#: ../src/gui_interface.py:630
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "パスフレーズが違います"
 
-#: ../src/gui_interface.py:635
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG のパスフレーズが違います"
 
-#: ../src/gui_interface.py:648
+#: ../src/gui_interface.py:681
 msgid "Certificate Passphrase Required"
 msgstr "証明書のパスフレーズが必要です"
 
-#: ../src/gui_interface.py:649
+#: ../src/gui_interface.py:682
 #, python-format
 msgid "Enter the passphrase for the certificate for account %s"
 msgstr "アカウント %s の証明書のパスフレーズを入力してください。"
 
-#: ../src/gui_interface.py:671
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG 鍵に信用がありません"
 
-#: ../src/gui_interface.py:671
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "このチャットの暗号化に使った GPG 鍵には信用がありません。ほんとうにこのメッ"
 "セージを暗号化したいですか ?"
 
-#: ../src/gui_interface.py:684
+#: ../src/gui_interface.py:717
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
@@ -9587,29 +9943,29 @@ msgstr ""
 "Gnome Keyring はインストールされています。しかし、正しく起動できません(環境変"
 "数が正しく設定されていないようです)。"
 
-#: ../src/gui_interface.py:722
+#: ../src/gui_interface.py:755
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr "表示された web サイトから新しいトークンをコピー/ペーストしてください。"
 
-#: ../src/gui_interface.py:725
+#: ../src/gui_interface.py:758
 msgid "Oauth2 Credentials"
 msgstr "Oauth2 信任状"
 
-#: ../src/gui_interface.py:815
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s に新着メール"
 
-#: ../src/gui_interface.py:817
+#: ../src/gui_interface.py:858
 #, 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:830
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9624,50 +9980,65 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:895
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: ../src/gui_interface.py:967
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "ファイルの転送の完了"
+
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(name)s さんからファイル %(filename)s を受け取りました。"
 
-#. ft stopped
-#: ../src/gui_interface.py:971
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s さんからのファイル %(filename)s の転送を中断しました。"
 
-#: ../src/gui_interface.py:984
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "%(name)s さんからのファイル %(filename)s の転送を中断しました。"
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s さんへファイル %(filename)s を送りました。"
 
-#. ft stopped
-#: ../src/gui_interface.py:988
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(name)s さんへのファイル %(filename)s の転送を中断しました。"
 
-#: ../src/gui_interface.py:1063
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "%(name)s さんへのファイル %(filename)s の転送を中断しました。"
+
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "メッセージを復号できません"
 
-#: ../src/gui_interface.py:1075
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "ユーザー名の重複"
 
-#: ../src/gui_interface.py:1076
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "ローカルのアカウントの新しいユーザー名を入力してください"
 
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: ../src/gui_interface.py:1092
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9676,20 +10047,20 @@ msgstr ""
 "てください"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1137
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s さんがファイルを音声チャットを始めたがっています。"
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "音声チャットの要求"
 
-#: ../src/gui_interface.py:1227
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "SSL 証明書の検証エラー"
 
-#: ../src/gui_interface.py:1228
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9699,15 +10070,20 @@ msgstr ""
 "jabber サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/gui_interface.py:1237
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "この証明書のこのエラーを無視します。"
 
-#: ../src/gui_interface.py:1262
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL 証明書の検証"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL 証明書エラー"
 
-#: ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9724,34 +10100,7 @@ msgstr ""
 "\n"
 "それでも接続して、証明書の指紋を更新しますか ?"
 
-#: ../src/gui_interface.py:1302 ../src/gui_interface.py:1346
-#: ../src/gui_interface.py:1388
-msgid "Insecure connection"
-msgstr "安全でない接続"
-
-#: ../src/gui_interface.py:1303
-#, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) with an "
-"insecure connection. This means all your conversations will be exchanged "
-"unencrypted. This type of connection is really discouraged.\n"
-"Are you sure you want to do that?"
-msgstr ""
-"安全でない接続でアカウント %(account)s (サーバー %(server)s) に接続しようとし"
-"ています。これは、すべての会話が暗号化されずに交わされること意味します。この"
-"タイプの接続はまったくおすすめしません。\n"
-"あなたがやりたいことですか ?"
-
-#: ../src/gui_interface.py:1309 ../src/gui_interface.py:1350
-#: ../src/gui_interface.py:1391
-msgid "Yes, I really want to connect insecurely"
-msgstr "はい。安全でないまま接続したいです"
-
-#: ../src/gui_interface.py:1310
-msgid "Gajim will NOT connect unless you check this box"
-msgstr "このボックスにチェックしなければ、Gajim は接続しません"
-
-#: ../src/gui_interface.py:1347
+#: ../src/gui_interface.py:1447
 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?"
@@ -9759,7 +10108,7 @@ msgstr ""
 "安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
 "インストールすべきです。あなたがやりたいことですか ?"
 
-#: ../src/gui_interface.py:1389
+#: ../src/gui_interface.py:1489
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -9768,11 +10117,11 @@ msgstr ""
 "りたいことですか ?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1898 ../src/gui_interface.py:1921
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "感情アイコンは無効"
 
-#: ../src/gui_interface.py:1899
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9780,7 +10129,7 @@ msgstr ""
 "指定された感情アイコンのテーマは見つかりません。そのため、感情アイコンは無効"
 "です。"
 
-#: ../src/gui_interface.py:1922
+#: ../src/gui_interface.py:2019
 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 "
@@ -9790,86 +10139,89 @@ msgstr ""
 "ルの書式を更新する必要があるかも知れません。詳しくは http://trac.gajim.org/"
 "wiki/Emoticons をご覧ください。"
 
-#: ../src/gui_interface.py:1966 ../src/roster_window.py:3834
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2353
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: ../src/gui_interface.py:2915
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "パスフレーズが必要です"
 
-#: ../src/gui_interface.py:2916
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "鍵ID %(keyid)s (アカウント %(account)s) の GPG 鍵のパスフレーズを入力してくだ"
 "さい。"
 
-#: ../src/gui_interface.py:2930
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG 鍵は期限切れです"
 
-#: ../src/gui_interface.py:2931
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "GPG 鍵は有効期限が切れています。OpenPGP なしに %s に接続します。"
 
 #. ask again
-#: ../src/gui_interface.py:2940
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "パスフレーズが間違っています"
 
-#: ../src/gui_interface.py:2941
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "GPG のパスフレーズをもういちど入力するか、または「中止」を押してください。"
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "新しいグループチャット (_N)"
 
-#: ../src/gui_menu_builder.py:420
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "私はあなたを名簿に追加したいと思っています"
 
-#: ../src/history_manager.py:116
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "ディレクトリ %s を作ります"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "履歴記録データベースが見つかりません"
 
-#. holds jid
-#: ../src/history_manager.py:156
-msgid "Contacts"
-msgstr "相手先"
-
 #. holds time
-#: ../src/history_manager.py:169 ../src/history_manager.py:213
-#: ../src/history_window.py:99
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "日付"
 
 #. holds nickname
-#: ../src/history_manager.py:176 ../src/history_manager.py:232
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. holds message
-#: ../src/history_manager.py:185 ../src/history_manager.py:220
-#: ../src/history_window.py:107
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "メッセージ"
 
 #. holds subject
-#: ../src/history_manager.py:193 ../src/history_manager.py:226
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "題"
 
-#: ../src/history_manager.py:252
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9877,7 +10229,7 @@ msgstr ""
 "データベースを消去しますか ? (Gajim が起動している場合、まったくお勧めできま"
 "せん)"
 
-#: ../src/history_manager.py:254
+#: ../src/history_manager.py:264
 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 "
@@ -9891,101 +10243,105 @@ msgstr ""
 "\n"
 "YES をクリックした場合、しばらくお待ちください..."
 
-#: ../src/history_manager.py:259
+#: ../src/history_manager.py:269
 msgid "Database Cleanup"
 msgstr "データベースの掃除"
 
-#: ../src/history_manager.py:477
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "履歴記録を書き出しています..."
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s 、%(who)s さんは言いました: %(message)s\n"
 
-#: ../src/history_manager.py:592
+#: ../src/history_manager.py:602
 #, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
 msgstr "本当に、%(jid)s の記録を削除してもいいですか ?"
 
-#: ../src/history_manager.py:596
+#: ../src/history_manager.py:606
 msgid "Do you really want to delete logs of the selected contacts?"
 msgstr "本当に、選択した相手先の記録を削除してもいいですか ?"
 
-#: ../src/history_manager.py:598 ../src/history_manager.py:637
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "これは不可逆的な操作です。"
 
-#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
 msgid "Deletion Confirmation"
 msgstr "削除の確認"
 
-#: ../src/history_manager.py:634
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "本当に、選択したメッセージを削除してもいいですか ?"
 msgstr[1] "本当に、選択したメッセージを削除してもいいですか ?"
 
-#: ../src/history_window.py:306
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "%s さんとの会話の履歴"
 
-#: ../src/history_window.py:356
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "ディスクのエラー"
 
-#: ../src/history_window.py:444
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s さんは現在、%(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:455
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "エラー: %s"
 
-#: ../src/history_window.py:457
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "エラー"
 
-#: ../src/history_window.py:459
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "現在の状況: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:462
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "現在の状況: %(status)s"
 
-#: ../src/htmltextview.py:522
+#: ../src/htmltextview.py:523
 #, fuzzy
 msgid "Loading"
 msgstr "読み込み中"
 
-#: ../src/message_window.py:222
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr "コンピュータを終了しています"
+
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "タブを閉じようとしています"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "本当にそれらをすべて閉じてもいいですか ?"
 
-#: ../src/message_window.py:497
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "チャット"
 
-#: ../src/message_window.py:499
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "グループチャット"
 
-#: ../src/message_window.py:501
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "個人チャット"
 
-#: ../src/message_window.py:507
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "メッセージ"
 
@@ -9997,48 +10353,53 @@ msgstr "- メッセージは記録されます"
 msgid "- messages will not be logged"
 msgstr "- メッセージは記録されません"
 
-#: ../src/notify.py:322
+#: ../src/notify.py:324
 msgid "Ignore"
 msgstr "無視する"
 
-#: ../src/plugins/gui.py:68
+#: ../src/plugins/gui.py:82
 msgid "Plugin"
 msgstr "プラグイン"
 
-#: ../src/plugins/gui.py:162
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "%s を締め出し"
+
+#: ../src/plugins/gui.py:209
 msgid "Plugin failed"
 msgstr "プラグインに失敗しました"
 
-#: ../src/plugins/gui.py:206
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr "プラグインを正しく削除することができません"
 
 #. members not safe
-#: ../src/plugins/gui.py:214 ../src/plugins/pluginmanager.py:519
-#: ../src/plugins/pluginmanager.py:527
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
 msgid "Archive is malformed"
 msgstr "書庫の形式が正しくありません"
 
-#: ../src/plugins/gui.py:237 ../src/plugins/gui.py:245
-#: ../src/plugins/pluginmanager.py:535
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
 msgid "Plugin already exists"
 msgstr "プラグインは既に存在しています"
 
-#: ../src/plugins/gui.py:237
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr "上書きしますか ?"
 
-#: ../src/plugins/gui.py:266
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "調整"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:505 ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
 msgid "Archive corrupted"
 msgstr "書庫が壊れています"
 
-#: ../src/plugins/pluginmanager.py:507
+#: ../src/plugins/pluginmanager.py:514
 msgid "Archive empty"
 msgstr "書庫が空です"
 
@@ -10046,102 +10407,104 @@ msgstr "書庫が空です"
 msgid "Retrieving profile..."
 msgstr "プロフィールを取得中..."
 
-#: ../src/profile_window.py:125 ../src/roster_window.py:3184
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "ファイルが空です"
 
-#: ../src/profile_window.py:128 ../src/roster_window.py:3187
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "ファイルがありません"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:142 ../src/profile_window.py:158
-#: ../src/roster_window.py:3189 ../src/roster_window.py:3200
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "画像を読み込めませんでした"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "日付の書式が正しくありません"
 
-#: ../src/profile_window.py:230
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日付の書式は YYYY-MM-DD でなければなりません"
 
-#: ../src/profile_window.py:284
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "情報を受信しました"
 
-#: ../src/profile_window.py:362
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "接続しないと、情報を公開できません。"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "プロフィールを送信しています..."
 
-#: ../src/profile_window.py:394
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "情報は公開されません"
 
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard の公開に失敗しました"
 
-#: ../src/profile_window.py:402
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "個人情報の公開する際にエラーが発生しました。時間をおいて再度試みてください。"
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1031
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "統合アカウント"
 
-#: ../src/roster_window.py:1999
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "承認が送信されました"
 
-#: ../src/roster_window.py:2000
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "現在 \"%s\" さんはあなたの在席状況を知ることができます。"
 
-#: ../src/roster_window.py:2023
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "在席通知の申し込みを送信しました"
 
-#: ../src/roster_window.py:2024
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "\"%s\" さんがこの申し込みを承認したら、相手先の在席状況を知ることができます。"
 
-#: ../src/roster_window.py:2038
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "承認が取り消されました"
 
-#: ../src/roster_window.py:2039
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" さんは常にあなたをオフラインとして見ることになります。"
 
-#: ../src/roster_window.py:2066
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG は使用できません"
 
-#: ../src/roster_window.py:2067
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "OpenPGP なしに、%s さんに接続します。"
 
-#: ../src/roster_window.py:2274 ../src/roster_window.py:3764
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "一つ以上のグループチャットに参加中です。"
 
-#: ../src/roster_window.py:2275 ../src/roster_window.py:3765
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10149,37 +10512,37 @@ msgstr ""
 "在席状況を「隠れ中」にすると、グループチャットから退出することになります。ほ"
 "んとうに「隠れ中」にしますか ?"
 
-#: ../src/roster_window.py:2301
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "不揃い"
 
-#: ../src/roster_window.py:2367
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "本当に Gajim を終了しますか ?"
 
-#: ../src/roster_window.py:2368
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "本当に Gajim を終了してもいいですか ?"
 
-#: ../src/roster_window.py:2369
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "常に Gajim を終了する"
 
-#: ../src/roster_window.py:2455
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "ファイルの転送を実行中です"
 
-#: ../src/roster_window.py:2456
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "いま終了すると、転送中のファイルは中断されます。それでも終了しますか?"
 
-#: ../src/roster_window.py:2487 ../src/roster_window.py:2903
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "未読のメッセージがあります"
 
-#: ../src/roster_window.py:2488
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10187,37 +10550,37 @@ msgstr ""
 "履歴が有効になっていて、かつ相手先が名簿にあれば、メッセージは後で読むことが"
 "できます。"
 
-#: ../src/roster_window.py:2904
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "この中継先を削除する前に、それらを読まなければなりません。"
 
-#: ../src/roster_window.py:2907
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "中継先 \"%s\" を削除します"
 
-#: ../src/roster_window.py:2908
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "この中継先をとおして相手先にメッセージを送受信することはできません。"
 
-#: ../src/roster_window.py:2911
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "中継先は削除されます"
 
-#: ../src/roster_window.py:2916
+#: ../src/roster_window.py:3001
 #, 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:2984
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "相手先を遮断しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:2986
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10226,56 +10589,56 @@ msgstr ""
 "ん。"
 
 #. it's jid
-#: ../src/roster_window.py:3076
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "相手先の名前を変更"
 
-#: ../src/roster_window.py:3077
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "相手先 %s さんの新しいニックネームを入力してください"
 
-#: ../src/roster_window.py:3084
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "グループの名前変更"
 
-#: ../src/roster_window.py:3085
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "グループ %s の新しい名前を入力してください"
 
-#: ../src/roster_window.py:3130
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: ../src/roster_window.py:3131
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "名簿からグループ %s を削除しますか ?"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "名簿のこのグループのすべての相手先も削除します"
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP 鍵の割り当て"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "相手先に適用する鍵を選択してください"
 
-#: ../src/roster_window.py:3574
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "相手先 \"%s\" さんを名簿から削除します"
 
-#: ../src/roster_window.py:3576
+#: ../src/roster_window.py:3637
 #, 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:3581
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10284,11 +10647,11 @@ msgstr ""
 "を常にオフラインとして見ることになります。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3587
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "続けますか ?"
 
-#: ../src/roster_window.py:3591
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10296,16 +10659,16 @@ msgstr ""
 "この相手先を名簿から削除すると、デフォルトで在席通知の承認も取り消します。相"
 "手先はあなたを常にオフラインとして見ることになります。"
 
-#: ../src/roster_window.py:3594
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "削除後も、この相手先に自分の在席状況を知らせる"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3598
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "相手先は名簿から削除されました"
 
-#: ../src/roster_window.py:3603
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10315,12 +10678,13 @@ msgstr ""
 "を名簿から削除すると、在席通知の承認も取り消します。相手先はあなたを常にオフ"
 "ラインとして見ることになります。"
 
-#: ../src/roster_window.py:3661
+#: ../src/roster_window.py:3722
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "独自の在席状況を送信しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:3663
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10330,32 +10694,33 @@ msgstr ""
 "が在席状況を変更するまでの間です。その後はあなたの全体の在席状況を見ることに"
 "なります。"
 
-#: ../src/roster_window.py:3682
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "アカウントがありません"
 
-#: ../src/roster_window.py:3683
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr "相手先とチャットを開始する前に、アカウントを作成しなければなりません。"
 
-#: ../src/roster_window.py:4373
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "サーバーはメタ相手先の保存をサポートしていません"
 
-#: ../src/roster_window.py:4375
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "サーバーはメタ相手先の情報の保存をサポートしていません。したがってその情報は"
 "次の接続の際には失われています。"
 
-#: ../src/roster_window.py:4467
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "メタ相手先を作成しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:4469
+#: ../src/roster_window.py:4552
 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 "
@@ -10365,29 +10730,29 @@ msgstr ""
 "人物が複数の Jabber アカウントや中継先アカウントを持っているときに使用しま"
 "す。"
 
-#: ../src/roster_window.py:4590
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "ファイルの URI が正しくありません:"
 
-#: ../src/roster_window.py:4602
+#: ../src/roster_window.py:4685
 #, 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:4737
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "%s を %s に送信"
 
-#: ../src/roster_window.py:4748
+#: ../src/roster_window.py:4831
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s を優先の相手先とする"
 
 # (Mako) よくわからない。Make [c_source.get_shown_name()] and [c_dest.get_shown_name()] metacontacts
-#: ../src/roster_window.py:4751
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "%s と %s をメタ相手先とする"
@@ -10397,131 +10762,131 @@ msgstr "%s と %s をメタ相手先とする"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5190 ../src/roster_window.py:5244
-#: ../src/roster_window.py:5253 ../src/statusicon.py:264
-#: ../src/statusicon.py:311 ../src/statusicon.py:317
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "アカウント %s で"
 
 #. add
-#: ../src/roster_window.py:5260
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "アカウント %s に対して"
 
 #. disco
-#: ../src/roster_window.py:5265
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "アカウント %s で"
 
-#: ../src/roster_window.py:5304 ../src/statusicon.py:327
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "ブックマークの管理 (_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "アカウント %s の"
 
-#: ../src/roster_window.py:5365
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "アカウント %s について"
 
-#: ../src/roster_window.py:5425 ../src/roster_window.py:5533
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "状況メッセージの変更 (_C)"
 
-#: ../src/roster_window.py:5458
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "聴いている楽曲名を公開"
 
-#: ../src/roster_window.py:5460
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "位置情報を公開"
 
-#: ../src/roster_window.py:5463
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "サービスの調整..."
 
 # (Mako)ここでは「復元」の意味か
-#: ../src/roster_window.py:5611
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "ウィンドウをすべて復元 (_M)"
 
-#: ../src/roster_window.py:5621 ../src/roster_window.py:5794
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "メッセージの一斉送信 (_e)"
 
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "すべてのユーザーに"
 
-#: ../src/roster_window.py:5633
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "オンラインのすべてのユーザーに"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5814
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "相手先の管理 (_M)"
 
 #. Edit Groups
-#: ../src/roster_window.py:5823
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "グループの編集 (_G)"
 
 #. Send single message
-#: ../src/roster_window.py:5878
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "単発メッセージの送信"
 
 #. Execute Command
-#: ../src/roster_window.py:5925
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "コマンドを実行する..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5935
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "中継先の管理 (_M)"
 
 #. Modify Transport
-#: ../src/roster_window.py:5944
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "中継先の変更 (_M)"
 
 #. Rename
-#: ../src/roster_window.py:5954
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
 # (Mako)ここでは「復元」の意味か
-#: ../src/roster_window.py:6014
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "ウィンドウの復元 (_M)"
 
-#: ../src/roster_window.py:6023
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "再接続 (_R)"
 
-#: ../src/roster_window.py:6030
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "切断 (_D)"
 
 #. History manager
-#: ../src/roster_window.py:6119
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "履歴マネージャ"
 
-#: ../src/roster_window.py:6130
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "新しいグループチャットに参加 (_J)"
 
-#: ../src/roster_window.py:6349
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "状況メッセージを変更する..."
 
@@ -10538,15 +10903,11 @@ msgstr "ファイルを受ける際のエラー"
 msgid "No result"
 msgstr "見つかりません"
 
-#: ../src/session.py:97
-msgid "Disk WriteError"
-msgstr "ディスクの書き込みエラー"
-
-#: ../src/session.py:411 ../src/session.py:470
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "セッションのオプションを確認する"
 
-#: ../src/session.py:413
+#: ../src/session.py:411
 #, python-format
 msgid ""
 "The remote client wants to negotiate a session with these features:\n"
@@ -10561,7 +10922,7 @@ msgstr ""
 "\n"
 "これらのオプションを受け付けますか ?"
 
-#: ../src/session.py:472
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10576,150 +10937,150 @@ msgstr ""
 "\n"
 "セッションを続けますか ?"
 
-#: ../src/session.py:475
+#: ../src/session.py:474
 msgid "Always accept for this contact"
 msgstr "この相手先を常に受け入れるかどうか"
 
-#: ../src/statusicon.py:228
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "状況メッセージを変更する (_C)..."
 
-#: ../src/statusicon.py:342
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "名簿を閉じる (_R)"
 
-#: ../src/statusicon.py:353
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "このメニューを表示しない"
 
-#: ../src/tooltips.py:393 ../src/tooltips.py:605
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:396 ../src/tooltips.py:609
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "リソース: "
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "このグループチャットの %(owner_or_admin_or_member)s "
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr "遮断しています]"
 
-#: ../src/tooltips.py:507
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr "[最小化しています]"
 
-#: ../src/tooltips.py:522 ../src/tooltips.py:778
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "在席状況: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "最近の在席状況: %s"
 
-#: ../src/tooltips.py:568
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " %s から"
 
-#: ../src/tooltips.py:586
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "接続中"
 
-#: ../src/tooltips.py:588
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "切断中"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:616
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "在席通知の承認: "
 
-#: ../src/tooltips.py:626
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr " %s から操作のない状態"
 
-#: ../src/tooltips.py:648
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "%s 間、操作のない状態"
 
-#: ../src/tooltips.py:699
-#, python-format
-msgid "Mood: %s"
-msgstr "気分: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "気分:"
 
-#: ../src/tooltips.py:703
-#, python-format
-msgid "Activity: %s"
-msgstr "動向: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "動向:"
 
-#: ../src/tooltips.py:707
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "楽曲: %s"
 
-#: ../src/tooltips.py:711
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "位置: %s"
 
-#: ../src/tooltips.py:736
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "ダウンロード"
 
-#: ../src/tooltips.py:742
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "アップロード"
 
-#: ../src/tooltips.py:749
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "種類: "
 
-#: ../src/tooltips.py:753
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "転送:"
 
-#: ../src/tooltips.py:756 ../src/tooltips.py:777
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "開始していません"
 
-#: ../src/tooltips.py:760
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "停止しています"
 
-#: ../src/tooltips.py:762 ../src/tooltips.py:765
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "完了しました"
 
-#: ../src/tooltips.py:769
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "一時停止しました"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:773
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "滞っています"
 
-#: ../src/tooltips.py:775
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "転送しています"
 
-#: ../src/tooltips.py:813
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "このサービスは、詳細情報の返答がありません"
 
-#: ../src/tooltips.py:816
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10727,36 +11088,32 @@ msgstr ""
 "このサービスは詳細情報を返答することができません。\n"
 "古いか、または壊れています"
 
-#: ../src/upower_listener.py:31
-msgid "Machine going to sleep"
-msgstr "コンピュータを終了しています"
-
-#: ../src/vcard.py:285
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:310
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "%s から"
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>役:</b>"
 
-#: ../src/vcard.py:371
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>分掌:</b>"
 
-#: ../src/vcard.py:379
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10764,7 +11121,7 @@ msgstr ""
 "この相手先はあなたの在席情報に関心があります。しかし、あなたはこの相手先の在"
 "席情報に関心がありません。"
 
-#: ../src/vcard.py:381
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10772,29 +11129,212 @@ msgstr ""
 "あなたは相手先の在席情報に関心があります。しかし、相手先はあなたの在席情報に"
 "関心がありません。"
 
-#: ../src/vcard.py:383
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr "あなたと相手先は相互の在席情報に関心があります。"
 
 #. None
-#: ../src/vcard.py:385
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "あなたも相手先も相互の在席情報に関心がありません。"
 
-#: ../src/vcard.py:392
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "あなたからの在席通知の申し込みに対する相手先からの回答を待っています。"
 
-#: ../src/vcard.py:394
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "保留中の在席通知の申し込みはありません。"
 
-#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " リソース。優先順位は "
 
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "相手先のプロフィールを表示する (Ctrl+I)"
+
+#~ msgid "label"
+#~ msgstr "ラベル"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "自分の在席状況を見られることを許可する (_A)"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "名簿に相手先の動向を表示する (_a)"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "名簿に相手先の聴いている楽曲を表示する (_t)"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "名簿に相手先の気分を表示する (_o)"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "チェックをつけると、Gajim は名簿ウィンドウに相手先の動向を表示します"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "チェックをつけると、Gajim は名簿ウィンドウに相手先の位置情報を表示します"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "チェックをつけると、Gajim は名簿ウィンドウに相手先の聴いている楽曲を表示し"
+#~ "ます"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim インスタントメッセンジャ"
+
+#~ msgid "English"
+#~ msgstr "英語"
+
+#~ msgid "Belarusian"
+#~ msgstr "ベラルーシ語"
+
+#~ msgid "Bulgarian"
+#~ msgstr "ブルガリア語"
+
+#~ msgid "Breton"
+#~ msgstr "ブルトン語"
+
+#~ msgid "Czech"
+#~ msgstr "チェコ語"
+
+#~ msgid "German"
+#~ msgstr "ドイツ語"
+
+#~ msgid "Greek"
+#~ msgstr "ギリシア語"
+
+#~ msgid "British"
+#~ msgstr "英語 (イギリス)"
+
+#~ msgid "Esperanto"
+#~ msgstr "エスペラント"
+
+#~ msgid "Spanish"
+#~ msgstr "スペイン語"
+
+#~ msgid "Basque"
+#~ msgstr "バスク語"
+
+#~ msgid "French"
+#~ msgstr "フランス語"
+
+#~ msgid "Croatian"
+#~ msgstr "クロアチア語"
+
+#~ msgid "Italian"
+#~ msgstr "イタリア語"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "ノルウェー語 (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "オランダ語"
+
+#~ msgid "Norwegian"
+#~ msgstr "ノルウェー語"
+
+#~ msgid "Polish"
+#~ msgstr "ポーランド語"
+
+#~ msgid "Portuguese"
+#~ msgstr "ポルトガル語"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "ポルトガル語 (ブラジル)"
+
+#~ msgid "Russian"
+#~ msgstr "ロシア語"
+
+#~ msgid "Serbian"
+#~ msgstr "セルビア語"
+
+#~ msgid "Slovak"
+#~ msgstr "スロバキア語"
+
+#~ msgid "Swedish"
+#~ msgstr "スウェーデン語"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "中国語 (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "スペルチェックの言語"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "python-farsight が必要です。"
+
+#~ 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 ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr "LaTeX の数式表示のサイズ。高い値ほど大きくなります。"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "接続を確認するか、または後で再度試してください"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "\"%(command)s\" の実行中にエラー: %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "エラー: 読み込みモードで %s を開けません"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "ポート %s を開けません。"
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr "別の Gajim が起動しているようです。ファイル転送は中止されました。"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "$$ $$ で囲まれた LaTeX 表現を変換します。"
+
+#~ 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 と ImageMagick) が必要です。詳細設定エ"
+#~ "ディタ 'use_latex' を「真」に設定しなければなりません。"
+
+#~ 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 と ImageMagick) が必要です (どちらも "
+#~ "MikTeX に含まれています)。 詳細設定エディタ 'use_latex' を「真」に設定しな"
+#~ "ければなりません。"
+
+#~ msgid "Contacts"
+#~ msgstr "相手先"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "ディスクの書き込みエラー"
+
+#~ msgid "Mood: %s"
+#~ msgstr "気分: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "動向: %s"
+
 #~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 #~ msgstr ""
 #~ "pybonjour が必要です ( http://o2s.csail.mit.edu/o2s-wiki/pybonjour )。"
diff --git a/po/kk.po b/po/kk.po
index 4cf99a1e7..03066c268 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim.trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-03 14:34+0600\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2011-02-03 14:51+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -20,484 +20,523 @@ msgstr ""
 "X-Poedit-Country: KAZAKHSTAN\n"
 
 #: ../data/gui/account_context_menu.ui.h:1
-#: ../data/gui/roster_window.ui.h:7
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "Қа_лып-күй"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Жеке әрекеттер"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Чатты бастау..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Чат _бөлмесіне кіру..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 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:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "Қы_зметтерді қарап шығу"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "К_оманда орындау..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "Тіркелгіні тү_зету"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "Gmail е-жәшігін а_шу"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Жеке әрекеттер"
-
-#: ../data/gui/account_context_menu.ui.h:8
-#: ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Чатты бастау..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "Қа_лып-күй"
+msgid "_Modify Account"
+msgstr "Тіркелгіні тү_зету"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Тіркелгілерді жасау шебері"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Сервермен байланыс орнату</b>\n"
-"\n"
-"Күте тұрыңыз..."
+"Jabber желісіне байланыс орнату үшін сізде\n"
+"тіркелгіңіз болуы керек."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "I already have an account I want to _use"
+msgstr "Менде қолданғ_ым келетін тіркелгім бар"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "Жаңа ті_ркелгіні жасауды қалаймын"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Төмендегі нұсқалардың біреуін таңдаңыз:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Сізде бар тіркелгі үшін ақпаратты толтырыңыз</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Серверді таңдаңыз</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Пароль:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Бұл сертификатты сенімділер тізіміне қосу.\n"
-"Сертификаттың SHA1 баспасы:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Пар_ольді сақтау"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Анони_мды аутентификация"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Белгіленген болса, Gajim бұл тіркелгі үшін парольді сақтап отырады"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Аяқтау басқан кезде, байланыс орнату"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Тіркелгілерді жасау шебері"
+msgid "Anon_ymous authentication"
+msgstr "Анони_мды аутентификация"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "Менде қолданғ_ым келетін тіркелгім бар"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Серверді таңдаңыз</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "Жаңа ті_ркелгіні жасауды қалаймын"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../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 бұл тіркелгі үшін парольді сақтап отырады"
+msgid "Prox_y:"
+msgstr "Прокс_и:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 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: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:3622
-#: ../src/config.py:3697
-#: ../src/dialogs.py:312
-#: ../src/dialogs.py:314
-#: ../src/dialogs.py:520
-#: ../src/dialogs.py:533
-#: ../src/roster_window.py:3047
-#: ../src/roster_window.py:3053
-#: ../src/roster_window.py:3058
-msgid "None"
-msgstr "Ешнәрсе"
+msgid "Use custom hostname/port"
+msgstr "Пайдаланушы хост аты/порт қолдану"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Прокс_и:"
+msgid "_Hostname:"
+msgstr "_Хост аты:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Пар_ольді сақтау"
+msgid "_Port:"
+msgstr "_Порт:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Мен қосылғанда, профайлымды орнату"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "Кеңейтіл_ген"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Пайдаланушы хост аты/порт қолдану"
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Jabber желісіне байланыс орнату үшін сізде\n"
-"тіркелгіңіз болуы керек."
+"Бұл сертификатты сенімділер тізіміне қосу.\n"
+"Сертификаттың SHA1 баспасы:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Аяқтау"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Хост аты:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Сервермен байланыс орнату</b>\n"
+"\n"
+"Күте тұрыңыз..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Аяқтау басқан кезде, байланыс орнату"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "_Password:"
-msgstr "_Пароль:"
+msgid "Set my profile when I connect"
+msgstr "Мен қосылғанда, профайлымды орнату"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "_Finish"
+msgstr "_Аяқтау"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../data/gui/accounts_window.ui.h:1
-#: ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Таңдамалы</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ешнәрсе"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Тіркелгілер"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Жеке ақпарат</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Қосу"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Прокси</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Өшіру"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Күйге сә_йкес"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Аты_н ауыстыру"
 
-#: ../data/gui/accounts_window.ui.h:6
-#: ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Тіркелгі"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Іске қ_осу"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Тіркелгілер"
+msgid "Anonymous authentication"
+msgstr "Анонимды аутентификация"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Әкімшілік әрекеттер"
+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:9
-msgid "Anonymous authentication"
-msgstr "Анонимды аутентификация"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Байланыс үзілсе, оны қалпына келтіру"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Контакттарды синхрондау"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "Қарап шығу..."
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Басқа тіркелгінің барлық контакттарынан авторизация сұрау үшін шертіңіз"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Gajim қосылғанда, байланыс _орнату"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Парольді өз_герту"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's 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 "Administration operations"
+msgstr "Әкімшілік әрекеттер"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "Клиент сертификатын таңдау"
+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:16
-msgid "Choose _Key..."
-msgstr "_Кілтті таңдау..."
+msgid "A_djust to status"
+msgstr "Күйге сә_йкес"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Тіркелгі паролін өзгерту үшін шертіңіз"
+msgid "Priority will change automatically according to your status."
+msgstr "Приоритет сіздің қалып-күйіңізге байланысты автоөзгертіледі."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Басқа тіркелгінің барлық контакттарынан авторизация сұрау үшін шертіңіз"
+msgid "Priori_ty:"
+msgstr "Приорите_т:"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "Клиент сертификаты"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim қо_сылғанда байланыс орнату"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Байланыс"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Аты:"
+msgid "Resour_ce:"
+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:530
-#: ../src/notify.py:553
-#: ../src/notify.py:602
-#: ../src/notify.py:618
-msgid "Gajim"
-msgstr "Gajim"
+msgid "_Client Cert File:"
+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:57
-#: ../src/common/contacts.py:141
-#: ../src/dialogs.py:113
-#: ../src/dialogs.py:125
-#: ../src/roster_window.py:2989
-#: ../src/roster_window.py:5570
-msgid "General"
-msgstr "Жалпы"
+msgid "Browse..."
+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-ді таратады, файлдармен алмасудың істеп кетудің шансы көбірек болады."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Сертификат тайдырылған"
 
 #: ../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 агентінен алып отырады"
+msgid "Client certificate"
+msgstr "Клиент сертификаты"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Тіркелгі"
 
 #: ../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 "C_onnect on Gajim startup"
+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 қосылған кезде бұл тіркелгі үшін байланысты автоорнатады"
+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 "Auto-reconnect when connection is lost"
+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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Кіріс хабарламалары үшін бастапқы порт сізге келмесе, басқа портты осында таңдай аласыз.\n"
-"Сонымен қатар файрвол баптауларын өзгертсеңіз де болады."
+msgid "Save conversation _logs for all contacts"
+msgstr "Барлық к_онтакттар үшін хабарламалар тарихын сақтау"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Тіркелгі күйі_н ортақ күймен тең ұстау"
 
 #: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:35
-#: ../data/gui/zeroconf_information_window.ui.h:4
-#: ../src/config.py:1817
-#: ../src/dialogs.py:838
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Файлдармен алмасу үшін прокси қолдану"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Фамилиясы:"
+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:37
-msgid "Mer_ge accounts"
-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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Жалпы"
 
 #: ../data/gui/accounts_window.ui.h:38
-#: ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Кілт таңдалмады"
+msgid "_use HTTP__PROXY environment variable"
+msgstr "қор_шамның HTTP__PROXY айнымалысын қолдану"
+
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Басқару..."
 
 #: ../data/gui/accounts_window.ui.h:40
-#: ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Жеке ақпарат"
+msgid "<b>Proxy</b>"
+msgstr "<b>Прокси</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Приорите_т:"
+msgid "_Warn before using an insecure connection"
+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 ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Қауіпсіз емес байланыс арқылы парольді жіберу алдында Gajim сізді сұрау үшін "
+"осыны белгілеңіз."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Приоритет сіздің қалып-күйіңізге байланысты автоөзгертіледі."
+msgid "Send _keep-alive packets"
+msgstr "Keep-alive д_естелерін жіберіп отыру"
 
-#. Rename
 #: ../data/gui/accounts_window.ui.h:44
-#: ../src/roster_window.py:5520
-msgid "Re_name"
-msgstr "Аты_н ауыстыру"
+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:45
-msgid "Resour_ce:"
-msgstr "Ресур_с:"
+msgid "Use cust_om hostname/port"
+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 "_Hostname: "
+msgstr "_Хост аты: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Барлық к_онтакттар үшін хабарламалар тарихын сақтау"
+msgid "_Port: "
+msgstr "_Порт: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Таңдамалы</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Keep-alive д_естелерін жіберіп отыру"
+msgid "Connection"
+msgstr "Байланыс"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Тіркелгі күйі_н ортақ күймен тең ұстау"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Кілт таңдалмады"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Тіркел_гі күйін ортақ күймен тең ұстау"
+msgid "Choose _Key..."
+msgstr "_Кілтті таңдау..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Контакттарды синхрондау"
+msgid "Use G_PG Agent"
+msgstr "G_PG агентін қолдану"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "PKCS#12 пішіміндегі клиент сертификатына дейінгі жол"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Белгіленген болса, Gajim парольді seahorse сияқты GPG агентінен алып отырады"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "G_PG агентін қолдану"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Таңдауыңызша _хост аты/порт қолдану"
+msgid "_Edit Personal Information..."
+msgstr "Ж_еке ақпаратты түзету..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Таңдауыңызша _портты қолдану"
+msgid "Information about you, as stored in the server"
+msgstr "Сіз туралы ақпарат, серверде сақталған түрде"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Файлдармен алмасу үшін прокси қолдану"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Жеке ақпарат</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr "_Клиент сертификат файлы:"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Жеке ақпарат"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "Ж_еке ақпаратты түзету..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim қо_сылғанда байланыс орнату"
 
-#. XML Console enable checkbutton
 #: ../data/gui/accounts_window.ui.h:60
-#: ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Іске қ_осу"
+msgid "Synchroni_ze account status with global status"
+msgstr "Тіркел_гі күйін ортақ күймен тең ұстау"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Хост аты: "
+msgid "Use cust_om port:"
+msgstr "Таңдауыңызша _портты қолдану"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Басқару..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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"
+"Сонымен қатар файрвол баптауларын өзгертсеңіз де болады."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Аты:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Порт: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Фамилиясы:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "Қ_ауіпсіз емес байланыс орнату алдында ескерту"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "қор_шамның HTTP__PROXY айнымалысын қолдану"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Тіркел_гілерді біріктіру"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "Тір_келгі:"
+msgid "Add New Contact"
+msgstr "Жаңа контакт қосу"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Бұ_л контактқа менің күйімді көруге рұқсат ету"
+msgid "A_ccount:"
+msgstr "Тір_келгі:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Жаңа контакт қосу"
+msgid "_Protocol:"
+msgstr "_Хаттама:"
 
 #: ../data/gui/add_new_contact_window.ui.h:4
-#: ../src/common/helpers.py:1341
-msgid "I would like to add you to my contact list."
-msgstr "Мен сізді өзімнің контакттар тізіміне қосқым келеді."
+msgid "_User ID:"
+msgstr "П_айдаланушы ID-і:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Ник аты:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Тобы:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Бұ_л контактқа менің күйімді көруге рұқсат ету"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "Жаз_ылуға сұраным хабарламасын сақтау"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -509,7 +548,11 @@ msgstr ""
 "Төмендегі тіркелу батырмасын\n"
 "жалғастыру үшін басыңыз."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "Ті_ркелу"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -517,585 +560,368 @@ msgstr ""
 "Бұл хаттамадан контактты қосу үшін сізге осы\n"
 "транспортқа байланыс орнату керек."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Тобы:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "_Nickname:"
-msgstr "_Ник аты:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Хаттама:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "Ті_ркелу"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "Жаз_ылуға сұраным хабарламасын сақтау"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "П_айдаланушы ID-і:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Мен сізді өзімнің контакттар тізіміне қосқым келеді."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Қате орын алды:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc командалары - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Орындау үшін команда таңдаңыз:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Командалар тізімін алғанша күте тұрыңыз..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc командалары - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Орындау үшін команда таңдаңыз:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Тағы бір рет тексеру"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Анықтамасы қате..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Команда жіберілгенше күте тұрыңыз..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "А_яқтау"
+msgid "Please wait..."
+msgstr "Күте тұрыңыз..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Командалар тізімін алғанша күте тұрыңыз..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Бұл jabber нәрсесі ешбір команданы ұсынбай тұр."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Команда жіберілгенше күте тұрыңыз..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Қате орын алды:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Күте тұрыңыз..."
+msgid "Error description..."
+msgstr "Анықтамасы қате..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Бұл jabber нәрсесі ешбір команданы ұсынбай тұр."
+msgid "F_inish"
+msgstr "А_яқтау"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Анықтамасы</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Кеңейтілген баптаулар түзетушісі"
 
 #: ../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-ді қайта қосуыңыз керек"
+msgid "Filter:"
+msgstr "Фильтр:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Кеңейтілген баптаулар түзетушісі"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Анықтамасы</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Фильтр:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+"<b>ЕСКЕРТУ:</b> Кейбір баптаулар іске асу үшін, Gajim-ді қайта қосуыңыз керек"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Бас_тапқы түстерге тастау"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "MOTD өшіру"
+msgid "Show _XML Console"
+msgstr "XML _консолін көрсету"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "Осы күннің хабарламасын өшіреді"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "Архивтеу ба_птауларын түзету"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "_Жекелік тізімдерін түзету..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "Ә_кімші"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "Бұл серверге қазір қосулы тұрған барлық пайдаланушыларға хабарлама жібереді"
+msgid "_Send Server Message..."
+msgstr "_Сервер хабарламасын жіберу..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "MOTD орнату..."
+msgid "Sends a message to users currently connected to this server"
+msgstr ""
+"Бұл серверге қазір қосулы тұрған барлық пайдаланушыларға хабарлама жібереді"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Осы күннің хабарламасын орнатады"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "XML _консолін көрсету"
+msgid "Set MOTD..."
+msgstr "MOTD орнату..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "MOTD жаңарту..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Осы күннің хабарламасын жаңартады"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "MOTD жаңарту..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "Ә_кімші"
+msgid "Delete MOTD"
+msgstr "MOTD өшіру"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Сервер хабарламасын жіберу..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " бұл контактпен ашылған терезе/бет"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Әрекеттер</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Шарттар</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Дыбыстар</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Кеңейтілген әрекеттер"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Кеңейтілген әрекеттерді басқару"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Барлық күйлер"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106
-#: ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Кетіп қалған"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Бос емес"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "Контакт қалып-күйді өзгерту"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "Контакт байланыспаған"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Жоқ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "Файлдармен алмасу аяқталды"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "Файлдармен алмасуға сұраным"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "Файлдармен алмасу басталды"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "Топ чат хабарламасының  ерекшелеу түсі"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "Топ чат хабарламасы алынған"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Бар "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Жасырын"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Команданы орындау"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222
-#: ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Қол жетерсіз"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Бір не бірнеше ерекше қалып-күйлер..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Желіде / Чатқа дайын"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Дыбысты ойнату"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "Хабарлама алу"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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 белсенді қылу"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "Ча_т терезесінің автоашылуын сөндіру"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Бар қалқымалы хабарлама терезелерін сөндіру"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "Бұ_л оқиға үшін бар дыбысты сөндіру"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr "Оқ_иғаны жүйелік сөреде көрсетуді сөндіру"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Оқиғаны ростерде көрсетуді сөндіру"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "М_ені қалқымалы хабарлама терезесімен ескерту"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "Па_йдаланушымен чат терезесін ашу"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in notification area"
-msgstr "Оқиға_ны жүйелік сөреде көрсету"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Оқиға_ны ростерде көрсету"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "мен де"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "контакт(тар)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "әркім"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "үшін: "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "топ(тар)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "Мен келесіде болғанда: "
+msgid "Deletes Message of the Day"
+msgstr "Осы күннің хабарламасын өшіреді"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr "<i>Автотәсіл</i>"
+msgid "No"
+msgstr "Жоқ"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr "<i>Жергілікті тәсіл</i>"
+msgid "Yes"
+msgstr "Иә"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr "<i>Қолмен тәсіл</i>"
+msgid "Prefer"
+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
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "Тыйым салу"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr "<i>Қолмен тәсіл</i>"
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "Жоқ"
+msgid "<i>Method Local</i>"
+msgstr "<i>Жергілікті тәсіл</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-msgid "Prefer"
-msgstr "Қалау"
+msgid "<i>Method Auto</i>"
+msgstr "<i>Автотәсіл</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Иә"
+msgid "Auto"
+msgstr "Авто"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Жазба:"
+msgid "New entry received"
+msgstr "Жаңа жазба алынды"
 
-#: ../data/gui/atom_entry_window.ui.h:2
-msgid "Feed name:"
-msgstr "Таспа аты:"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Сіз жаңа жазбаны алдыңыз:"
 
 #: ../data/gui/atom_entry_window.ui.h:3
-msgid "Last modified:"
-msgstr "Соңғы рет өзгертілген:"
+msgid "Feed name:"
+msgstr "Таспа аты:"
 
 #: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Жаңа жазба алынды"
+msgid "Entry:"
+msgstr "Жазба:"
 
 #: ../data/gui/atom_entry_window.ui.h:5
-#: ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Сіз жаңа жазбаны алдыңыз:"
+msgid "Last modified:"
+msgstr "Соңғы рет өзгертілген:"
+
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5539
-#: ../src/roster_window.py:5666
-#: ../src/roster_window.py:5799
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "Б_локтамау"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Хабарлама:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Айналысқан ісіңізді орнату"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Айналысқан ісіңізді көрсету"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Хабарлама:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Хабарлама:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Көңіл-күй:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Хабарлама:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Парольді өзгерту"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Растау үшін қайта енгізіңіз:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Жаңа парольді енгізіңіз:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Растау үшін қайта енгізіңіз:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Жаңа қалып-күй хабарламаңызды енгізіңіз</b>"
+msgid "Save as Preset..."
+msgstr "Орнатылған етіп сақтау..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Әрекеті:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Көңіл-күй:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Әрекеті:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Орнатылған хабарламалар:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Орнатылған етіп сақтау..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Жаңа қалып-күй хабарламаңызды енгізіңіз</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Чат _бөлмесіне кіру..."
+msgid "_Copy Link Location"
+msgstr "_Сілтеме адресін көшіру"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "Р_остерге қосу..."
+msgid "_Open Link in Browser"
+msgstr "Сіл_темені браузерде ашу"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "JID/Email _адресін көшіру"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Сілтеме адресін көшіру"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "Email қ_олданбасын ашу"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "Сіл_темені браузерде ашу"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "Чатты ба_стау"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1
-#: ../src/dialogs.py:4754
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Чат _бөлмесіне кіру..."
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "Р_остерге қосу..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Смайликтер тізімін көрсету (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Бұл контактты ростерге қосу (Ctrl+D)"
 
 #: ../data/gui/chat_control.ui.h:3
-#: ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Контактты сөйлесуге шақыру (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Контактты сөйлесуге шақыру (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Чат тарихын қарап шығу (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Кеңейтілген әрекеттер мәзірін көрсету (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Жіберу"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 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:23
-#: ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Жіберу"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24
-#: ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "белгі"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "_Шақыру"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Достарды шақыру!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC сервері"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "MUC серверін таңдаңыз"
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1103,124 +929,136 @@ msgstr ""
 "Сіз көп пайдаланушы чатын бастауға дайынсыз.\n"
 "Шақырғыңыз келетін контакттарды таңдаңыз"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Оның қалып-күйін көруді сұрау"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "MUC серверін таңдаңыз"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Арна_йы хабарламаны орнату"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC сервері"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "OpenPGP _кілтін орнату..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "_Шақыру"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "Команда_ны орындау..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "_Чатты бастау"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "_Топтарды түзету..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Бі_р хабарламаны жіберу..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "_Файлды жіберу..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../src/roster_window.py:5475
-#: ../src/roster_window.py:5634
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "_Шақыру"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Контакттарды _шақыру"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Ө_шіру"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "OpenPGP _шифрлеуін қосу/сөндіру"
 
-#: ../data/gui/contact_context_menu.ui.h:9
-#: ../src/roster_window.py:5485
-#: ../src/roster_window.py:5723
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "End to End шифрлеуін қосу/сөндіру"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "_Ол үшін қалып-күйді орнату"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "Команда_ны орындау..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Бі_р хабарламаны жіберу..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Контактты басқару"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "_Файлды жіберу..."
+msgid "_Rename..."
+msgstr "_Атын ауыстыру..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Ол үшін а_ватарды орнату"
+msgid "Edit _Groups..."
+msgstr "_Топтарды түзету..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "_Чатты бастау"
+msgid "Assign Open_PGP Key..."
+msgstr "OpenPGP _кілтін орнату..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "End to End шифрлеуін қосу/сөндіру"
+msgid "Set Custom _Avatar..."
+msgstr "Ол үшін а_ватарды орнату"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "OpenPGP _шифрлеуін қосу/сөндіру"
+msgid "Add Special _Notification..."
+msgstr "Арна_йы хабарламаны орнату"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Жазылу"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Оға_н менің қалып-күйімді көруді рұқсат ету"
+#, fuzzy
+msgid "_Allow contact 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:5547
-#: ../src/roster_window.py:5672
-#: ../src/roster_window.py:5802
-msgid "_Block"
-msgstr "_Блоктау"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "_Оның қалып-күйін көруді сұрау"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:5873
-msgid "_History"
-msgstr "Тар_ихы"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Елемеу"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Блоктау"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Контактты басқару"
+msgid "_Unignore"
+msgstr "Е_лемеу емес"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Атын ауыстыру..."
+msgid "_Ignore"
+msgstr "_Елемеу"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Жазылу"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Ө_шіру"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "Е_лемеу емес"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "Тар_ихы"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Форманы толтырыңыз."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Бөлме баптаулары"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Форманы толтырыңыз."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Топтарды түзету"
@@ -1233,136 +1071,154 @@ msgstr "(<b>ESession</b> ақпараты)"
 msgid "_Verify"
 msgstr "_Салыстыру"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Мүміндіктері"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Gajim мүмкіндіктер тізімі:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Мүміндіктері"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Белсенді, аяқталған және тоқтатылған файлдармен алмасулар тізімі"
+msgid "File Transfers"
+msgstr "Файлдармен алмасу"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Файлдармен алмасудан бас тарту"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Сіз бен басқалар арасындағы файл алмасуларды көрсетеді"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Бұл файлдармен алмасудан бас тарту"
+msgid "file transfers list"
+msgstr "файлдармен алмасу тізімі"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Бұл файлдармен алмасудан бас тарту және толық емес файлдарды өшіру"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Белсенді, аяқталған және тоқтатылған файлдармен алмасулар тізімі"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Тазарт_у"
+msgid "_Notify me when a file transfer is complete"
+msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Файлдармен алмасу"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Файлдармен алмасу аяқталған кезде қалқымалы хабарламаны көрсету"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Терезені жасырады"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr ""
+"Тізімнен аяқталған, бас тартылған және сәтсіз аяқталған алмасуларды өшіреді"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Тізімнен файлдармен алмасуды өшіру."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Сіз бен басқалар арасындағы файл алмасуларды көрсетеді"
+msgid "Clean _up"
+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 "_Pause"
+msgstr "_Аялдату"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Файлдармен алмасу аяқталған кезде қалқымалы хабарламаны көрсету"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Бұл файлдармен алмасудан бас тарту және толық емес файлдарды өшіру"
 
 #: ../data/gui/filetransfers.ui.h:13
-#: ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "Жалға_стыру"
+msgid "Cancel file transfer"
+msgstr "Файлдармен алмасудан бас тарту"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
+msgid "Cancels the selected file transfer"
+msgstr "Бұл файлдармен алмасудан бас тарту"
 
 #: ../data/gui/filetransfers.ui.h:15
-#: ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Орналасқан буманы ашу"
+msgid "Hides the window"
+msgstr "Терезені жасырады"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Аялдату"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "Жалға_стыру"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "файлдармен алмасу тізімі"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Орналасқан буманы ашу"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Чаттары бар беттер түсі</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "Тіркелгі бағаны"
 
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "Топ бағаны"
+
 #: ../data/gui/gajim_themes_window.ui.h:3
-#: ../src/chat_control.py:996
-msgid "Bold"
-msgstr "Қалың"
+msgid "Contact row"
+msgstr "Контакт бағаны"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "Баннер"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Жазу"
+msgid "Gajim Themes Customization"
+msgstr "Gajim темаларын басқару"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "Контакт бағаны"
+msgid "Text _color:"
+msgstr "Мәтін тү_сі:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Қаріп стилі:"
+msgid "_Background:"
+msgstr "_Фон:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim темаларын басқару"
+msgid "Text _font:"
+msgstr "Мәтін қарі_пі:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Кетіп қалды"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "Топ бағаны"
+msgid "Font style:"
+msgstr "Қаріп стилі:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11
-#: ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Белсенді емес"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Қалың"
 
-#: ../data/gui/gajim_themes_window.ui.h:12
-#: ../src/chat_control.py:997
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Көлбеу"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Аялдатылған"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Жазу"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Белсенді емес"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Чаттары бар беттер түсі</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Кетіп қалды"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1370,7 +1226,7 @@ msgstr ""
 "MUC\n"
 "Хабарламалар"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1378,106 +1234,98 @@ msgstr ""
 "MUC адрестелген\n"
 "хабарламалары"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Аялдатылған"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Мәтін тү_сі:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Мәтін қарі_пі:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Фон:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "_Никті өзгерту..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Бөлмені басқару"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "_Тақырыпты өзгерту..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "_Бөлмені баптау..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4
-#: ../src/disco.py:1801
-msgid "_Bookmark"
-msgstr "_Бетбелгі"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "Бөлме_ні жою"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Бөлмені басқару"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Жабылғанда, ростерге орналастыру"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Даусы бар"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Бетбелгі"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Мод_ератор"
+msgid "_Send Private Message"
+msgstr "_Жеке хабарламаны жіберу..."
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Қатысушы әрекеттері"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "_Файлды жіберу"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Қатысушы әрекеттері"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "Р_остерге қосу"
+msgid "_Voice"
+msgstr "_Даусы бар"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Мод_ератор"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Мүше"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "Ә_кімші"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Бан"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Ие"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Тебу"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Мүше"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Ие"
+msgid "_Ban"
+msgstr "_Бан"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Жеке хабарламаны жіберу..."
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Даусы бар"
+msgid "_Add to Roster"
+msgstr "Р_остерге қосу"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Бұл бөлмені бетбелгілерге қосу (Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Пішімдеулер тізімін көрсету"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Сіздің ник атыңызды өзгерту (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Бұл бөлмені бетбелгілерге қосу (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1489,211 +1337,215 @@ msgid "From:"
 msgstr "Кімнен:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 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."
-msgstr ""
-"<b>ЕСКЕРТУ:</b>\n"
-"Топтап өшіруді жоспарласаңыз, Gajim-ның қосылмай тұрғанына көз жеткізіңіз. Жалпы айтқанда, ағымда сөйлесіп жатқан контакттар тарихын өшіруден бас тартыңыз."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim тарихы логтар менеджері"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gajim тарихы логтар менеджеріне қош келдіңіз</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "Экспорт"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Gajim тарихы логтар менеджері"
-
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:3
 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:9
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>ЕСКЕРТУ:</b>\n"
+"Топтап өшіруді жоспарласаңыз, Gajim-ның қосылмай тұрғанына көз жеткізіңіз. "
+"Жалпы айтқанда, ағымда сөйлесіп жатқан контакттар тарихын өшіруден бас "
+"тартыңыз."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "Д_ереққордан іздеу"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "Барлық чаттар тарихы"
-
-#: ../data/gui/history_window.ui.h:2
-#: ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Чат тарихы"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Экспорт"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "JID не контакт атын енгізіңіз"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr "Чат бөлмелер тарихы"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "Барлық чаттар тарихы"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Чат тарихы"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Іздеу:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Чат тарихын _логқа сақтау"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
-msgstr "approve"
+msgid "expire"
+msgstr "expire"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
-msgstr "әркім"
+msgid "save"
+msgstr "save"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr "concede"
+msgid "otr"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr "expire"
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr "false"
+msgid "body"
+msgstr "әркім"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
-msgstr "forbid"
+msgid "false"
+msgstr "false"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:231
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:112
-#: ../src/gajim-remote-plugin.py:135
-#: ../src/gajim-remote-plugin.py:146
-#: ../src/gajim-remote-plugin.py:160
-#: ../src/gajim-remote-plugin.py:171
-#: ../src/gajim-remote-plugin.py:284
-#: ../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:8
+msgid "stream"
+msgstr "stream"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
-msgstr "oppose"
+msgid "approve"
+msgstr "approve"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
-msgstr "otr"
+msgid "concede"
+msgstr "concede"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
-msgstr "қалау"
+msgid "forbid"
+msgstr "forbid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
-msgstr "require"
+msgid "oppose"
+msgstr "oppose"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr "save"
+msgid "prefer"
+msgstr "қалау"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
-msgstr "stream"
-
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Бөлмелерді қара_п шығу"
+msgid "require"
+msgstr "require"
 
-#: ../data/gui/join_groupchat_window.ui.h:3
-#: ../src/dialogs.py:2285
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Бөлмеге кіру"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "Желіге қосылғанда, осы бөлмеге _автокіру"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Бөлме:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Ник:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Соңғылар:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Соңғылар:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "Желіге қосылғанда, осы бөлмеге _автокіру"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-msgid "Room:"
-msgstr "Бөлме:"
+msgid "_Bookmark this room"
+msgstr "_Бөлмені бетбелгілерге қосу"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Сервер:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "_Бөлмені бетбелгілерге қосу"
+msgid "Bro_wse Rooms"
+msgstr "Бөлмелерді қара_п шығу"
 
-#: ../data/gui/join_groupchat_window.ui.h:11
-#: ../src/disco.py:1361
-#: ../src/disco.py:1805
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Кіру"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "A_uto join"
-msgstr "А_втокіру"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Белгіленген болса, Gajim қосылғанда бұл чат бөлмесіне автоматты түрде кіреді"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Бетбелгілерді басқару"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimi_ze on Auto Join"
-msgstr "Авто кір_генде қайыру"
+msgid "Roo_m:"
+msgstr "Бө_лме:"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Title:"
+msgstr "А_тауы:"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Pr_int status:"
 msgstr "Кү_йін шығару:"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Roo_m:"
-msgstr "Бө_лме:"
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "A_uto join"
+msgstr "А_втокіру"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Белгіленген болса, Gajim қосылғанда бұл чат бөлмесіне автоматты түрде кіреді"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "_Title:"
-msgstr "А_тауы:"
+msgid "Minimi_ze on Auto Join"
+msgstr "Авто кір_генде қайыру"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1704,132 +1556,130 @@ msgid "_Configure"
 msgstr "Бап_тау"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Қасиеттер</b>"
+msgid "HTTP Connect"
+msgstr "HTTP Connect"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Баптаулар</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP Connect"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Прокси профайлдарын басқару"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Түрі:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Па_роль:"
+msgid "_Name:"
+msgstr "_Аты:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Прокси _хосты:"
+msgid "<b>Properties</b>"
+msgstr "<b>Қасиеттер</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Прокс_и порты:"
+msgid "Use HTTP prox_y"
+msgstr "HTTP прокс_и қолдану"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "BOSH URL-_ы:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "HTTP прокс_и қолдану"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Прокси _аутентификациясын қолдану"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Пайдаланушы аты:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "BOSH URL-_ы:"
+msgid "Pass_word:"
+msgstr "Па_роль:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Аты:"
+msgid "Proxy _Host:"
+msgstr "Прокси _хосты:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Түрі:"
+msgid "Proxy _Port:"
+msgstr "Прокс_и порты:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Пайдаланушы аты:"
+msgid "<b>Settings</b>"
+msgstr "<b>Баптаулар</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Тіркелгілерді басқару"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Пароль"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;бос&gt;"
+msgid "Plugins"
+msgstr "Плагиндер"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<бос>"
+#, fuzzy
+msgid "Install from zip"
+msgstr "Орнату"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "Авторлары:"
+msgid "&lt;empty&gt;"
+msgstr "&lt;бос&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Available"
-msgstr "Қолжетерлік"
+msgid "Version:"
+msgstr "Нұсқасы:"
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Configure"
-msgstr "Баптау"
+msgid "<empty>"
+msgstr "<бос>"
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Description:"
-msgstr "Анықтамасы:"
+msgid "Authors:"
+msgstr "Авторлары:"
 
 #: ../data/gui/plugins_window.ui.h:7
-msgid "Descrition:"
-msgstr "Анықтамасы: "
-
-#: ../data/gui/plugins_window.ui.h:8
 msgid "Homepage:"
 msgstr "Үй парағы:"
 
+#: ../data/gui/plugins_window.ui.h:8
+msgid "homepage url"
+msgstr "үй парақ сілтемесі"
+
 #: ../data/gui/plugins_window.ui.h:9
-msgid "Install"
-msgstr "Орнату"
+msgid "Description:"
+msgstr "Анықтамасы:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid "Installed"
-msgstr "Орнатылған"
+msgid "Uninstall"
+msgstr "Өшіру"
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization."
-msgstr "Плагин анықтамасы осында болу керек. PluginsWindow іске қосылған кезде бұл мәтін өшірілетін болады."
+msgid "Configure"
+msgstr "Баптау"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Plugins"
-msgstr "Плагиндер"
+msgid "Installed"
+msgstr "Орнатылған"
 
 #: ../data/gui/plugins_window.ui.h:13
-msgid "Uninstall"
-msgstr "Өшіру"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "Version:"
-msgstr "Нұсқасы:"
-
-#: ../data/gui/plugins_window.ui.h:15
-msgid "button"
-msgstr "батырма"
-
-#: ../data/gui/plugins_window.ui.h:16
-msgid "homepage url"
-msgstr "үй парақ сілтемесі"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+"Плагин анықтамасы осында болу керек. PluginsWindow іске қосылған кезде бұл "
+"мәтін өшірілетін болады."
 
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
@@ -1840,926 +1690,1025 @@ msgid "Event desc"
 msgstr "Оқиға анықтамасы"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Кеңейтілген баптаулар түзеткіші</b>"
+msgid "Use default applications"
+msgstr "Негізгі қолданбаларды қолдану"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Қолданбалар</b>"
+msgid "Custom"
+msgstr "Таңдауыңызша"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Аудио</b>"
+msgid "All chat states"
+msgstr "Барлық чат күйлері"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Авто қалып-күй</b>"
+msgid "Composing only"
+msgstr "Тек жазу"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Чаттың сыртқы түрі</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Сөндірулі"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Чаттағы түстер</b>"
+msgid "Never"
+msgstr "Ешқашан"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Чат қалып-күй хабарламалары</b>"
+msgid "Only when pending events"
+msgstr "Оқиғалар бар болса ғана"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Байланыс</b>"
+msgid "Always"
+msgstr "Әрқашан"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "Оны қалқымалы хабарламада шығару"
 
-#. 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>"
+msgid "Notify me about it"
+msgstr "Ол туралы маған хабарлау"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Қаріп</b>"
+msgid "Show only in roster"
+msgstr "Тек ростерде көрсету"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail опциялары</b>"
+msgid "Detached roster with detached chats"
+msgstr "Бөлек ростер мен бөлек чаттар"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "Бөлек ростер мен бір чат"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Алдын-ала орнатылған қалып-күй хабарламалары</b>"
+msgid "Single window for everything"
+msgstr "Барлығы үшін де бір терезе"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Жекелік</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "Бөлек ростер мен тіркелгі бойынша топталған чаттар"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Ростердің сыртқы түрі</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "Бөлек ростер мен түрі бойынша топталған чаттар"
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Соңғы қалып-күйі: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Қалып-күй хабарламалары</b>"
+msgid "Preferences"
+msgstr "Баптаулар"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Темалар</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Ростердегі контакттардың а_ватарларын көрсету"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>Видео</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін "
+"аватарларын көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Хабарламалар</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Ростердегі _контакттардың қалып-күй хабарламаларын көрсету"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(мысалы: stunserver.org)</i>"
+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:23
-msgid "Advanced"
-msgstr "Кеңейтілген"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Ростерде_гі контакттардың орналасуын көрсету"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Кеңейтілген..."
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Белгіленген болса, Gajim ростердегі контакттар үшін көңіл-күйін көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "All chat states"
-msgstr "Барлық чат күйлері"
+msgid "Sort contacts by status"
+msgstr "Контакттарды қалып-күй бойынша сұрыптау"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "_ОЖ ақпаратын жіберуге рұқсат ету"
+msgid "in _roster"
+msgstr "р_остерде"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "_Белсенді емес уақытымды жіберуге рұқсат ету"
+msgid "in _group chats"
+msgstr "_чат бөлмелерінде"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Қалқыма/хабарлауды мен _кқ/қж/бе/жасырын болғанда рұқсат ету"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Ростердің сыртқы түрі</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Мен бос емес _болғанда дыбыстарға рұқсат ету"
+msgid "_Window behavior:"
+msgstr "Т_ерезе түрі:"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "Әрқашан"
+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:31
-msgid "Ask status message when I:"
-msgstr "Күй хабарламасын сұрау:"
+msgid "_Emoticons:"
+msgstr "Сма_йликтер:"
 
 #: ../data/gui/preferences_window.ui.h:32
-#: ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr "Аудио / Видео"
+msgid "Ma_ke message windows compact"
+msgstr "Ха_барламалар терезесін ықшам қылу"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "Аудио енгізу құрылғысы"
+msgid "Hide all buttons in chat windows"
+msgstr "Чат терезесіндегі барлық батырмаларды жасыру"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "Аудио шығару құрылғысы"
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ке_лген хабарламада кеңейтілген құраманы елемеу"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Чат хабарламасы:"
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Gajim әр рет қосылғанда н_егізгі Jabber клиенті ма, соны тексеру"
+msgid "_Highlight misspelled words"
+msgstr "Қа_те сөздерді түспен ерекшелеу"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
-msgstr "Тек жазу"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Интерфейстің түстерін мен қарібін баптау"
+msgid "_Show roster on startup:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "Контакт хабарламасы:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "MUC хабарламасы келген кезде ойналатын дыбыс."
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "Контакт аты:"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Таңдауыңызша"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Чаттың сыртқы түрі</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr "Бөлек ростер мен тіркелгі бойынша топталған чаттар"
+msgid "When new event is received:"
+msgstr "Жаңа оқиға кезінде:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr "Бөлек ростер мен түрі бойынша топталған чаттар"
+msgid "Notify me about contacts that sign _in"
+msgstr "Жаңа кір_гендер туралы хабарлау"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr "Бөлек ростер мен бөлек чаттар"
+msgid "Notify me about contacts that sign _out"
+msgstr "Жаңа _шыққандар туралы хабарлау"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr "Бөлек ростер мен бір чат"
+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:46
-#: ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Сөндірулі"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Қалқыма/хабарлауды мен _кқ/қж/бе/жасырын болғанда рұқсат ету"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Ростердегі контакттардың немен _айналысқанын көрсету"
+msgid "Notify on new _GMail email"
+msgstr "Жаңа GMail по_штасы туралы хабарлау"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "_Пошта ақпаратын толығырақ көрсету"
+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:49
-msgid "Display _location of contacts in roster"
-msgstr "Ростерде_гі контакттардың орналасуын көрсету"
+msgid "Display _extra email details"
+msgstr "_Пошта ақпаратын толығырақ көрсету"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Ростердегі контакттардың т_ындайтынын көрсету"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Белгіленген болса, Gajim жаңа эл. пошталар туралы хабарға жіберуші туралы "
+"ақпаратын қосады"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Ростердегі контакттардың а_ватарларын көрсету"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail опциялары</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Ростерде_гі контакттардың көңіл-күйлерін көрсету"
+msgid "Show notification area icon:"
+msgstr "Жүйелік сөре таңбашасын көрсету:"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Ростердегі _контакттардың қалып-күй хабарламаларын көрсету"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Хабарламалар</b>"
 
 #: ../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 ол сөйлесуге қатысты мета-ақпаратты жібере мен қабылдай алады. Чат терезелерінде қай чат күйлерін көрсетуді осында таңдай аласыз."
+msgid "Play _sounds"
+msgstr "Дыбы_старды ойнату"
 
 #: ../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 ол сөйлесуге қатысты мета-ақпаратты жібере мен қабылдай алады. Екінші жаққа қай чат күйлерін жіберуді осында таңдай аласыз."
+msgid "Ma_nage..."
+msgstr "Б_асқару..."
 
 #: ../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 сізді жаңа кірген контакттар туралы экранның төменгі оң жақта шығатын қалқымалы терезеде ескертеді"
+msgid "Allow sound when I'm _busy"
+msgstr "Мен бос емес _болғанда дыбыстарға рұқсат ету"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Дыбыстар</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "Чат терезесіндегі барлық батырмаларды жасыру"
+msgid "Notifications"
+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 басқаларға сіздің операциялық жүйеңізді анықтауға рұқсат етеді"
+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:60
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Белгіленген болса, Gajim жаңа эл. пошталар туралы хабарға жіберуші туралы ақпаратын қосады"
+msgid "_Display chat state notifications:"
+msgstr "Ча_т күй өзгеруін көрсету:"
 
 #: ../data/gui/preferences_window.ui.h:61
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Белгіленген болса, Gajim компьютеріңіз қолданылмаса, қалып-күйіңізді Кетіп қалғанға ауыстырады."
+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:62
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Белгіленген болса, Gajim компьютеріңіз одан да көп қолданылмаса, қалып-күйіңізді Қолжетерсізге ауыстырады."
+msgid "_Send chat state notifications:"
+msgstr "_Чат күй өзгеруін жіберу:"
 
 #: ../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 ростердегі мен топ чаттағы контакттар үшін аватарларын көрсетеді"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Чат қалып-күй хабарламалары</b>"
 
 #: ../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 ростердегі мен топ чаттағы контакттар үшін қалып-күй хабарламаларын көрсетеді"
+msgid "Personal Events"
+msgstr "Жеке әрекеттер"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростердегі контакттар үшін белсенділігін көрсетеді"
+msgid "_Away after:"
+msgstr "_Кетіп қалған:"
 
 #: ../data/gui/preferences_window.ui.h:66
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростерде контакттардың орналасуын көрсетеді"
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Белгіленген болса, Gajim компьютеріңіз қолданылмаса, қалып-күйіңізді Кетіп "
+"қалғанға ауыстырады."
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростердегі контакттар үшін көңіл-күйін көрсетеді"
+msgid "_Not available after:"
+msgstr "Қ_ол жетерсіз:"
 
 #: ../data/gui/preferences_window.ui.h:68
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростердегі контакттар үшін өленін көрсетеді"
+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: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 "Белгіленген болса, Gajim чат терезелерінің енгізу өрістеріндегі емле қателерін түспен ерекшелейді. Егер өрісте оң жақ шерту арқылы тіл ерекше көрсетілмесе, сол контакт не топ чаты үшін бастапқы тіл қолданылады."
+msgid "minutes"
+msgstr "минуттан кейін"
 
 #: ../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 not in the roster"
-msgstr "Белгіленген болса, Gajim авторизацияланбаған контакттар жіберген хабарламаларды елемейді. Байқап қолданыңыз, өйткені ростерде емес контакттардың барлығы блокталады"
-
-#: ../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 "Белгіленген болса, Gajim шифрленген хабарламаларды тарихқа сақтайды. E2E шифрленуі қолданылса, тарихқа сақтау үшін қашықтағы жақ өз рұқсатын беруі керек екендігін ескеріңіз."
-
-#: ../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 "Белгіленген болса, жаңа GMail эл. поштасы алынған кезде Gajim қалқымалы хабарламаны көрсетеді"
+msgid ""
+"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"
+"$S алдыңғы күй хабарласымен, ал\n"
+"$T авто кетіп қалған уақыт шамасымен алмастырылады"
 
 #: ../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, etc...)"
-msgstr "Белгіленген болса, Gajim хаттамаға тән қалып-күй таңбашаларын қолданады. (Мыс. Mail.ru пайдаланушылары үшін сәйкес Mail.ru Agent таңбашалары көрсетіледі)"
-
-#: ../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 "Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері қолданылады."
-
-#: ../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 барлық ascii ':)' түрдегі смайликтерді сәйкес сурет смайликтерімен алмастырады"
+msgid ""
+"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"
+"$S алдыңғы күй хабарласымен, ал\n"
+"$T авто қолжетерсіз уақыт шамасымен алмастырылады"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "_Шифрленген чат тарихын жазу"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Авто қалып-күй</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Ха_барламалар терезесін ықшам қылу"
+msgid "Ask status message when I:"
+msgstr "Күй хабарламасын сұрау:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Б_асқару..."
+msgid "Sign _in"
+msgstr "Мен _кірген"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Never"
-msgstr "Ешқашан"
+msgid "Sign _out"
+msgstr "Мен _шыққан кезде"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Жаңа кір_гендер туралы хабарлау"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Қалып-күй хабарламалары</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Жаңа _шыққандар туралы хабарлау"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Алдын-ала орнатылған қалып-күй хабарламалары</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notify me about it"
-msgstr "Ол туралы маған хабарлау"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Күй"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Жаңа GMail по_штасы туралы хабарлау"
+msgid "Use system _default"
+msgstr "Жүйе _негізгілерін қолдану"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr "Оқиғалар бар болса ғана"
+msgid "Chat message:"
+msgstr "Чат хабарламасы:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Жеке әрекеттер"
+msgid "<b>Font</b>"
+msgstr "<b>Қаріп</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Дыбы_старды ойнату"
+msgid "Use _transports icons"
+msgstr "_Транспорт таңбашаларын қолдану"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
-msgstr "Оны қалқымалы хабарламада шығару"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. 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:89
-msgid "Preferences"
-msgstr "Баптаулар"
+msgid "Status _iconset:"
+msgstr "Кү_й таңбашалары:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
-"STUN серверінің хост аты. Көрсетілмеген болса, Gajim серверден\n"
-"оны іздеп көреді."
+msgid "Configure color and font of the interface"
+msgstr "Интерфейстің түстерін мен қарібін баптау"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "Т_емасы:"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "STUN сервері:"
+msgid "<b>Themes</b>"
+msgstr "<b>Темалар</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr "Жүйелік сөре таңбашасын көрсету:"
+msgid "Contact's nickname:"
+msgstr "Контакт аты:"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid "Show only in roster"
-msgstr "Тек ростерде көрсету"
+msgid "Your nickname:"
+msgstr "Ник атыңыз:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Мен _кірген"
+msgid "_Status message:"
+msgstr "_Күй хабарламасы:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Мен _шыққан кезде"
+msgid "_URL highlight:"
+msgstr "URL ерек_шелеу:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr "Барлығы үшін де бір терезе"
+msgid "_Reset to Default Colors"
+msgstr "Бас_тапқы түстерге тастау"
 
 #: ../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 тек таза мәтінді көрсетеді."
+msgid "Contact's message:"
+msgstr "Контакт хабарламасы:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Контакттарды қалып-күй бойынша сұрыптау"
+msgid "Your message:"
+msgstr "Хабарламаңыз:"
 
 #: ../data/gui/preferences_window.ui.h:100
-#: ../src/config.py:391
-msgid "Status"
-msgstr "Күй"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Сізді біреу бөлмеде еске алған"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Кү_й таңбашалары:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Чаттағы түстер</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стиль"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "Т_емасы:"
+msgid "Audio input device"
+msgstr "Аудио енгізу құрылғысы"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
-"$S алдыңғы күй хабарласымен, ал\n"
-"$T авто кетіп қалған уақыт шамасымен алмастырылады"
+msgid "Audio output device"
+msgstr "Аудио шығару құрылғысы"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "<b>Audio</b>"
+msgstr "<b>Аудио</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
+msgstr "Видео енгізу құрылғысы"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
-msgstr ""
-"Авто Қолжетерсіз қалып-күй хабарламасы. Бос болса, Gajim ағымдағы күй хабарламасын өзгертпейді\n"
-"$S алдыңғы күй хабарласымен, ал\n"
-"$T авто қолжетерсіз уақыт шамасымен алмастырылады"
+msgid "Video output device"
+msgstr "Видео шығару құрылғысы"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "Видеоның кадр/сек қасиеті"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "Видео өлшемі"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "_Транспорт таңбашаларын қолдану"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr "Негізгі қолданбаларды қолдану"
+msgid "<b>Video</b>"
+msgstr "<b>Видео</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Жүйе _негізгілерін қолдану"
+msgid "STUN server:"
+msgstr "STUN сервері:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr "Видеоның кадр/сек қасиеті"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(мысалы: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr "Видео енгізу құрылғысы"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
-msgstr "Видео шығару құрылғысы"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+"STUN серверінің хост аты. Көрсетілмеген болса, Gajim серверден\n"
+"оны іздеп көреді."
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr "Видео өлшемі"
+msgid "<b>Connection</b>"
+msgstr "<b>Байланыс</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "Жаңа оқиға кезінде:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Аудио / Видео"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "Хабарламаңыз:"
+msgid "_File manager:"
+msgstr "Фай_лдар басқарушысы:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "Ник атыңыз:"
+msgid "_Mail client:"
+msgstr "_Пошта қолданбасы:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Кетіп қалған:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Браузер:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Ча_т күй өзгеруін көрсету:"
+msgid "<b>Custom</b>"
+msgstr "<b>Таңдауыңызша</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "Сма_йликтер:"
+msgid "<b>Applications</b>"
+msgstr "<b>Қолданбалар</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "Фай_лдар басқарушысы:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ростердегі емес контакттардан оқиғаларды елемеу"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "Қа_те сөздерді түспен ерекшелеу"
+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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ростердегі емес контакттардан оқиғаларды елемеу"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "_ОЖ ақпаратын жіберуге рұқсат ету"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ке_лген хабарламада кеңейтілген құраманы елемеу"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
+"рұқсат етеді"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "_ОЖ ақпаратын жіберуге рұқсат ету"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Пошта қолданбасы:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
+"рұқсат етеді"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "Қ_ол жетерсіз:"
+msgid "Log _encrypted chat session"
+msgstr "_Шифрленген чат тарихын жазу"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "А_шу..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "Бас_тапқы түстерге тастау"
+msgid "Allow my _idle time to be sent"
+msgstr "_Белсенді емес уақытымды жіберуге рұқсат ету"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "_Чат күй өзгеруін жіберу:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Күй хабарламасы:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "URL ерек_шелеу:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Жекелік</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "Т_ерезе түрі:"
+msgid "_Log status changes of contacts"
+msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "_чат бөлмелерінде"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "р_остерде"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Gajim әр рет қосылғанда н_егізгі Jabber клиенті ма, соны тексеру"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "минуттан кейін"
+msgid "_Open..."
+msgstr "А_шу..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Кеңейтілген баптаулар түзеткіші</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Кеңейтілген"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Жекелік тізімдер:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Ережені қосу / түзету</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Жекелік тізімі"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Ережелер тізімі</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Жекелік тізімі</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Бұл сессия үшін белсенді"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Әр қосылуда белсенді"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Ережелер тізімі</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Барлығы"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Ережені қосу / түзету</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Барлық (жазылуларды қоса)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Рұқсат ету"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Болдырмау"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "топтағы барлығы"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Реті:"
+msgid "all by subscription"
+msgstr "барлығы жазылуы бойынша"
 
 #: ../data/gui/privacy_list_window.ui.h:12
-#: ../src/dialogs.py:3923
-msgid "Privacy List"
-msgstr "Жекелік тізімі"
+msgid "All"
+msgstr "Барлығы"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "барлығы жазылуы бойынша"
+msgid "to send me messages"
+msgstr "маған хабарлама жіберуге"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "топтағы барлығы"
+msgid "to send me queries"
+msgstr "маған сұранымдар жіберуге"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "екі жақты"
+msgid "to view my status"
+msgstr "менің қалып-күйімді көруге"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "одан"
+msgid "to send me status"
+msgstr "маған қалып-күйлерін жіберуге"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "жоқ"
+msgid "All (including subscription)"
+msgstr "Барлық (жазылуларды қоса)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "оған"
+msgid "Order:"
+msgstr "Реті:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "маған хабарлама жіберуге"
+msgid "none"
+msgstr "жоқ"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "маған сұранымдар жіберуге"
+msgid "both"
+msgstr "екі жақты"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "маған қалып-күйлерін жіберуге"
+msgid "from"
+msgstr "одан"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "менің қалып-күйімді көруге"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Адрес</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Аватар:</b>"
+msgid "to"
+msgstr "оған"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Туған күні:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Қала:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Тегі:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Компания:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Ел:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Әкесінің аты:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Бөлім:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Префикс:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Қосымша адрес:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Аты:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Тегі:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Суффикс:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Толық аты</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Көше:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Аты:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Қала:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Үй парағы:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Ел:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Қосымша адрес:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Әкесінің аты:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Пошта индексі:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Аты:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Ел:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Ник аты:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Адрес</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Телефон.:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Үй парағы:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Орны:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Аты:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Пошта индексі:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Ник аты:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Телефон.:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Префикс:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Пішімі: ЖЖЖЖ-АА-КК"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Ролі:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Туған күні:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Ел:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Көше:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Аватар:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Аватарыңызды орнату үшін шертіңіз"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Суффикс:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Жеке ақпарат"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Компания:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Өзім туралы"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Орны:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Аватарыңызды орнату үшін шертіңіз"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Бөлім:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Пішімі: ЖЖЖЖ-АА-КК"
+msgid "<b>Role:</b>"
+msgstr "<b>Ролі:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Жеке ақпарат"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Жұмыс"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Сіз не істеуді қалайсыз?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Өзім туралы"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Тіркелгіні _тек Gajim ішінен өшіру"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Тіркелгіні Gajim _мен серверден өшіру"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Сіз не істеуді қалайсыз?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4
-#: ../src/roster_window.py:5557
-#: ../src/roster_window.py:5682
-#: ../src/roster_window.py:5812
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 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 "Roster Item Exchange"
+msgstr "Ростер элементтерімен алмасу"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Хабарлама мәтіні <қазір қолданылмайды, сол үшін жасырылған>"
+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:3
-msgid "Roster Item Exchange"
-msgstr "Ростер элементтерімен алмасу"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Контакт қосу..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "Мүмкіндік_тері"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "Әрек_ет"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Фа_йлдармен алмасу"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Контакт қосу..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Жиі қойылатын сұрақтар (интернеттен қарау)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "Тү_зету"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Интернеттен көмекті қарау"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Тіркелгілер"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Профайл, а_ватар"
+
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr "П_лагиндер"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Профайл, а_ватар"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Түрі"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Желіде _еместерді көрсету"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Те_к белсенді контакттарды көрсету"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Транс_порттарды көрсету"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Желіде _еместерді көрсету"
-
-#: ../data/gui/roster_window.ui.h:13
-#: ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "_Ростерді көрсету"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Тіркелгілер"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+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:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "Әрек_ет"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Көмек"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "Құра_масы"
 
-#: ../data/gui/roster_window.ui.h:19
-#: ../src/disco.py:1521
-msgid "_Edit"
-msgstr "Тү_зету"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Интернеттен көмекті қарау"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Көмек"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Бі_р хабарламаны жіберу..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Жиі қойылатын сұрақтар (интернеттен қарау)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Түрі"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Тіркелу формасын алғанша күте тұрыңыз..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Мүмкіндік_тері"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Іздеу"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Тіркелу формасын алғанша күте тұрыңыз..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Контакт қосу"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4
-#: ../src/roster_window.py:5824
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Ақпараты"
 
-#: ../data/gui/search_window.ui.h:5
-#: ../src/disco.py:1373
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "І_здеу"
 
@@ -2779,300 +2728,312 @@ msgstr "Қайда тіркелу:"
 msgid "_Cancel"
 msgstr "_Бас тарту"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Бұл хабарламаға жауап беру"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Кімге:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Жібер_у"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Хабарламаны жіберу"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Хабарламаны жіберу мен терезені жабу"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "Жауап бе_ру"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Кімге:"
+msgid "Reply to this message"
+msgstr "Бұл хабарламаға жауап беру"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "Жауап бе_ру"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Жіберу мен жабу"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Хабарламаны жіберу мен терезені жабу"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "А_вторизация беру"
+msgid "Subscription Request"
+msgstr "Жазылуға сұраным"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Контакт сіздің желіде бар болуын білуі үшін оны авторизациялаңыз"
+msgid "_Deny"
+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"
-msgstr "Жазылуға сұраным"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "А_вторизация беру"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Блоктау"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Контакт сіздің желіде бар болуын білуі үшін оны авторизациялаңыз"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Контакттарды синхрондау"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Синхрондау үшін тіркелгіні таңдаңыз"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Синхрондау үшін контакттарды таңдаңыз"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхрондау : контакттарды таңдау"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Дыбыстарды сөндіру"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Бі_р хабарламаны жіберу..."
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Қат_ыспаған оқиғаларды көрсету"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Синхрондау үшін контакттарды таңдаңыз"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Қалы_п-күй"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Чат бөлмесі"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Сұрау:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Бі_р хабарламаны жіберу..."
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Клиент:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Қат_ыспаған оқиғаларды көрсету"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Контакт уақыты:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Дыбыстарды сөндіру"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Контакт ақпараты"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID-і:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Күйі:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Жазылу:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Клиент:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Жүйе:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Түсініктемелер"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Контакт уақыты:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Аватар:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Бапталған аватар:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Контакт"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Жазылу:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Контакт ақпараты"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Сұрау:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Көбірек"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Пайдаланушы аватары:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Контакт"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Сүзгі</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Түсініктемелер"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber трафигі</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML енгізу</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "IN stanzas жасыру"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "IQ stanzas жасыру"
+msgid "Hide OUT stanzas"
+msgstr "OUT stanzas жасыру"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "Хабарлама stanzas жасыру"
+msgid "Hide Presence stanzas"
+msgstr "Бар болу stanzas жасыру"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "OUT stanzas жасыру"
+msgid "Hide IQ stanzas"
+msgstr "IQ stanzas жасыру"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "Бар болу stanzas жасыру"
+msgid "Hide Message stanzas"
+msgstr "Хабарлама stanzas жасыру"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Ақпарат/Сұрау"
+msgid "<b>Filter</b>"
+msgstr "<b>Сүзгі</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Ақпарат/Сұрау"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Бар болу"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "Хаб_арлама"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Бар болу"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML енгізу</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "Тіркелгіні тү_зету..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Жергілікті jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Жеке"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Ресурс: "
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Күйі:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber қолданбасы"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Жеке"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim жедел хабарласу"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Клиенті"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber қолданбасы"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 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 "Сіз қазір команданы орындаудасыз. Одан баст тартуды шынымен қалайсыз ба?"
+#: ../src/adhoc_commands.py:326
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+"Сіз қазір команданы орындаудасыз. Одан баст тартуды шынымен қалайсыз ба?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 msgid "Invalid Form"
 msgstr "Қате форма"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 msgid "The form is not filled correctly."
 msgstr "Форма дұрыс толтырылмаған."
 
-#: ../src/adhoc_commands.py:390
-#: ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Қызмет қате ақпаратты жіберген"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Қызмет сессия анықтағышын өзгерткен."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc командалары - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Қызмет қатені қайтарған."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Белсенді"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Сөндірілген"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Бүтін сан"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Мәтін"
 
-#: ../src/advanced_configuration_window.py:96
-#: ../src/chat_control.py:1016
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Түс"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Баптау аты"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Мәні"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Түрі"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ешнәрсе)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Жасырын"
 
@@ -3083,267 +3044,184 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Сізде жаңа мәліметтер бар (және %d көрсетілмеген)"
 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)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:77
-msgid "English"
-msgstr "Ағылшын"
-
-#: ../src/chat_control.py:77
-msgid "Belarusian"
-msgstr "Беларус"
-
-#: ../src/chat_control.py:77
-msgid "Bulgarian"
-msgstr "Болгар"
-
-#: ../src/chat_control.py:77
-msgid "Breton"
-msgstr "Бретон"
-
-#: ../src/chat_control.py:77
-msgid "Czech"
-msgstr "Чех"
-
-#: ../src/chat_control.py:77
-msgid "German"
-msgstr "Неміс"
-
-#: ../src/chat_control.py:77
-msgid "Greek"
-msgstr "Грек"
-
-#: ../src/chat_control.py:77
-msgid "British"
-msgstr "Британиялық"
-
-#: ../src/chat_control.py:77
-msgid "Esperanto"
-msgstr "Эсперанто"
-
-#: ../src/chat_control.py:77
-msgid "Spanish"
-msgstr "Испаниялық"
-
-#: ../src/chat_control.py:77
-msgid "Basque"
-msgstr "Баск"
-
-#: ../src/chat_control.py:77
-msgid "French"
-msgstr "Француз"
-
-#: ../src/chat_control.py:77
-msgid "Croatian"
-msgstr "Хорватиялық"
-
-#: ../src/chat_control.py:77
-msgid "Italian"
-msgstr "Италияндық"
-
-#: ../src/chat_control.py:77
-msgid "Norwegian (b)"
-msgstr "Норвегиялық (b)"
-
-#: ../src/chat_control.py:77
-msgid "Dutch"
-msgstr "Голландия"
-
-#: ../src/chat_control.py:77
-msgid "Norwegian"
-msgstr "Норвегиялық"
-
-#: ../src/chat_control.py:77
-msgid "Polish"
-msgstr "Поляк"
-
-#: ../src/chat_control.py:77
-msgid "Portuguese"
-msgstr "Португалдық"
-
-#: ../src/chat_control.py:77
-msgid "Brazilian Portuguese"
-msgstr "Бразилия португалдық"
-
-#: ../src/chat_control.py:77
-msgid "Russian"
-msgstr "Орыс"
-
-#: ../src/chat_control.py:77
-msgid "Serbian"
-msgstr "Сербиялық"
-
-#: ../src/chat_control.py:77
-msgid "Slovak"
-msgstr "Словак"
-
-#: ../src/chat_control.py:77
-msgid "Swedish"
-msgstr "Швециялық"
-
-#: ../src/chat_control.py:77
-msgid "Chinese (Ch)"
-msgstr "Қытай (Ch)"
-
-#: ../src/chat_control.py:218
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/chat_control.py:223
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: ../src/chat_control.py:228
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "Қате."
 
-#: ../src/chat_control.py:550
-msgid "Spelling language"
-msgstr "Емле тілі"
-
 #. we are not connected
-#: ../src/chat_control.py:582
-#: ../src/chat_control.py:791
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: ../src/chat_control.py:583
-#: ../src/chat_control.py:792
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Хабарламаңыз байланыс орнатпағанша жіберілмейді."
 
-#: ../src/chat_control.py:998
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Асты сызылған"
 
-#: ../src/chat_control.py:999
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Сызылған"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Қаріп"
 
-#: ../src/chat_control.py:1031
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Пішімдеуді тазарту"
 
-#: ../src/chat_control.py:1109
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Файлды шынымен жіберу керек пе?"
 
-#: ../src/chat_control.py:1110
+#: ../src/chat_control.py:1158
 #, 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:1574
-#: ../src/chat_control.py:2098
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG шифрлеу қосулы"
 
-#: ../src/chat_control.py:1595
-#: ../src/chat_control.py:1598
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "Талап етеді: python-farsight."
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Контакт файлдармен алмасуды қолдамайды."
 
 #. Add to roster
-#: ../src/chat_control.py:1624
-#: ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277
-#: ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251
-#: ../src/dialogs.py:1098
-#: ../src/dialogs.py:2182
-#: ../src/dialogs.py:2211
-#: ../src/gui_interface.py:497
-#: ../src/gui_menu_builder.py:252
-#: ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1646
-#: ../src/roster_window.py:1648
-#: ../src/roster_window.py:1981
-#: ../src/roster_window.py:3458
-#: ../src/roster_window.py:3485
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Ростерде емес"
 
-#: ../src/chat_control.py:1654
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Аудио сессияны ауыстыру"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Видео сессияны ауыстыру"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Бұл мүмкіндік Windows-та қолжетерсіз."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "_Файлды жіберу"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Контакт файлдармен алмасуды қолдамайды."
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Контактқа файлды жіберу үшін сізге оның шын JID-н білу керек."
 
-#: ../src/chat_control.py:1765
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s қалып-күйі : %(state)s, себебі: %(reason)s"
 
-#: ../src/chat_control.py:1957
+#: ../src/chat_control.py:2098
 #, 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:2078
-#: ../src/dialogs.py:5454
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "GPG кілті көрсетілмеген"
 
-#: ../src/chat_control.py:2079
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Бұл конттактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды GPG көмегімен шифрлей алмайсыз."
+#: ../src/chat_control.py:2230
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
+msgstr ""
+"Бұл конттактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды GPG "
+"көмегімен шифрлей алмайсыз."
 
-#: ../src/chat_control.py:2088
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG шифрлеуі сөндірулі"
 
-#: ../src/chat_control.py:2114
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Сессия тарихы САҚТАЛАДЫ"
 
-#: ../src/chat_control.py:2116
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Сессия тарихы САҚТАЛАМАЙДЫ"
 
 #. encryption %s active
-#: ../src/chat_control.py:2133
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "белсенді"
 
-#: ../src/chat_control.py:2133
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "белсенді ЕМЕС"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "сақталады"
 
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "сақталМАЙды"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2139
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "аутентификацияланған"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2143
+#: ../src/chat_control.py:2294
 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:2150
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3352,76 +3230,81 @@ msgstr ""
 "%(type)s түрдегі шифрлену %(status)s және %(authenticated)s.\n"
 "Сөйлесу сессия тарихыңыз %(logged)s."
 
-#: ../src/chat_control.py:2293
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Сессияны бастаудан бас тартылды"
 
-#: ../src/chat_control.py:2303
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "Бұл сессия серверде САҚТАЛАДЫ"
 
-#: ../src/chat_control.py:2305
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "Сессия тарихы серверде АРХИВТЕЛМЕЙДІ"
 
-#: ../src/chat_control.py:2314
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Бұл сессия шифрленген"
 
-#: ../src/chat_control.py:2317
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " және оның тарихы САҚТАЛАДЫ"
 
-#: ../src/chat_control.py:2319
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " және оның тарихы САҚТАЛМАЙАДЫ"
 
-#: ../src/chat_control.py:2324
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Қашықтағы контакттың шындылығы расталмаған. Көбірек білу үшін таңбашаға шертіңіз."
+#: ../src/chat_control.py:2470
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Қашықтағы контакттың шындылығы расталмаған. Көбірек білу үшін таңбашаға "
+"шертіңіз."
 
-#: ../src/chat_control.py:2326
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E шифрлену сөндірулі"
 
-#: ../src/chat_control.py:2370
-#: ../src/chat_control.py:2383
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Келесі хабарлама шифрленген ЕМЕС болған"
 
-#: ../src/chat_control.py:2376
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Келесі хабарлама шифрленген болған"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2658
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Сіз жаңа ғана \"%s\" жіберген жаңа хабарламаны алдыңыз"
 
-#: ../src/chat_control.py:2659
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Егер сіз бұл бетті жауып, тарихты сақтау сөндірілген болса, бұл хабарлама жоғалтылады."
-
-#: ../src/chat_control.py:2826
-#: ../src/common/connection_handlers_events.py:869
-#: ../src/common/connection_handlers.py:945
-#: ../src/common/connection_handlers.py:1040
-#: ../src/common/connection_handlers.py:1696
-#: ../src/common/connection.py:459
-#: ../src/common/logger.py:1126
-#: ../src/gajim.py:200
-#: ../src/session.py:93
+#: ../src/chat_control.py:2799
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Егер сіз бұл бетті жауып, тарихты сақтау сөндірілген болса, бұл хабарлама "
+"жоғалтылады."
+
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Дерекқор қатесі"
 
-#: ../src/chat_control.py:2827
+#: ../src/chat_control.py:2968
 #, 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:3061
-#: ../src/gui_interface.py:1042
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3430,241 +3313,576 @@ msgstr ""
 "%s жіберген хабарламаны декодалау мүмкін емес\n"
 "Ол зақымдалған шығар."
 
-#: ../src/chat_control.py:3094
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s қазір %(status)s"
 
-#: ../src/common/check_paths.py:38
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Файлдармен алмасу"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Өлшемі: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "_Тіркелгілер"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Файлдармен алмасу аяқталды"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Топ чатына шақыру"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Файлды ашу қатесі"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Файлдармен алмасу тоқтатылды"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Файлдармен алмасу тоқтатылды"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Тораппен байланысты орнату мүмкін емес."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Контактқа файлды жібереді"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s табылмады"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Кетіп қалған"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+msgid "Available"
+msgstr "Қолжетерлік"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Терезені жасырады"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "OpenPGP _шифрлеуін қосу/сөндіру"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Контактқа файлды жібереді"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s дұрыс loglevel емес"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Байланыс қолжетерсіз"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Байланыс қолжетерсіз"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Сіздің ник атыңызды өзгерту (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Ник қате"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr "Па_йдаланушымен чат терезесін ашу"
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Қолданылатын ник"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Топ чат беті/терезесін жабу алдында сұрау."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "%s қазір %s үшін жіберу"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Сізді топтық чатқа шақырған"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Сервер қате"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "қатысуы өзгертілген"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s топтық чаттың аты емес."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "\"contact_jid\" аргументі жоқ"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "логтар дерекқорын жасау"
 
-#: ../src/common/check_paths.py:86
+#: ../src/common/check_paths.py:87
 msgid "creating cache database"
 msgstr "кэш дерекқорын жасау"
 
-#: ../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:317
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s файл екен, алайда бума болуы тиіс еді"
 
-#: ../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:318
-#: ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:335
-#: ../src/common/check_paths.py:343
+#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim қазір өз жұмысын аяқтайды"
 
-#: ../src/common/check_paths.py:334
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s бума екен, алайда файл болуы керек еді"
 
-#: ../src/common/check_paths.py:352
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "'%s' бумасын жасау"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Қалып-күй ақпаратын өзгерту"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Қалып-күйді өзгерту"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Бар болудың түрін мен анықтамасын орнату"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Чатқа дайын"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Осында"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Кеңейтілген кетіп қалған"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Мазамды алмаңыз"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Желіде емес - байланыспаған"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Бар болудың анықтамасы:"
 
-#: ../src/common/commands.py:149
-#: ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Қалып-күй өзгертілді."
 
-#: ../src/common/commands.py:181
-#: ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Топ чаттардан шығу"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s, қайда: %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Сіз топтық чатқа кірген жоқсыз."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:817
-#: ../src/roster_window.py:1650
-#: ../src/roster_window.py:1652
-#: ../src/roster_window.py:2504
-#: ../src/roster_window.py:5442
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Топтық чаттар"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Келесі топ чаттарынан шығасыз:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Оқылмаған хабарламаларды бағдарлау"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Барлық оқылмаған хабарламалар бағдарланды."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr "Оқылмаған хабарламаны бағдарлау мен шығу"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Пайдаланушы бос емес болса дыбысты ойнату"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Хабарламаларды көрсету үшін D-Bus пен Notification-Daemon қолдану"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Ростерде тек желідегі мен чатқа дайын контакттарды көрсету"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Қалып-күйіңіз Кетіп қалғанға ауысу үшін керек уақыт шамасы."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Кетіп қалған, $T минуттан көп белсенді емес)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr "$S ағымдағы күй хабарласымен, ал $T авто қолжетерсіз уақыт шамасымен алмастырылады."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgstr ""
+"$S ағымдағы күй хабарласымен, ал $T авто қолжетерсіз уақыт шамасымен "
+"алмастырылады."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Қалып-күйіңіз Қолжетерсізге ауысу үшін керек уақыт шамасы."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Қол жетерсіз, $T минуттан көп белсенді емес)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr "$S ағымдағы күй хабарласымен, ал $T авто кеңейтілген қолжетерсізге уақыт шамасымен алмастырылады."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
+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'."
+#: ../src/common/config.py:89
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+"Жүйелік сөре таңбашасын қашан көрсету керек. Мүмкін мәндері: 'never', "
+"'on_event', 'always'."
+
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Кіріс ник түсі."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Шығыс ник түсі."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Кіріс мәтін түсі."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Шығыс мәтін түсі."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Күй хабарламасы мәтін түсі."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Оқиға_ны жүйелік сөреде көрсету"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Оқиға_ны жүйелік сөреде көрсету"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Жаңа хабарламаларды қалқымалы терезеде көрсету керек пе?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Файлдармен алмасуға сұраным"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Файлдармен алмасу тоқтатылды"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Файлдармен алмасу аяқталған кезде қалқымалы хабарламаны көрсету"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Топ чатына шақыру"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Кіріс ник аты мәтін қарібі."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Шығыс ник аты мәтін қарібі."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Кіріс мәтін қарібі."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Шығыс мәтін қарібі."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Күй хабарламасы мәтін қарібі."
 
-#: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Жиналған жолдар (тіркелгілер мен топтар) тізімі (бос аралықпен ажыратылсын)."
+#: ../src/common/config.py:116
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Жиналған жолдар (тіркелгілер мен топтар) тізімі (бос аралықпен ажыратылсын)."
 
 #. sorted alphanum
-#: ../src/common/config.py:106
-#: ../src/common/config.py:506
-#: ../src/common/optparser.py:294
-#: ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524
-#: ../src/gui_interface.py:2631
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "бастапқысы"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Емле тексеруші қолданатын тілі"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3674,687 +3892,1169 @@ msgstr ""
 "'sometimes' - уақытты әр print_ichat_every_foo_minutes минут сайын көрсету.\n"
 "'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' мәнінде болса ғана қолданылады."
+#: ../src/common/config.py:125
+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
+#: ../src/common/config.py:128
 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* жуан қаріппен көрсетіледі, бірақ * * өшірілмейді."
-
-#: ../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 орнатыңыз)"
+#: ../src/common/config.py:129
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Белсенді болса, */_ өшірілмейді. Мысалы, *abc* жуан қаріппен көрсетіледі, "
+"бірақ * * өшірілмейді."
 
-#: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Топтық чатта ник аттарын автотолықтыру (tab пернесі) қолдану кезінде ник атының артына қосылатын таңба."
+#: ../src/common/config.py:132
+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:131
-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:141
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Топтық чатта ник аттарын автотолықтыру (tab пернесі) қолдану кезінде ник "
+"атының артына қосылатын таңба."
 
-#: ../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"
+#: ../src/common/config.py:142
+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:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
+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:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Сөйлесулерде ник атына дейін қойылатын таңбалар"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 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"
+#: ../src/common/config.py:177
+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
+#: ../src/common/config.py:179
 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 "Чат беті/терезесі қайта ашылған кезде алдыңғы сөйлесуден қанша тарих жолын есте сақтау керек."
+#: ../src/common/config.py:180
+#, fuzzy
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened?"
+msgstr ""
+"Чат беті/терезесі қайта ашылған кезде алдыңғы сөйлесуден қанша тарих жолын "
+"есте сақтау керек."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Алдыңғы сөйлесуден қалған соңғы жолдар қанша минут бойы қалуы керек."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын сұрау керек."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
+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-ге орнатыңыз."
+#: ../src/common/config.py:184
+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:172
-msgid "Should autorejoin be activated when we are being kicked from a conference?"
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
 msgstr "Сізді чат бөлмесінен тепкен кезде қайта автокіруді іске қосу керек пе?"
 
-#: ../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 клиенті сияқты)."
+#: ../src/common/config.py:186
+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
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+KeyUP үшін қанша тарих жолын сақтау керек."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, 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
+#: ../src/common/config.py:194
 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 сөндірілмеген және олар глобалды қалып-күймен сихрондалса)."
+#: ../src/common/config.py:195
+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 (сөндірілген)."
+#: ../src/common/config.py:196
+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 (сөндірілген)."
+#: ../src/common/config.py:197
+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 минут сайын көрсету."
+#: ../src/common/config.py:199
+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
+#: ../src/common/config.py:200
 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 "Бұл тізімдегі бөлмелерді жабу алдында әрқашан сұрау. Бөлмелер бос аралықпен ажыратылсын."
+#: ../src/common/config.py:201
+#, fuzzy
+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 "Бұл тізімдегі бөлмелерді жабу алдында ешқашан сұрамау. Бөлмелер бос аралықпен ажыратылсын."
+#: ../src/common/config.py:202
+#, fuzzy
+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 "Беттері бар терезені жабу алдында сұрау, егер ақпаратты жоғалту мүмкіндігі болса (чат, жеке чат, қайырылмайтын топтық чат)"
+#: ../src/common/config.py:203
+#, fuzzy
+msgid ""
+"Ask before closing tabbed chat window if there are controls that can lose "
+"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 "Жергілікті интерфейстерге қоса, үтірмен ажыратылған хост аттары, адрес/порттар бағдарлауы кезінде Файлдармен алмасу үшін оларды жібереміз."
+#: ../src/common/config.py:206
+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
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандарты КиБ = 1024 байт, ал КБ = 1000 байтқа тең деп айтады."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "Оқиғалар жөнінде жүйелік сөреде хабарлау."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Тек бір сөйлесу бар болса чат терезесінде беттерді көрсету керек пе?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Чат терезесінде бет шекарасын көрсету керек пе?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 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. Үлкенірек нөмірлер қауіпсіздігі жоғарырақ, бірақ сессияны бастау кезінде оны есептеу үшін көбірек уақыт кетеді."
+#: ../src/common/config.py:220
+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
+#: ../src/common/config.py:241
 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 "Топтық чаттарда түспен ерекшелеу үшін сөздер тізімі, нүктелі үтірмен ажыратылсын."
+#: ../src/common/config.py:246
+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 "Белсенді болса, Терезелер басқарушысы ұсынған X батырмасын шерткенде Gajim жұмысын өз аяқтайды. Тек жүйелік сөре таңбашасы іске қосулы болу керек."
+#: ../src/common/config.py:247
+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 клиенті ма, соны тексереді."
+#: ../src/common/config.py:248
+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 оқылмаған хабарламалар бар әр бетте таңбашаны көрсетеді. Темаға байланысты, таңбашаның анимациясы болуы мүмкін."
+#: ../src/common/config.py:249
+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 ростерде әр контакт астында оның қалып-күй хабарламасын көрсетеді, егер ол бар болса."
+#: ../src/common/config.py:250
+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
+#: ../src/common/config.py:256
 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 әр контакттан аватарды сұрайды, егер оның соңғы рет аватары болмаса, не кэштегі аватар тым ескі болса."
+#: ../src/common/config.py:257
+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:258
+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: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 чаттарда контакт өз күйін не күй хабарламасын өзгертсе, күй жолын енді жазбайды."
+#: ../src/common/config.py:259
+#, fuzzy
+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: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 тек БІРЕУ топтық чатқа кірді/шықты хабарламаларын көрсетеді."
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Жаңа кірген контакт аты үшін фон түсі."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 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 "Белсенді болса, тарихтан алынған хабарламалар қаріпі қалыптыдан кішірек болады."
+#: ../src/common/config.py:265
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Белсенді болса, тарихтан алынған хабарламалар қаріпі қалыптыдан кішірек "
+"болады."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Транспорттың өзі үшін аватарды көрсетпеу."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 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 болса, кезекте оқиға бар болса, терезе шегі жыпылықтайды."
+#: ../src/common/config.py:268
+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 ақпаратын көрсетпеу үшін бұл опцияны сөндіріңіз."
+#: ../src/common/config.py:270
+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
+#: ../src/common/config.py:273
+#, fuzzy
 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) is 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
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Сөндірілеген болса, сіз чат терезесінде аватарды көрмейтін боласыз."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Белсенді болса, escape батырмасы бет/терезені жабады"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Чат терезелерінде батырмаларды жасырады."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Топтық чат терезесінде тақырыпты жасырады"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Екі адам чат терезесінде тақырыпты жасырады"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 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 "Чатта, алдыңғы хабарламадағы адам емес болмаса ғана, жол басынан контакт атын көрсету."
+#: ../src/common/config.py:281
+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
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Біріккен тізбекті ник атын қолдану кезіндегі шегіну."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 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 "\":\" арқылы бөлінген түстер тізімі, топ чатында никтер түстері ретінде пайдалану үшін."
+#: ../src/common/config.py:284
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"\":\" арқылы бөлінген түстер тізімі, топ чатында никтер түстері ретінде "
+"пайдалану үшін."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-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 "Метаконтакттарды жасауды растау сұхбатын көрсету керек пе? Бос жол терезені ешқашан көрсетпеуді белгілейді."
+msgstr ""
+"Оқылмағандар болмаса, Ctrl-Tab басу арқылы келесі жазылудағы бетке өтеді."
 
-#: ../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 "Контактты блоктауды растау сұхбатын көрсету керек пе? Бос жол терезені ешқашан көрсетпеуді белгілейді."
+#: ../src/common/config.py:286
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Метаконтакттарды жасауды растау сұхбатын көрсету керек пе? Бос жол терезені "
+"ешқашан көрсетпеуді белгілейді."
 
-#: ../src/common/config.py:260
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Таңдауыңызша күйді растау сұхбатын көрсету керек пе? Бос жол терезені ешқашан көрсетпеуді белгілейді."
+#: ../src/common/config.py:287
+msgid ""
+"Should we show the confirm block contact 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 "Қосулы тұрса, тіркелгіні баптау терезесінде сіз приоритеттің теріс мәнің орната аласыз. АБАЙЛАҢЫЗ, теріс приоритетпен отырған кезде, серверден бірде-бір хабарламаны АЛМАЙСЫЗ."
+#: ../src/common/config.py:288
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Таңдауыңызша күйді растау сұхбатын көрсету керек пе? Бос жол терезені "
+"ешқашан көрсетпеуді белгілейді."
 
-#: ../src/common/config.py:262
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін Gnome Keyring (егер қолжетерлік болса) қолданады."
+#: ../src/common/config.py:289
+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:263
-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:290
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін Gnome Keyring (егер "
+"қолжетерлік болса) қолданады."
 
-#: ../src/common/config.py:264
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Қосулы тұрса, Gajim желідегі мен барлық контакттар санын тіркелгі мен топтар жолында көрсетеді."
+#: ../src/common/config.py:291
+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: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' түрде бола алады. Бос емес болса, кірген хабарламалардың барлығын осы түрде деп есептеу"
+#: ../src/common/config.py:292
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Қосулы тұрса, Gajim желідегі мен барлық контакттар санын тіркелгі мен топтар "
+"жолында көрсетеді."
 
-#: ../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 сізге соңғы болып хабарламаны жіберген контактты белгілейді, егер чат терезесі ашылған болмаса."
+#: ../src/common/config.py:293
+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: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 көмегімен суретке айналдырады."
+#: ../src/common/config.py:294
+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:268
+#: ../src/common/config.py:295
 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 "Сөйлесулерде көрсетілетін жолдардың максимал саны. Ескі жолдар өшіріледі."
+#: ../src/common/config.py:296
+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 жіберген хабарламалар терезелері жүйелік сөреден көрсетіледі."
+#: ../src/common/config.py:297
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
+msgstr ""
+"Қосулы болса, notification-daemon жіберген хабарламалар терезелері жүйелік "
+"сөреден көрсетіледі."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 формулалар өлшемдерін өзгерту. Жоғары мән үлкенін білдіреді."
-
-#: ../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 бөлек өнделеді)"
+#: ../src/common/config.py:299
+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 "Тіркелгіге байланыс орнатылған кезде барлық желіде емес контакттардан желіде емес күй хабарламасын сұрау. ЕСКЕРТУ: Бұл көп сұранымдардың жіберілуіне әкеп соғады!"
+#: ../src/common/config.py:300
+#, fuzzy
+msgid ""
+"Ask offline status message to all offline contacts when connection to an "
+"account is established. WARNING: This causes a lot of requests to be sent!"
+msgstr ""
+"Тіркелгіге байланыс орнатылған кезде барлық желіде емес контакттардан желіде "
+"емес күй хабарламасын сұрау. ЕСКЕРТУ: Бұл көп сұранымдардың жіберілуіне әкеп "
+"соғады!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 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\""
+#: ../src/common/config.py:302
+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
+#: ../src/common/config.py:307
 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
+#: ../src/common/config.py:308
 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 сервердің өзі береді."
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:312
+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:313
 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 күй таңбашаларына кішкене ғана түсті шаршы қосады"
+#: ../src/common/config.py:314
+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_* опцияларында бапталған."
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
 
-#: ../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 опциясы сөндірілген болса ғана қолданылады"
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері "
+"қолданылады."
+
+#: ../src/common/config.py:332
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Приоритет күйіңізге сәйкес автоөзгертіледі. Приоритеттер autopriority_* "
+"опцияларында бапталған."
+
+#: ../src/common/config.py:340
+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:341
 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."
+#: ../src/common/config.py:343
+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 "Сөндірілген болса, бұл тіркелгі сөндіріледі және ростерде көрсетілмейтін болады."
+#: ../src/common/config.py:344
+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 бапталған болса да."
+#: ../src/common/config.py:347
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"Сөндірілген болса, бар болу хабарламаларды GPG кілтімен жазбау, GPG "
+"бапталған болса да."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Бұл тіркелгі үшін ESessions шифрлеуді іске қосу."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 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 бола алады"
+#: ../src/common/config.py:351
+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 "Парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын көрсету."
+#: ../src/common/config.py:352
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
+msgstr ""
+"Парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын "
+"көрсету."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 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 "ШИФРЛЕНБЕГЕН парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын көрсету."
+#: ../src/common/config.py:354
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
+msgstr ""
+"ШИФРЛЕНБЕГЕН парольдерді шифрленбеген байланыс арқылы беру алдында ескерту "
+"сұхбатын көрсету."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Елемеу үшін ssl қателер тізімі, бос аралықпен ажыратылсын."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Белсенді еместіктен кейін бос аралық жіберліген"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 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 дестесіне жауапты қанша секунд күту керек."
+#: ../src/common/config.py:371
+#, fuzzy
+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
+#: ../src/common/config.py:375
 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 опциясындағы прокси адрестерін қолданады."
+#: ../src/common/config.py:378
+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
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Алу сұранымдарына жауап"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Алу сұранымы жіберілді"
 
-#: ../src/common/config.py:369
-msgid "Allow Gajim to send information about the operating system you are running."
-msgstr "Gajim-ге сіздің операциялық жүйеңіз туралы ақпаратты жіберуге рұқсат ету."
+#: ../src/common/config.py:403
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Gajim-ге сіздің операциялық жүйеңіз туралы ақпаратты жіберуге рұқсат ету."
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:404
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim-ге сіздің жергілікті уақытты жіберуге рұқсат ету."
 
-#: ../src/common/config.py:371
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Шифрленген сессия кезінде Gajim хабарламаларыңызды тарихқа сақтауы керек пе?"
+#: ../src/common/config.py:405
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Шифрленген сессия кезінде Gajim хабарламаларыңызды тарихқа сақтауы керек пе?"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr "Қосқыңыз келетін контакттарға жіберілетін хабарлама"
 
-#: ../src/common/config.py:375
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr "Сервердегі логтармен соңғы синхрондау уақыты."
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Анонимды аутентификация"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Анони_мды аутентификация"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Бұл контакт үшін OpenPGP қосулы тұр ма?"
 
-#: ../src/common/config.py:438
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
+#: ../src/common/config.py:478
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
 msgstr "Қолжетерлік болса, Gajim шифрленген сессияны жасау керек пе?"
 
-#: ../src/common/config.py:439
-#: ../src/common/config.py:442
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Қай тілде емлені тексеру керек"
 
-#: ../src/common/config.py:448
-msgid "all or space separated status"
-msgstr "барлық не бос аралықпен ажыратылған күй"
-
-#: ../src/common/config.py:449
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', немесе 'both'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек."
 
-#: ../src/common/config.py:450
-#: ../src/common/config.py:452
-#: ../src/common/config.py:453
-#: ../src/common/config.py:456
-#: ../src/common/config.py:457
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' немесе ''"
+#: ../src/common/config.py:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын "
+"сұрау керек."
 
-#: ../src/common/config.py:461
-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 жұмыс аяқтағанда сақталады). Бұл опция плагиндерді белсенді(емес) қылу үшін ҚОЛДАНБАҢЫЗ. Орнына GUI қолданыңыз."
+#: ../src/common/config.py:487
+#, fuzzy
+msgid ""
+"State whether plugins should be activated on startup (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+"Жұмысты аяқтау кезінде плагиндер белсенді қылу керек пе, соны анықтайды (Бұл "
+"Gajim жұмыс аяқтағанда сақталады). Бұл опция плагиндерді белсенді(емес) қылу "
+"үшін ҚОЛДАНБАҢЫЗ. Орнына GUI қолданыңыз."
 
-#: ../src/common/config.py:466
-#: ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Ұйқыда"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Жақында ораламын"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Бірнеше минутта ораламын."
 
-#: ../src/common/config.py:468
-#: ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Тамақ ішуде"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Мен тамақ ішудемін, хабарламаңызды қалдырыңыз."
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Кино"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Кино көрудемін."
 
-#: ../src/common/config.py:470
-#: ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Жұмыс істеудемін"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Мен жұмыс істеп отырмын."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Мен телефонмен сөйлесудемін."
 
-#: ../src/common/config.py:472
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Жоқ"
 
-#: ../src/common/config.py:472
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Мен өмірмен рахаттанып отырмын."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Мен бармын."
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Мен чат үшін дайынмын."
 
-#: ../src/common/config.py:485
-#: ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Жақында боламын."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Мен жоқпын."
 
-#: ../src/common/config.py:487
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Мазамды алмаңыз."
 
-#: ../src/common/config.py:488
-#: ../src/common/config.py:489
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Қош!"
 
-#: ../src/common/config.py:499
-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:526
+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:500
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "MUC хабарламасы келген кезде ойналатын дыбыс."
 
-#: ../src/common/config.py:509
-#: ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:513
-#: ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:517
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:521
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers_events.py:353
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Оған"
+
+#: ../src/common/connection_handlers_events.py:370
 #, 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 ""
+"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/ сияқты ростерді басқару құралдарын "
+"қолданыңыз"
 
-#: ../src/common/connection_handlers_events.py:782
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s жіберген жазылудан бас тарту сұранымы"
 
-#: ../src/common/connection_handlers_events.py:866
-#: ../src/common/connection_handlers.py:339
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1038
-#: ../src/common/connection_handlers.py:1694
-#: ../src/common/connection.py:456
-#: ../src/common/logger.py:1124
-#: ../src/gajim.py:382
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "Дискке жазу қатесі"
 
-#: ../src/common/connection_handlers_events.py:870
-#: ../src/common/connection_handlers.py:946
-#: ../src/common/connection_handlers.py:1041
-#: ../src/common/connection_handlers.py:1697
-#: ../src/common/connection.py:460
-#: ../src/common/logger.py:1127
-#: ../src/gajim.py:201
-#: ../src/session.py:94
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, 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) не өшіріңіз (бар тарих жоғалады)."
+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) не өшіріңіз (бар тарих жоғалады)."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:891
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "Бөлме жойылған"
 
-#: ../src/common/connection_handlers_events.py:899
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Оның орнына мына бөлмеге кіре аласыз: %s"
 
-#: ../src/common/connection_handlers_events.py:972
-#: ../src/common/connection.py:258
-#: ../src/config.py:2093
-#: ../src/config.py:2102
-#: ../src/config.py:2170
-#: ../src/config.py:3586
-#: ../src/dataforms_widget.py:622
-#: ../src/dialogs.py:3036
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Қате Jabber ID"
 
-#: ../src/common/connection_handlers_events.py:973
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Қате JID жіберген хабарлама алынды, оны елемейміз."
 
-#: ../src/common/connection_handlers_events.py:1421
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "%(message)s жіберу кезіндегі қате ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Белгісіз SSL қатесі: %d"
 
-#: ../src/common/connection_handlers.py:95
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Жаңа бір хабарлама"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "%(nickname)s жіберген бір жаңа хабарлама"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Жаңа жеке хабарлама"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "%s топ чатынан жаңа жеке хабарлама"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "%(nickname)s жазған"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Жаңа хабарлама"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "%(nickname)s жіберген жаңа хабарлама"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s күйін өзгерткен"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s қазір %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Контакт қалып-күйін өзгертті"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s желіге кірді"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Контакт кірді"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s желіден шықты"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Контакт шықты"
+
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Қолданыстағы емес модульді жүктеу сәтсіз"
 
-#: ../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 транспорты үшін тіркелу ақпараты уақытында келмеген"
@@ -4368,180 +5068,185 @@ msgstr "Тіркелу сәтті аяқталды"
 msgid "Registration with agent %s succeeded"
 msgstr "%s агенті көмегімен тіркелу сәтті аяқталды"
 
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Тіркелу сәтсіз"
 
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:146
 #, 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:564
-#: ../src/common/connection.py:1511
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Жасырын болуға қолдау жоқ"
 
-#: ../src/common/connection_handlers.py:565
-#: ../src/common/connection.py:1512
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "%s тіркелгісі жасырын болуды қолдамайды."
 
-#: ../src/common/connection_handlers.py:1739
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "Мен өз ростеріме сізді қосқым келеді"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Шығарушы сертификатын алу мүмкін емес"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Сертификат үшін CRL алу мүмкін емес"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Сертификат қолтаңбасын декодалау мүмкін емес"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "CRL қолтаңбасын декодалау мүмкін емес"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Шығарушының ортақ кілтін декодалау мүмкін емес"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Сертификат қолтаңба қатесі"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "CRL қолтаңба қатесі"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Сертификат мерзімі әлі басталмаған"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Сертификат мерзімі біткен"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL мерзімі әлі басталмаған"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL мерзімі біткен"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Сертификаттың notBefore өрісіндегі пішім қатесі"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Сертификаттың notAfter өрісіндегі пішім қатесі"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "CRL lastUpdate өрісіндегі пішім қатесі"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "CRL nextUpdate өрісіндегі пішім қатесі"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Жады жеткіліксіз"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Өздігінен қолтаңбасы бар сертификат"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Сертификаттар тобындағы өздігінен қолтаңбасы бар сертификат"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Жергілікті шығарушы сертификатын алу мүмкін емес"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Бірінші сертификатты тексеру мүмкін емес"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Сертификаттар тізімі тым үлкен"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Сертификат қайта шақырылған"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "CA қате сертификаты"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Жол ұзындық шектеуі асырылған"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Қолдау жоқ сертификат мақсаты"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Сертификатқа сенім жоқ"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Сертификат тайдырылған"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Сертификатты ұсынушының сәйкес еместігі"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
-msgstr "Сертификаттау орталығы мен иесі кілттерінің идентификаторлары өзара сәйкес емес"
+msgstr ""
+"Сертификаттау орталығы мен иесі кілттерінің идентификаторлары өзара сәйкес "
+"емес"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
-msgstr "Сертификаттау орталығы мен ұсынушы кілттерінің идентификаторлары өзара сәйкес емес"
+msgstr ""
+"Сертификаттау орталығы мен ұсынушы кілттерінің идентификаторлары өзара "
+"сәйкес емес"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Кілтті қолдану сертификаттарға қолтаңбаны қою қамтымайды"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Қолданбаны растау қатесі"
 
-#: ../src/common/connection.py:259
-#: ../src/dialogs.py:3037
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:281
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Қашықтағы бар болу хабарламасында қолтаңба жоқ және кілт көрсетілмеген."
+msgstr ""
+"Қашықтағы бар болу хабарламасында қолтаңба жоқ және кілт көрсетілмеген."
 
-#: ../src/common/connection.py:284
+#: ../src/common/connection.py:307
 #, 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:337
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Бұл хабарлама *шифрленген* (Қараңыз :XEP:`27`]"
 
-#: ../src/common/connection.py:446
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4550,78 +5255,77 @@ msgstr ""
 "Тақырыбы: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:831
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" тіркелгісімен байланыс үзілді"
 
-#: ../src/common/connection.py:832
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Қолмен қайта байланысты орнату."
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:843
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "%(name)s сервері тіркелу сұранымына қате жауап берген: %(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "%s сервері басқа тіркелу формасын ұсынды"
 
-#. wrong answer
-#: ../src/common/connection.py:901
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Қате жауап"
 
-#: ../src/common/connection.py:902
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr " %(name)s қызметі тіркелуге сұранымына қате жауап берген: %(error)s"
 
-#: ../src/common/connection.py:1190
-#: ../src/common/connection.py:1323
-#: ../src/common/connection.py:1906
-#: ../src/common/zeroconf/connection_zeroconf.py:201
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "\"%s\" үшін байланыс орнату мүмкін емес"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "\"%s\" үшін байланыс орнату мүмкін емес"
 
-#: ../src/common/connection.py:1191
-#: ../src/gui_interface.py:554
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Байланысты тексеріңіз не кейін қайталап көріңіз."
 
-#: ../src/common/connection.py:1196
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер жауабы: %s"
 
-#: ../src/common/connection.py:1209
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Проксиге байланыс орнату сәтсіз аяқталды"
 
-#: ../src/common/connection.py:1241
-#: ../src/common/connection.py:1302
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "%s тіркелгісіне байланыс орнату сәтсіз аяқталды"
 
-#: ../src/common/connection.py:1242
-#: ../src/common/connection.py:1303
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "%s тіркелгісімен байланыс үзілген. Қайтадан орнатып көреміз."
 
-#: ../src/common/connection.py:1267
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s сертификатының нақтылығы қате болуы мүмкін."
 
-#: ../src/common/connection.py:1270
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4630,7 +5334,7 @@ msgstr ""
 "\n"
 "SSL Қатесі: <b>%s</b>"
 
-#: ../src/common/connection.py:1272
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4639,96 +5343,100 @@ msgstr ""
 "\n"
 "Белгісіз SSL қатесі: %d"
 
-#: ../src/common/connection.py:1324
-msgid "Check your connection or try again later"
-msgstr "Байланысты тексеріңіз не кейін қайталап көріңіз"
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "%s сертификатының нақтылығы қате болуы мүмкін."
 
-#: ../src/common/connection.py:1358
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "\"%s\" үшін байланыс орнату мүмкін емес"
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" үішн аутентификация сәтсіз"
 
-#: ../src/common/connection.py:1360
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Тіркелгі атын мен пароліңізді тексеріңіз."
 
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Жекелік тізімін өшіру кезінде қате кетті"
 
-#: ../src/common/connection.py:1434
+#: ../src/common/connection.py:1575
 #, 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:1773
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Жіберген контакт: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Жіберілген контакттар:"
 
-#: ../src/common/connection.py:1923
-#: ../src/common/connection.py:1946
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Жасырын қалып-күй нәтижесінде алынбаған"
 
-#: ../src/common/connection.py:2470
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Тіркелгіні өшіру сәтсіз"
 
-#: ../src/common/connection.py:2471
+#: ../src/common/connection.py:2827
 #, 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:497
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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:1518
-#: ../src/roster_window.py:856
-#: ../src/roster_window.py:1556
-#: ../src/roster_window.py:1642
-#: ../src/roster_window.py:1644
-#: ../src/roster_window.py:1806
-#: ../src/roster_window.py:2482
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Қызметтер"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Ростерде емес"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 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:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim-нің D-Bus мүмкіндіктерін қолдану мүмкін емес"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus бұл компьютерде дұрыс істемейді"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus бұл компьютерде дұрыс істемейді: жүйе шинасы жоқ"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus бұл компьютерде дұрыс істемейді: сессия шинасы жоқ"
 
@@ -4738,9 +5446,11 @@ 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
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus бұл машинада жоқ не керек python модулі жоқ"
 
@@ -4877,8 +5587,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 "Түн"
 
@@ -4914,8 +5623,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,276 +5635,292 @@ msgstr "Апта аяғы"
 msgid "Weekend!"
 msgstr "Демалыс!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr "Пайдаланушы аты 1 мен 1023 таңба арасында болуы керек"
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Пайдаланушы атындағы қате таңба."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Хост атындағы қате таңба."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Сервер адресі керек."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Ресурс атындағы қате таңба."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Бос емес"
 
-#: ../src/common/helpers.py:217
-#: ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Бос емес"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "Қо_л жетерсіз"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Қол жетерсіз"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Чатқа дайын"
 
-#: ../src/common/helpers.py:227
-#: ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Чатқа дайын"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 msgid "?user status:_Available"
 msgstr "?user status:_Осында"
 
-#: ../src/common/helpers.py:232
-#: ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "?user status:Осында"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Байланыс орнату"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "К_етіп қалған"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "Желі_де емес"
 
-#: ../src/common/helpers.py:244
-#: ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Желіде емес"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Жасырын"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Жасырын"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?контакт күйі:Белгісіз"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?контакт күйі:Қателері бар"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Жоқ"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Оған"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Одан"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Екеуі де"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Жоқ"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Жазылу"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Модераторлар"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Қатысушылар"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Қатысушы"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Қонақтар"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Қонақ"
 
-#: ../src/common/helpers.py:306
-#: ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Жоқ"
 
-#: ../src/common/helpers.py:308
-#: ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Иесі"
 
-#: ../src/common/helpers.py:310
-#: ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Әкімші"
 
-#: ../src/common/helpers.py:312
-#: ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Мүше"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "хабарламаға көңіл аударды"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "басқа нәрсемен айналысуда"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "хабарлама жазып тұр..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "хабарлама жазуды аялдатқан"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "чат терезесін не бетін жапты"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s Гиб"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s МиБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s КиБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s КБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1110
-#: ../src/common/helpers.py:1117
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d хабарлама бар"
 msgstr[1] "%d хабарлама бар"
 
-#: ../src/common/helpers.py:1123
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " %s бөлмесінен"
 
-#: ../src/common/helpers.py:1126
-#: ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " %s пайдаланушысынан"
 
-#: ../src/common/helpers.py:1128
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr ", қайдан: %s"
 
-#: ../src/common/helpers.py:1135
-#: ../src/common/helpers.py:1141
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d оқиға бар"
 msgstr[1] "%d оқиға бар"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1343
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "Сәлем, мен - $name."
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Суретті жүктеу уақыты бітті"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Сурет тым үлкен"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL мерзімі әлі басталмаған"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Суретті жүктеу уақыты бітті"
+
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s баптау қатесі"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5215,11 +5939,11 @@ msgstr ""
 "Қатесі:\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "GStreamer қатесі"
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5228,100 +5952,114 @@ msgstr ""
 "Қате: %s\n"
 "Жөндеу: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "аудио кірісі"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "аудио шығысы"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "видео кірісі"
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "видео шығысы"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Орындау қатесі, \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s дұрыс loglevel емес"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr " Негізгі құрылғы"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Аудио сынау"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "Авто анықтау"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Файл: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "Жалған аудио шығысы"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Видео сынау"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "green"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "видео шығысы"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X Window System (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X Window System (Xv жоқ)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "қате: оқу үшін %s ашу мүмкін емес"
+msgid "Error: cannot open %s for reading"
+msgstr "Қате: оқу үшін %s ашу мүмкін емес"
 
-#: ../src/common/optparser.py:303
-#: ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "көгілдір"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "тарих дерекқорын индекстарға көшірту"
 
@@ -5742,8 +6480,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 "Велосипед"
 
@@ -5959,19 +6696,116 @@ msgstr "Оқуда"
 msgid "Writing"
 msgstr "Жазуда"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "бастапқысы"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Жасырылуда"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Тіркелгі"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Тіркелгі бағаны"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Сипаттамасы"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Қате"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "бір"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "бөлме"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+#, fuzzy
+msgid "street"
+msgstr "stream"
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Белгісіз орындаушы"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Белгісіз атауы"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Белгісіз көзі"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5980,26 +6814,20 @@ msgstr ""
 "<b>\"%(title)s\"</b>, орындайтыны <i>%(artist)s</i>\n"
 "қайдан: <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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 бірнеше рет қосулы тұрған шығар. Файлдармен алмасудан бас тартылады."
-
 #. 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 "[Бұл - шифрленген сессияның бір бөлігі. Осы хабарламаны көріп тұрсаңыз, бір нәрсе қате болып тұр.]"
+#: ../src/common/stanza_session.py:425
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Бұл - шифрленген сессияның бір бөлігі. Осы хабарламаны көріп тұрсаңыз, бір "
+"нәрсе қате болып тұр.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi қатесі"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6008,297 +6836,287 @@ msgstr ""
 "%s\n"
 "Link-local хабарламалары дұрыс істемеуі мүмкін."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Avahi не Bonjour орнатулы тұрғанды тексеріңіз."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:212
 #: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Жергілікті қызметті қосу мүмкін емес"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:213
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "%d портын басқару мүмкін емес."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:217
-#: ../src/common/zeroconf/connection_zeroconf.py:301
-#: ../src/common/zeroconf/connection_zeroconf.py:314
-#: ../src/common/zeroconf/connection_zeroconf.py:330
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "avahi-daemon қосулы тұрғанын тексеріңіз."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:300
-#: ../src/common/zeroconf/connection_zeroconf.py:313
-#: ../src/common/zeroconf/connection_zeroconf.py:329
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "\"%s\" тіркелгісінің күйін өзгерту мүмкін емес"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:348
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Хабарламаңызды жіберуге мүмкіндік жоқ"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:362
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт желіде емес. Хабарламаңызды жіберу мүмкін емес."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:388
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Хостпен байланысты орнату мүмкін емес: Ақпаратты жіберудің уақыты шықты."
+#: ../src/common/zeroconf/connection_zeroconf.py:394
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Хостпен байланысты орнату мүмкін емес: Ақпаратты жіберудің уақыты шықты."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:193
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Қызметті қосу қатесі. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Хабарлама"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Қосулы"
 
-#: ../src/config.py:459
-#: ../src/config.py:463
-#: ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Бастапқысы"
 
-#: ../src/config.py:733
-#: ../src/dialogs.py:1491
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s тілі үшін сөздік қолжетерсіз"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, 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
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "қалып-күй хабарлама атауы"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "қалып-күй хабарлама мәтіні"
 
 #. Name column
-#: ../src/config.py:1514
-#: ../src/dialogs.py:2486
-#: ../src/dialogs.py:2553
-#: ../src/dialogs.py:3339
-#: ../src/disco.py:886
-#: ../src/disco.py:1745
-#: ../src/disco.py:2047
-#: ../src/history_window.py:90
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Аты"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Қазір қайта кіру керек пе?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Түзетулерді қазір іске асыруды қаласаңыз, қайта кіруіңіз керек."
 
-#: ../src/config.py:1764
-#: ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP бұл компьютерде қолдануға болмайды"
 
-#: ../src/config.py:1933
-#: ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Оқылмаған оқиғалар"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
-msgstr "Осы тіркелгіні өшіру алдында барлық кезекте тұрған оқиғаларды оқып шығу."
+msgstr ""
+"Осы тіркелгіні өшіру алдында барлық кезекте тұрған оқиғаларды оқып шығу."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Сізде %s тіркелгісінен чаттар ашулы тұр"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Барлық чаттар мен топ чаттары жабылады. Жалғастыруды қалайсыз ба?"
 
-#: ../src/config.py:1976
-#: ../src/config.py:2511
-#: ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Қазір серверге қосулы тұрсыз"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Тіркелгі атын ауыстыру үшін, сервермен байланысты тоқтату керек"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "Тіркелгі атын ауыстыру алдында оқылмаған оқиғаларды қарап шығыңыз."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 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."
+#: ../src/config.py:2047
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Бұл тіркелгі аты қазір қолданылуда. Басқасын таңдаңыз."
 
-#: ../src/config.py:1992
-#: ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Тіркелгі аты қате"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Тіркелгі аты бос болмауы керек"
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Тіркелгі атында бос орындар болмауы керек."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Тіркелгі атын ауыстыру"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "%s тіркелгісі үшін жаңа атын енгізіңіз"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID келесідей \"user@servername\" түрінде болуы керек."
 
-#: ../src/config.py:2320
-#: ../src/config.py:3632
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Қате мән"
 
-#: ../src/config.py:2321
-#: ../src/config.py:3633
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Таңдауыңызша порт нөмірі түрінде берілуі тиіс."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Құпия кілттерді алу сәтсіз"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Қолжетерлік OpenPGP құпия кілті жоқ."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP кілтін таңдау"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Өзіңіздің OpenPGP кілтіңізді таңдаңыз"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Ондай тіркелгі жоқ"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "Жеке ақпаратыңызды түзету алдында сізге тіркелгі жасау керек."
 
-#: ../src/config.py:2393
-#: ../src/dialogs.py:2241
-#: ../src/dialogs.py:2475
-#: ../src/dialogs.py:2662
-#: ../src/disco.py:515
-#: ../src/profile_window.py:360
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Сервермен байланысты орнатқан жоқсыз"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Байланысты орнатпасаңыз, жеке ақпаратыңызды түзете алмайсыз."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Серверіңіз Vcard-ты қолдамайды"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Серверіңіз сіздің жеке ақпаратыңызды сақтай алмайды."
 
-#: ../src/config.py:2512
-#: ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Тіркелгіні сөндіру үшін, оның желімен байланысын аяқтаңыз."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Local тіркелгісі бар болыр тұр."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Link-local хабарламаларды іске қосу алдында оның атын ауыстырыңыз не өшіріңіз."
+msgstr ""
+"Link-local хабарламаларды іске қосу алдында оның атын ауыстырыңыз не "
+"өшіріңіз."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Түзету %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "%s үшін тіркелу"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Блок тізім"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Қатысушылар тізімі"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Иелер тізімі"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Әкімшілер тізімі"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779
-#: ../src/disco.py:893
-#: ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Себебі"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Ролі"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Блоктау..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6306,11 +7124,11 @@ msgstr ""
 "<b>Кімді банға жібергіңіз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Қатысушыны қосу..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6318,11 +7136,11 @@ msgstr ""
 "<b>Кімді мүше қылғыңыз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Иені қосу..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6330,11 +7148,11 @@ msgstr ""
 "<b>Кімді ие қылғыңыз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Әкімшіні қосу..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6342,7 +7160,7 @@ msgstr ""
 "<b>Кімді әкімші қылғыңыз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6358,148 +7176,138 @@ msgstr ""
 "4. domain (доменнің өзі сәйкес, және әр user@domain,\n"
 "domain/resource, және субдомені бар адрес сәйкес келеді)."
 
-#: ../src/config.py:2942
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "%s тіркелгісі өшірілуде"
 
-#: ../src/config.py:2957
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "Тіркелгі сөндірулі"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr "Серверден тіркелуді өшіру үшін тіркелгі қосулы тқұру керек."
 
-#: ../src/config.py:2971
-#: ../src/gui_interface.py:264
-#: ../src/gui_interface.py:713
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Пароль керек"
 
-#: ../src/config.py:2972
-#: ../src/gui_interface.py:693
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s тіркелгіңіз үшін парольді енгізіңіз"
 
-#: ../src/config.py:2973
-#: ../src/gui_interface.py:713
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Парольді сақтау"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\" тіркелгісі серверге қосылған"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Оны өшірсеңіз, байланыс жойылады."
 
-#: ../src/config.py:2998
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "%s серверімен байланыс орнату сәтсіз"
 
-#: ../src/config.py:2999
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "Сіз не істегіңіз келеді?"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "Тіркелгіні тек Gajim ішінен өшіру"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ешнәрсе өшірмеу. Кейін қайталап көремін"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Барлық"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Тек кіру мен шығу"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Жоқ"
 
-#: ../src/config.py:3169
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Жаңа чат бөлмесі"
 
-#: ../src/config.py:3202
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Бұл бетбелгінің ақпараты қате"
 
-#: ../src/config.py:3203
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:3280
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Сервер мен бөлме өрістерін толтырыңыз немесе бетбелгіні өшіріңіз."
 
-#. invalid char
-#: ../src/config.py:3316
-#: ../src/dialogs.py:2038
-msgid "Invalid nickname"
-msgstr "Ник қате"
-
-#: ../src/config.py:3317
-#: ../src/config.py:3328
-#: ../src/config.py:3337
-#: ../src/config.py:3348
-#: ../src/config.py:3356
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Таңба рұқсат етілмеген"
 
-#: ../src/config.py:3328
-#: ../src/config.py:3336
-#: ../src/config.py:3348
-#: ../src/config.py:3608
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Сервер қате"
 
-#: ../src/config.py:3355
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Қате бөлме"
 
-#: ../src/config.py:3524
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Тіркелгі сәтті қосылды"
 
-#: ../src/config.py:3525
-#: ../src/config.py:3531
-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:3615 ../src/config.py:3621
+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:3530
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Сіздің жаңа тіркелгіңіз сәтті жасалды"
 
-#: ../src/config.py:3569
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Пайдаланушы аты қате"
 
-#: ../src/config.py:3571
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Бұл тіркелгіні баптау үшін пайдаланушы атын көрсетуіңіз керек."
 
-#: ../src/config.py:3609
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Тіркелгіңіз келетін серверді көрсетіңіз."
 
-#: ../src/config.py:3665
-#: ../src/gui_interface.py:1184
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Сертификат файлда бар болып тұр"
 
-#: ../src/config.py:3666
-#: ../src/gui_interface.py:1185
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат %s файлында бар болып тұр, сол үшін қайта қосылмайды."
 
-#: ../src/config.py:3743
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6514,8 +7322,7 @@ msgstr ""
 "SSL қатесі: %(error)s\n"
 "Сонда да серверге байланысты орнатуды қалайсыз ба?"
 
-#: ../src/config.py:3749
-#: ../src/gui_interface.py:1213
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6526,79 +7333,89 @@ msgstr ""
 "Сертификаттың SHA1 баспасы:\n"
 "%s"
 
-#: ../src/config.py:3781
-#: ../src/config.py:3815
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Жасау кезінде қате кетті"
 
-#: ../src/config.py:3880
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Тіркелгі аты қолдануда"
 
-#: ../src/config.py:3881
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Сізде осы атын қолданып тұрған тіркелгі бар болып тұр."
 
-#: ../src/config.py:4010
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP торабы өшірілген жоқ"
 
-#: ../src/config.py:4011
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "%(node)s PEP торабы өшірілген жоқ: %(message)s"
 
-#: ../src/config.py:4039
+#: ../src/config.py:4147
 #, python-format
 msgid "Configure %s"
 msgstr "%s баптау"
 
-#: ../src/config.py:4055
-#: ../src/plugins/gui.py:73
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Белсенді"
 
-#: ../src/config.py:4063
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Оқиға"
 
-#: ../src/config.py:4098
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Бірінші хабарлама алынды"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Бірінші хабарлама алынды"
 
-#: ../src/config.py:4099
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Келесі  хабарлама фокусы бар терезеде алынды"
 
-#: ../src/config.py:4101
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Келесі  хабарлама фокусы жоқ терезеде алынды"
 
-#: ../src/config.py:4102
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Контакт байланысқан"
 
-#: ../src/config.py:4103
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Контакт байланыспаған"
 
-#: ../src/config.py:4104
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Хабарлама жіберілді"
 
-#: ../src/config.py:4105
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Сізді біреу бөлмеде еске алған"
 
-#: ../src/config.py:4106
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Бөлмеде хабарлама алынды"
 
-#: ../src/config.py:4107
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail Email алынды"
 
-#: ../src/conversation_textview.py:603
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6608,7 +7425,7 @@ msgstr ""
 "жақ алмағанын көрсетеді. Бұл таңбаша ұзақ\n"
 "уақыт бойы тұрса, хабарлама жоғалған сияқты."
 
-#: ../src/conversation_textview.py:622
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6616,351 +7433,394 @@ msgstr ""
 "Осы сызықтан кейінгі мәтін сіз осы чатқа соңғы рет\n"
 "көңіл аударғаныңыздан кейін айтылған"
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Дәйексөз"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\" үшін әре_кет"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "_Википедия мақаласын оқу"
 
-#: ../src/conversation_textview.py:767
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "_Сөздіктен іздеу"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:835
 #, 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:797
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Келесі нәрсе вебтен іздеу сілтемесі емес: \"%s\""
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Ол ү_шін веб іздеу"
 
-#: ../src/conversation_textview.py:806
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Сіл_теме ретінде ашу"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1309
-#, python-format
+#: ../src/conversation_textview.py:1386
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Кеше"
 msgstr[1] "%i күн бұрын"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1357
-#: ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тақырыбы: %s\n"
 
-#: ../src/dataforms_widget.py:564
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: ../src/dataforms_widget.py:566
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Медиаға қолдау жоқ: %s"
 
-#: ../src/dataforms_widget.py:581
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "Бұр өріс міндетті"
 
-#: ../src/dataforms_widget.py:626
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID тізімде бар болып тұр"
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Сіз енгізген Jabber ID тізімде бар болып тұр. Басқасын таңдаңыз."
 
 #. Default jid
-#: ../src/dataforms_widget.py:638
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "жаңа@jabber.id"
 
-#: ../src/dataforms_widget.py:641
-#: ../src/dataforms_widget.py:643
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "жаңа%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Контакт аты: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:198
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Топ"
 
-#: ../src/dialogs.py:205
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Топта"
 
-#: ../src/dialogs.py:296
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:301
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Контакт аты"
 
-#: ../src/dialogs.py:476
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Көңіл-күйді орнату"
 
-#: ../src/dialogs.py:596
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s күй хабарламасы"
 
-#: ../src/dialogs.py:610
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Күй хабарламасы"
 
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Күй хабарламасын алмастыру керек пе?"
 
-#: ../src/dialogs.py:802
-msgid "This name is already used. Do you want to overwrite this status message?"
-msgstr "Бұл атау қолдануда. Бұл қалып-күй хабарламасын алмастыруды қалайсыз ба?"
+#: ../src/dialogs.py:805
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Бұл атау қолдануда. Бұл қалып-күй хабарламасын алмастыруды қалайсыз ба?"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Орнатылған хабарлама ретінде сақтау"
 
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr " Бұл қалып-күй хабарламасы үшін атын енгізіңіз"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM адресі:"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG нөмірі:"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ нөмірі:"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN адресі:"
 
-#: ../src/dialogs.py:843
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адресі:"
 
-#: ../src/dialogs.py:880
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "%s тіркелгісіне қосқыңыз келетін контакт ақпаратын енгізіңіз"
 
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Қосықыңыз келетін контакт ақпаратын енгізіңіз"
 
-#: ../src/dialogs.py:1073
-#: ../src/dialogs.py:1079
-#: ../src/dialogs.py:1084
-#: ../src/dialogs.py:3572
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Пайдаланушы ID-і қате"
 
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Пайдаланушы ID-і ішінде ресурс болмау керек."
 
-#: ../src/dialogs.py:1085
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Өзіңізді өз ростеріңізге қоса алмайсыз."
 
-#: ../src/dialogs.py:1099
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Контакт ростерде бар болып тұр"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Контакт ростердіңізде бар болып тұр."
 
-#: ../src/dialogs.py:1152
-#: ../src/dialogs.py:1186
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Пайдаланушы ID-і:"
 
-#: ../src/dialogs.py:1271
-msgid "A GTK+ jabber client"
-msgstr "GTK+ jabber клиенті"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber қолданбасы"
 
-#: ../src/dialogs.py:1272
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ нұсқасы:"
 
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK нұсқасы:"
 
-#: ../src/dialogs.py:1283
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Ағымдағы жасаушылар:"
 
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Бұрынғы жасаушылар:"
 
-#: ../src/dialogs.py:1291
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "Алғыс сөз:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1297
+#: ../src/dialogs.py:1305
 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:1309
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2009-2010"
 
-#: ../src/dialogs.py:1492
+#: ../src/dialogs.py:1500
 #, 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:1840
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Қауіпсіз емес байланыс"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Сіз серверге қауіпсіз емес байланысты орнатасыз. Бұл дегеніміз, сіздің "
+"барлық сөйлесулеріңіз шифрленбеген түрде жүреді. Осыны жасауды шынымен "
+"қалайсыз ба?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Иә, қауіпсіз емес байланысты орнатқым келеді"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "М_ені қайта сұрамау"
+
+#: ../src/dialogs.py:1950
 msgid "_Resume"
 msgstr "Жа_лғастыру"
 
-#: ../src/dialogs.py:1848
+#: ../src/dialogs.py:1958
 msgid "Re_place"
 msgstr "Алмаст_ыру"
 
-#: ../src/dialogs.py:2039
-#: ../src/dialogs.py:2426
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Ник аты ішінде рұқсат етілмеген таңбалар бар."
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(account)s тіркелгісінен жазылуға сұраным түсті, кімнен: %(jid)s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s жіберген жазылуға сұраным"
 
-#: ../src/dialogs.py:2236
-#: ../src/gui_interface.py:1915
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Сіз %s топтық чатына қатысудасыз"
 
-#: ../src/dialogs.py:2242
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
 
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "%s тіркелгісімен топтық чатқа кіру"
 
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Қате uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Бұл топтық чат"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Қате тіркелгі"
 
-#: ../src/dialogs.py:2414
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2599
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
 msgstr "Топ чатына кіруге қолданылатын тіркелгіні көрсетіңіз."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Ник аты қате"
 
-#: ../src/dialogs.py:2430
-#: ../src/dialogs.py:2436
-#: ../src/groupchat_control.py:2033
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Топтық чаттың Jabber ID-і зате"
 
-#: ../src/dialogs.py:2431
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID-ін as бөлме@сервер түрінде көрсетіңіз."
 
-#: ../src/dialogs.py:2437
-#: ../src/groupchat_control.py:2034
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Топ чат Jabber ID ішінде рұқсат етілмеген таңбалар бар."
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Бұл топтық чат"
 
-#: ../src/dialogs.py:2445
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s топтық чаттың аты емес."
 
-#: ../src/dialogs.py:2476
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Байланыс орнатылмаса, контакттарды синхрондай алмайсыз."
 
-#: ../src/dialogs.py:2489
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Бұл тіркелгі серверге байланыс орнатылмаған"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Байланыспаған тіркелгімен синхрондай алмайсыз."
 
-#: ../src/dialogs.py:2551
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Синхрондау"
 
-#: ../src/dialogs.py:2612
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "%s тіркелгісін қолданып чатты бастау"
 
-#: ../src/dialogs.py:2614
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Чатты бастау"
 
-#: ../src/dialogs.py:2615
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6969,388 +7829,317 @@ msgstr ""
 "төмендегі өріске жазыңыз:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2641
-#: ../src/dialogs.py:3022
-#: ../src/dialogs.py:3252
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: ../src/dialogs.py:2642
-#: ../src/dialogs.py:3023
-#: ../src/dialogs.py:3253
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" үшін байланыс орнатылғанына көз жеткізіңіз."
 
-#: ../src/dialogs.py:2651
-#: ../src/dialogs.py:2654
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Қате JID"
 
-#: ../src/dialogs.py:2654
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "\"%s\" өңдеу мүмкін емес."
 
-#: ../src/dialogs.py:2663
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Байланыс орнатылмаса, пароліңізді өзгерте алмайсыз."
 
-#: ../src/dialogs.py:2682
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Пароль қате"
 
-#: ../src/dialogs.py:2682
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Парольді енгізуіңіз керек."
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Парольдер өзара сәйкес келмейді"
 
-#: ../src/dialogs.py:2687
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Екі өрістегі де парольдер өзара сәйкес болуы тиіс."
 
-#. default value
-#: ../src/dialogs.py:2724
-#: ../src/notify.py:249
-#: ../src/notify.py:475
-msgid "Contact Signed In"
-msgstr "Контакт кірді"
-
-#: ../src/dialogs.py:2726
-#: ../src/notify.py:257
-#: ../src/notify.py:477
-msgid "Contact Signed Out"
-msgstr "Контакт шықты"
-
-#. chat message
-#: ../src/dialogs.py:2728
-#: ../src/notify.py:279
-#: ../src/notify.py:479
-msgid "New Message"
-msgstr "Жаңа хабарлама"
-
-#. single message
-#: ../src/dialogs.py:2728
-#: ../src/notify.py:261
-#: ../src/notify.py:479
-msgid "New Single Message"
-msgstr "Жаңа бір хабарлама"
-
-#. private message
-#: ../src/dialogs.py:2729
-#: ../src/notify.py:267
-#: ../src/notify.py:480
-msgid "New Private Message"
-msgstr "Жаңа жеке хабарлама"
-
-#: ../src/dialogs.py:2729
-#: ../src/gui_interface.py:823
-#: ../src/notify.py:489
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Жаңа E-mail"
 
-#: ../src/dialogs.py:2731
-#: ../src/gui_interface.py:878
-#: ../src/notify.py:482
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Файл алмасуға сұраным"
 
-#: ../src/dialogs.py:2733
-#: ../src/gui_interface.py:785
-#: ../src/gui_interface.py:849
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Файл алмасу қатесі"
 
-#: ../src/dialogs.py:2735
-#: ../src/gui_interface.py:924
-#: ../src/gui_interface.py:947
-#: ../src/gui_interface.py:964
-#: ../src/notify.py:486
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: ../src/dialogs.py:2736
-#: ../src/gui_interface.py:927
-#: ../src/notify.py:487
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Файл алмасу тоқтатылған"
 
-#: ../src/dialogs.py:2738
-#: ../src/gui_interface.py:639
-#: ../src/notify.py:491
-msgid "Groupchat Invitation"
-msgstr "Топ чатына шақыру"
-
-#: ../src/dialogs.py:2740
-#: ../src/notify.py:241
-#: ../src/notify.py:493
-msgid "Contact Changed Status"
-msgstr "Контакт қалып-күйін өзгертті"
-
-#: ../src/dialogs.py:2941
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "%s тіркелгісін қолданып, дара хабарлама"
 
-#: ../src/dialogs.py:2943
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "%s тіркелгісінде дара хабарлама"
 
-#: ../src/dialogs.py:2945
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Дара хабарлама"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2948
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Жіберу %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2971
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Алынған %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2994
+#: ../src/dialogs.py:3185
 #, 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:3073
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:3074
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s жазған:\n"
 
-#: ../src/dialogs.py:3133
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "%s үшін XML консолі"
 
-#: ../src/dialogs.py:3135
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML консолі"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "қосу"
 
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "түзету"
 
-#: ../src/dialogs.py:3283
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "өшіру"
 
-#: ../src/dialogs.py:3312
+#: ../src/dialogs.py:3508
 #, 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> келеді."
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3328
-#: ../src/dialogs.py:3374
-msgid "Add"
-msgstr "Қосу"
+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:3330
-#: ../src/dialogs.py:3405
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Түзету"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3332
-#: ../src/dialogs.py:3429
-msgid "Delete"
-msgstr "Өшіру"
-
-#: ../src/dialogs.py:3336
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Топтар"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3450
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s маған сізді менің ростеріме қосуды ұсынған."
 
-#: ../src/dialogs.py:3464
-#, python-format
-msgid "Added  %s contacts"
-msgstr "%s контак қосылған"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "%s контак қосылған"
+msgstr[1] "%s контак қосылған"
 
-#: ../src/dialogs.py:3501
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "%s контакт өшірілген"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "%s контакт өшірілген"
+msgstr[1] "%s контакт өшірілген"
 
-#: ../src/dialogs.py:3541
-#: ../src/dialogs.py:3718
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s үшін архивтеу баптаулары"
 
-#: ../src/dialogs.py:3581
+#: ../src/dialogs.py:3779
 msgid "Invalid expire value"
 msgstr "Аяқталу мерзімі қате"
 
-#: ../src/dialogs.py:3582
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr "Аяқталу мерзімі дұрыс бүтін оң сан болуы керек."
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr "Формамен қате бар"
 
-#: ../src/dialogs.py:3849
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr "Қате орын алған"
 
-#: ../src/dialogs.py:3917
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Жекелік тізімі <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s үшін жекелік тізімі"
 
-#: ../src/dialogs.py:3988
+#: ../src/dialogs.py:4186
 #, 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:3993
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Реті: %(order)s, әрекеті: %(action)s"
 
-#: ../src/dialogs.py:4044
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Ережені түзету</b>"
 
-#: ../src/dialogs.py:4155
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ережені қосу</b>"
 
-#: ../src/dialogs.py:4254
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s үшін жекелік тізімдері"
 
-#: ../src/dialogs.py:4256
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Жекелік тізімдер"
 
-#: ../src/dialogs.py:4345
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Тізім аты қате"
 
-#: ../src/dialogs.py:4346
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Жекелік тізімін жасау үшін оның атын енгізуіңіз керек."
 
-#: ../src/dialogs.py:4378
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Сізді топтық чатқа шақырған"
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact сізді талқылауға қатысуға шақырған"
 
-#: ../src/dialogs.py:4383
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact сізді %(room_jid)s топ чатына қатысуға шақырған"
 
-#: ../src/dialogs.py:4391
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Түсіндірме: %s"
 
-#: ../src/dialogs.py:4393
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Шақыруды қабылдайсыз ба?"
 
-#: ../src/dialogs.py:4455
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "Клиент сертификатын таңдау #PCKS12"
 
-#: ../src/dialogs.py:4465
-#: ../src/dialogs.py:4507
-#: ../src/dialogs.py:4563
-#: ../src/dialogs.py:4651
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Барлық файлдар"
 
-#: ../src/dialogs.py:4470
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "PKCS12 файлдары"
 
-#: ../src/dialogs.py:4497
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Дыбысты таңдаңыз"
 
-#: ../src/dialogs.py:4512
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav дыбыстары"
 
-#: ../src/dialogs.py:4550
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Суретті таңдау"
 
-#: ../src/dialogs.py:4568
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Суреттер"
 
-#: ../src/dialogs.py:4638
+#: ../src/dialogs.py:4847
 msgid "Choose Archive"
 msgstr "Архивті таңдаңыз"
 
-#: ../src/dialogs.py:4656
+#: ../src/dialogs.py:4865
 msgid "Zip files"
 msgstr "Zip файлдары"
 
-#: ../src/dialogs.py:4682
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s келесідей болғанда:"
 
-#: ../src/dialogs.py:4684
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "%s үшін арнайы ескертуді орнату"
 
-#: ../src/dialogs.py:4760
-msgid "Condition"
-msgstr "Күйі"
-
-#: ../src/dialogs.py:4880
-msgid "when I am "
-msgstr "Мен болғанда:"
-
-#: ../src/dialogs.py:5374
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7361,581 +8150,666 @@ msgstr ""
 "\n"
 "Бұл сессияның Short Authentication String келесі: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5377
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Бұл контакт шынайылығын растағансыз."
 
-#: ../src/dialogs.py:5383
-#: ../src/dialogs.py:5467
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Контакт шынайылығы расталған"
 
-#: ../src/dialogs.py:5389
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Қайтадан растау..."
 
-#: ../src/dialogs.py:5394
-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:5133
+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:5397
-#: ../src/dialogs.py:5448
-#: ../src/dialogs.py:5461
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Контакт шынайылығы РАСТАЛМАҒАН"
 
-#: ../src/dialogs.py:5402
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Тексеру..."
 
-#: ../src/dialogs.py:5413
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Контакт шынайылығын тексеріп көргенсіз бе?"
 
-#: ../src/dialogs.py:5414
+#: ../src/dialogs.py:5153
 #, 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:5415
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Қашықтағы адаммен тура сөйлесіп, SAS-ты растағансыз ба?"
 
-#: ../src/dialogs.py:5449
+#: ../src/dialogs.py:5189
 #, 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:5455
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Бұл контактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды шифрлей алмайсыз."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+"Бұл контактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды шифрлей "
+"алмайсыз."
 
-#: ../src/dialogs.py:5462
-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:5202
+#, fuzzy
+msgid ""
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
+msgstr ""
+"Бұл контактқа GPG кілті көрсетілген, бірақ <b>сіз ол кілтке сенбейсіз</b>, "
+"сол үшін хабарламаларды шифрлеу <b>мүмкін емес</b>. Бұл кілтті растау үшін "
+"өзіңіздің GPG клиентін қолданыңыз."
 
-#: ../src/dialogs.py:5468
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "Бұл контактқа GPG кілті көрсетілген, және сіз ол кілтке сенесіз, сол үшін хабарламалар шифрленеді."
+#: ../src/dialogs.py:5208
+#, fuzzy
+msgid ""
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
+msgstr ""
+"Бұл контактқа GPG кілті көрсетілген, және сіз ол кілтке сенесіз, сол үшін "
+"хабарламалар шифрленеді."
 
-#: ../src/dialogs.py:5533
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "аудио мен видео"
 
-#: ../src/dialogs.py:5535
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "аудио"
 
-#: ../src/dialogs.py:5537
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "видео"
 
-#: ../src/dialogs.py:5541
+#: ../src/dialogs.py:5281
 #, 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/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "%s тіркелгісі үшін"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Клиент сертификаты"
 
-#: ../src/disco.py:119
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Басқалар"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Конференция"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Байланысты орнатпасаңыз, қолжетерлік қызметтерді қарай алмайсыз"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "%s тіркелгісі үшін қызметтерді қарап шығу"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Қызметтерді қарап шығу"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Қызмет табылмады"
 
-#: ../src/disco.py:761
-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:762
+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:765
-#: ../src/disco.py:1102
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Қызмет қарау үшін қол жетерсіз"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Қызметтің осы түрінде қарауға болатын ешнәрсе жоқ."
 
-#: ../src/disco.py:806
-#: ../src/disco.py:816
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Сервердің аты қате"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "%(address)s қарау, %(account)s тіркелгісі"
 
-#: ../src/disco.py:914
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "Қара_п шығу"
 
-#: ../src/disco.py:1103
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Бұл қызметте қарап шығуға болатын ешнәрсе жоқ."
 
-#: ../src/disco.py:1343
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "К_оманда орындау"
 
-#: ../src/disco.py:1353
-#: ../src/disco.py:1523
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "_Тіркелу"
 
-#: ../src/disco.py:1564
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Қаралуда %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1755
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Пайдаланушылар"
 
 #. Description column
-#: ../src/disco.py:1763
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Сипаттамасы"
 
 #. Id column
-#: ../src/disco.py:1771
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1836
-#: ../src/gui_interface.py:2440
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Бетбелгі орнатылған болып тұр"
 
-#: ../src/disco.py:1837
-#: ../src/gui_interface.py:2441
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" чат бөлмесі бетбелгілеріңізде бар болып тұр."
 
-#: ../src/disco.py:1846
-#: ../src/gui_interface.py:2455
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Бетбелгі сәтті қосылды"
 
-#: ../src/disco.py:1847
-#: ../src/gui_interface.py:2456
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Өзіңіздің бетбелгілеріңізді ростердегі Әрекеттер мәзірінен басқара аласыз."
+msgstr ""
+"Өзіңіздің бетбелгілеріңізді ростердегі Әрекеттер мәзірінен басқара аласыз."
 
-#: ../src/disco.py:2056
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Жазылған"
 
-#: ../src/disco.py:2064
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2128
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Жаңа хабарлама"
 
-#: ../src/disco.py:2134
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "Жаз_ылу"
 
-#: ../src/disco.py:2140
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "Жа_зылудан бас тарту"
 
-#: ../src/features_window.py:49
-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 "Қауіпсіз байланыстарды орнату үшін сервер сертификатын растауда қолданылатын жинақ."
+#, fuzzy
+msgid "SSL certificate validation"
+msgstr "SSL сертификатын растау"
 
 #: ../src/features_window.py:51
-#: ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Қауіпсіз байланыстарды орнату үшін сервер сертификатын растауда қолданылатын "
+"жинақ."
+
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Python-pyopenssl талап етеді."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Жергілікті желіден клиенттерді авто анықтап, серверсіз-ақ хабарламалармен алмасу."
+msgstr ""
+"Жергілікті желіден клиенттерді авто анықтап, серверсіз-ақ хабарламалармен "
+"алмасу."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "python-avahi талап етеді."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour) талап етеді."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Командалық жол"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Gajim-ді командалық жолдан басқаратын скрипт."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "python-dbus талап етеді."
 
-#: ../src/features_window.py:60
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Бұл мүмкіндік Windows-та қолжетерсіз."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Хабарламаларды OpenGPG-мен шифрлеу"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Чат хабарламаларын gpg кілттермен шифрлеу."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
-msgstr "Талап етеді: gpg мен python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
+"Талап етеді: gpg мен python-gnupg (http://code.google.com/p/python-gnupg/)."
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:65
 msgid "Requires gpg.exe in PATH."
 msgstr "PATH ішінен gpg.exe талап етеді."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Желі қалып-күйін авто анықтау."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Талап етеді: gnome-network-manager мен python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Сессияларды басқару"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Шыққан кезде Gajim сессиясы келесі рет кіргені үшін сақталады."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Талап етеді: python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Парольдерді шифрлеу"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Парольдерді шифрленген түрде сақтау мүмкіндігі."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Талап етеді: gnome-keyring пен python-gnome2-desktop, не kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Серверлерге SRV жазбасын қолданып байланыс орнату мүмкіндігі."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Талап етеді: dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "SRV жазбаларын қолдану үшін nslookup талап етеді."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Емлені тексеру"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Жазылған хабарламаларды емлеге тексеру."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Талап етеді: libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Талап етеді: libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Ескерту"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 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."
+#: ../src/features_window.py:88
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+"Талап етеді: python-notify не бірге python-dbus пен notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Өздігінен қалып-күйді орнату"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Қалып-күйді өзгерту үшін белсенді емес уақыт шамасын анықтау мүмкіндігі."
+msgstr ""
+"Қалып-күйді өзгерту үшін белсенді емес уақыт шамасын анықтау мүмкіндігі."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "libxss жинағын талап етеді."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Талап етеді: python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "$$ $$ арасында LaTeX өрнектерін түрлендіру."
-
-#: ../src/features_window.py:95
-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 or ImageMagick). Сізге кеңейтілген баптаулар түзеткішінде 'use_latex' опциясын True мәніне орнату керек."
-
-#: ../src/features_window.py:96
-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 не ImageMagick) (Барлығы да MikTeX ішінде). Сізге кеңейтілген баптаулар түзеткішінде 'use_latex' опциясын True мәніне орнату керек."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "End to End хабарламаларды шифрлеу"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Хабарламаларды шифрлеу."
 
-#: ../src/features_window.py:99
-#: ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Талап етеді: python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 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 қараңыз)."
+#: ../src/features_window.py:99
+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
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Талап етеді: python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Аудио мен видео чаттарды іске асыру мүмкіндігі."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "Талап етеді: python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "python-dbus талап етеді."
+
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "?features:Осында"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Мүмкіндік"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Уақыт"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Барысы"
 
-#: ../src/filetransfers_window.py:178
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл аты: %s"
 
-#: ../src/filetransfers_window.py:179
-#: ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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/history_manager.py:523
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Сіз"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Жіберуші: %s"
 
-#: ../src/filetransfers_window.py:190
-#: ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Алушы: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сақталған: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Файлдармен алмасу аяқталды"
-
-#: ../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
-msgid "Connection with peer cannot be established."
-msgstr "Тораппен байланысты орнату мүмкін емес."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Алушы: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Қате хабарламасы: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Файлдармен алмасу тоқтатылды"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Жіберу үшін файлды таңдаңыз..."
 
-#: ../src/filetransfers_window.py:273
-#: ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Анықтамасы: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim файлға жете алмайды"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Файлды басқа үрдіс қолданып тұр."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Файл: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Түрі: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Анықтамасы: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s сізге файлды жібергісі келеді:"
-
-#: ../src/filetransfers_window.py:342
-#: ../src/gtkgui_helpers.py:879
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Бар файлды \"%s\" үстінен жазу мүмкін емес"
 
-#: ../src/filetransfers_window.py:343
-#: ../src/gtkgui_helpers.py:880
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
+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:884
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Бұл файл бар болып тұр"
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:891
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" бумасына жазу мүмкін емес"
 
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:892
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Сізде ол бумада файлдарды жасауға құқығыңыз жоқ."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Файлды қалайша сақтау..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Файл: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Түрі: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Анықтамасы: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s сізге файлды жібергісі келеді:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Профайлды жіберу..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Файл алмасу қатесі"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7943,78 +8817,119 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585
-#: ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Қате файл"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Бос файлдарды жіберу мүмкін емес"
 
-#: ../src/filetransfers_window.py:613
-#: ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Аты:"
 
-#: ../src/filetransfers_window.py:615
-#: ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Жіберуші: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Аялдату"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "хабарлама"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Сма_йликтер:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Тек ростерде көрсету"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Кеңейтілген баптаулар түзетушісі"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s баптау қатесі"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "%s баптау"
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim жұмысы үшін X сервері керек. Шығу..."
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "PyGTK импорттау қатесі: %s"
 
-#: ../src/gajim.py:227
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim жұмысы үшін PyGTK 2.16 не кейінгісі керек"
 
-#: ../src/gajim.py:228
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim жұмысы үшін PyGTK 2.16 не кейінгісі керек. Шығу..."
 
-#: ../src/gajim.py:230
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim жұмысы үшін GTK 2.12 не кейінгісі керек"
 
-#: ../src/gajim.py:231
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim жұмысы үшін GTK 2.12 не кейінгісі керек. Шығу..."
 
-#: ../src/gajim.py:240
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim қосылу үшін pywin32 талап етеді"
 
-#: ../src/gajim.py:241
+#: ../src/gajim.py:270
 #, 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:357
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim қосулы тұр"
 
-#: ../src/gajim.py:358
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8022,456 +8937,387 @@ msgstr ""
 "Gajim қосулы тұрған сияқты\n"
 "Бәрібір жіберу керек пе?"
 
-#: ../src/gajim-remote-plugin.py:79
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Көрсетілген команда үшін көмекті көрсетеді"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:82
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote-plugin.py:83
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "команда көмегін көрсету"
 
-#: ../src/gajim-remote-plugin.py:87
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Ростер терезесін көрсетеді не жасырады"
 
-#: ../src/gajim-remote-plugin.py:91
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Келесі кезектегі оқиға бар қалқымалы терезені көрсетеді"
 
-#: ../src/gajim-remote-plugin.py:95
-#: ../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:98
-#: ../src/gajim-remote-plugin.py:113
-#: ../src/gajim-remote-plugin.py:123
-#: ../src/gajim-remote-plugin.py:133
-#: ../src/gajim-remote-plugin.py:149
-#: ../src/gajim-remote-plugin.py:163
-#: ../src/gajim-remote-plugin.py:172
-#: ../src/gajim-remote-plugin.py:193
-#: ../src/gajim-remote-plugin.py:223
-#: ../src/gajim-remote-plugin.py:232
-#: ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:246
-#: ../src/gajim-remote-plugin.py:257
-#: ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote-plugin.py:293
-#: ../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"
+#: ../src/gajim-remote.py:94
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Ростердегі бар контакттар тізімін шығарады. Әр контакт бөлек жолда болады"
+
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "тіркелгі"
 
-#: ../src/gajim-remote-plugin.py:98
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "тек көрсетілген тіркелгі контакттарын көрсету"
 
-#: ../src/gajim-remote-plugin.py:104
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Бар тіркелгілер тізімін шығарады"
 
-#: ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:111
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "күйі"
 
-#: ../src/gajim-remote-plugin.py:111
-#: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account's previous status"
-msgstr "келесіден біреу: желіде емес, осында, кетіп қалған, кеңейтілген кетіп қалған, мазамды алмаңыз, жасырын. Орнатылмаса, тіркелгінің алдыңғы күйі қолданылады"
-
-#: ../src/gajim-remote-plugin.py:112
 #: ../src/gajim-remote.py:110
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"келесіден біреу: желіде емес, осында, кетіп қалған, кеңейтілген кетіп "
+"қалған, мазамды алмаңыз, жасырын. Орнатылмаса, тіркелгінің алдыңғы күйі "
+"қолданылады"
+
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "хабарлама"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "қалып-күй хабарламасы"
 
-#: ../src/gajim-remote-plugin.py:113
-#: ../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:112
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"\"Тіркелгі\" тіркелгісінің қалып-күйін өзгертеді. Көрсетілмесе, \"sync with "
+"global status\" опциясы орнатылған барлық тіркелгілерге әсер етеді"
 
-#: ../src/gajim-remote-plugin.py:119
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "Бір не бірнеше тіркелгі үшін приоритетті өзгертеді"
 
-#: ../src/gajim-remote-plugin.py:121
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "приоритет"
 
-#: ../src/gajim-remote-plugin.py:121
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "тіркелгіге бергіңіз келетін приоритет"
 
-#: ../src/gajim-remote-plugin.py:123
-#: ../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:122
+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:129
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Контактқа хабарлама жібере алатыныңыздай чат сұхбатын көрсетеді"
 
-#: ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Сөйлесуді бастағыңыз келетін контакттың JID-і"
 
-#: ../src/gajim-remote-plugin.py:133
-#: ../src/gajim-remote-plugin.py:223
-#: ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "көрсетілсе, контакттар бұл тіркелгінің тізімінен алынады"
 
-#: ../src/gajim-remote-plugin.py:136
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr "хабарлама құрамасы. Тіркелгі көрсетілуі не \"\" болуы керек"
 
-#: ../src/gajim-remote-plugin.py:141
-#: ../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.py:140
+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:145
-#: ../src/gajim-remote-plugin.py:158
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Хабарламаны алатын контакттың JID-і"
 
-#: ../src/gajim-remote-plugin.py:146
-#: ../src/gajim-remote-plugin.py:160
-#: ../src/gajim-remote-plugin.py:171
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "хабарлама құрамасы"
 
-#: ../src/gajim-remote-plugin.py:147
-#: ../src/gajim-remote-plugin.py:161
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp кілті"
 
-#: ../src/gajim-remote-plugin.py:147
-#: ../src/gajim-remote-plugin.py:161
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "көрсетілсе, хабарлама бұл ортақ кілтпен шифрленеді"
 
-#: ../src/gajim-remote-plugin.py:149
-#: ../src/gajim-remote-plugin.py:163
-#: ../src/gajim-remote-plugin.py:172
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "көрсетілсе, хабарлама бұл тіркелгіні қолданып жіберіледі"
 
-#: ../src/gajim-remote-plugin.py:154
-#: ../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:153
+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:159
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тақырып"
 
-#: ../src/gajim-remote-plugin.py:159
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "хабарлама тақырыбы"
 
-#: ../src/gajim-remote-plugin.py:168
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Сіз кірген топ чатына жаңа хабарламаны жіберу."
 
-#: ../src/gajim-remote-plugin.py:170
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "хабарламаны алатын бөлменің JID-і"
 
-#: ../src/gajim-remote-plugin.py:177
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Контакттың толық ақпаратын алу"
 
-#: ../src/gajim-remote-plugin.py:179
-#: ../src/gajim-remote-plugin.py:192
-#: ../src/gajim-remote-plugin.py:222
-#: ../src/gajim-remote-plugin.py:231
-#: ../src/gajim-remote.py:177
-#: ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Контакт JID-і"
 
-#: ../src/gajim-remote-plugin.py:183
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Тіркелгінің толық ақпаратын алу"
 
-#: ../src/gajim-remote-plugin.py:185
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Тіркелгі аты"
 
-#: ../src/gajim-remote-plugin.py:189
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Контактқа файлды жібереді"
 
-#: ../src/gajim-remote-plugin.py:191
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote-plugin.py:191
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Файл орналасуы"
 
-#: ../src/gajim-remote-plugin.py:193
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "көрсетілсе, файл бұл тіркелгіні қолданып жіберіледі"
 
-#: ../src/gajim-remote-plugin.py:198
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Барлық баптаулар мен олардың мәндерін тізіп шығу"
 
-#: ../src/gajim-remote-plugin.py:202
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "'key' мәнін 'value' етіп орнатады."
 
-#: ../src/gajim-remote-plugin.py:204
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote-plugin.py:204
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' - баптаудың аты, 'value' - орнатылатын мәні"
 
-#: ../src/gajim-remote-plugin.py:209
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Баптау элементін өшіру"
 
-#: ../src/gajim-remote-plugin.py:211
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "кілт"
 
-#: ../src/gajim-remote-plugin.py:211
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "өшірілетін баптау аты"
 
-#: ../src/gajim-remote-plugin.py:215
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim ағымдағы баптауларын .config файлына жазу"
 
-#: ../src/gajim-remote-plugin.py:220
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Ростерден контактты өшіреді"
 
-#: ../src/gajim-remote-plugin.py:229
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Ростерге контактты қосады"
 
-#: ../src/gajim-remote-plugin.py:232
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Бұл тіркелгіге жаңа контактты қосады"
 
-#: ../src/gajim-remote-plugin.py:237
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Ағымдағы қалып-күйді қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
+msgstr ""
+"Ағымдағы қалып-күйді қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
 
-#: ../src/gajim-remote-plugin.py:244
-#: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Ағымдағы қалып-күй хабарламасын қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
+#: ../src/gajim-remote.py:243
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Ағымдағы қалып-күй хабарламасын қайтарады (тіркелгі көрсетілмесе, жалпыны "
+"қолданады)"
 
-#: ../src/gajim-remote-plugin.py:251
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Оқылмаған хабарламалар саның қайтарады"
 
-#: ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "'Чатты бастау' сұхбат терезесін ашады"
 
-#: ../src/gajim-remote-plugin.py:257
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Бұл тіркелгіні пайдаланып чатты бастау"
 
-#: ../src/gajim-remote-plugin.py:261
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Таңдауыңызша XML жіберу"
 
-#: ../src/gajim-remote-plugin.py:263
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "Жіберілетін XML"
 
-#: ../src/gajim-remote-plugin.py:264
-#: ../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:263
+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:270
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "Аватарды өзгерту"
 
-#: ../src/gajim-remote-plugin.py:272
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "Қолдану үшін сурет"
 
-#: ../src/gajim-remote-plugin.py:273
-#: ../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:272
+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:279
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "\"xmpp:/\" түріндегі сілтемені өңдеу"
 
-#: ../src/gajim-remote-plugin.py:281
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:281
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "Өнделетін сілтеме"
 
-#: ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr "Өндеу үшін тіркелгі"
 
-#: ../src/gajim-remote-plugin.py:284
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "Хабарлама құрамасы"
 
-#: ../src/gajim-remote-plugin.py:288
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Чат бөлмесіне кіру"
 
-#: ../src/gajim-remote-plugin.py:290
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "бөлме"
 
-#: ../src/gajim-remote-plugin.py:290
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "Бөлме JID-і"
 
-#: ../src/gajim-remote-plugin.py:291
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "ник"
 
-#: ../src/gajim-remote-plugin.py:291
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "Қолданылатын ник"
 
-#: ../src/gajim-remote-plugin.py:292
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "пароль"
 
-#: ../src/gajim-remote-plugin.py:292
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "Бөлмеге кіру үшін керек пароль"
 
-#: ../src/gajim-remote-plugin.py:293
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 msgid "Account from which you want to enter the room"
 msgstr "Бөлмеге кіру үшін қолданылатын тіркелгі"
 
-#: ../src/gajim-remote-plugin.py:298
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Gajim қосулы тұрғанына көз жеткізіңіз"
 
-#: ../src/gajim-remote-plugin.py:302
-#: ../src/gajim-remote-plugin.py:312
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "ipython терезесін көрсетеді не жасырады"
 
-#: ../src/gajim-remote-plugin.py:336
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "\"contact_jid\" аргументі жоқ"
 
-#: ../src/gajim-remote-plugin.py:358
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8480,18 +9326,15 @@ msgstr ""
 "'%s' ростеріңізде жоқ.\n"
 "Хабарламаны жіберу үшін тіркелгіні көрсетіңіз."
 
-#: ../src/gajim-remote-plugin.py:361
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Сізде белсенді тіркелгі жоқ"
 
-#: ../src/gajim-remote-plugin.py:416
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim қосулы емес сияқты. Сол үшін gajim-remote қолдануға болмайды."
 
-#: ../src/gajim-remote-plugin.py:447
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8500,29 +9343,27 @@ msgstr ""
 "Қолданылуы: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:451
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Аргументтер:"
 
-#: ../src/gajim-remote-plugin.py:455
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s табылмады"
 
-#: ../src/gajim-remote-plugin.py:459
-#: ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Қолданылуы: %s команда [аргументтері]\n"
 "Команда - келесілердің біреуі:\n"
 
-#: ../src/gajim-remote-plugin.py:536
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8531,8 +9372,7 @@ msgstr ""
 "Аргументтер тым көп. \n"
 "Көбірек білу үшін \"%(basename)s help %(command)s\" енгізіңіз"
 
-#: ../src/gajim-remote-plugin.py:541
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8541,13 +9381,11 @@ msgstr ""
 "\"%(arg)s\" аргументі көрсетілмеген. \n"
 "Көбірек білу үшін \"%(basename)s help %(command)s\" енгізіңіз"
 
-#: ../src/gajim-remote-plugin.py:560
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "Ешбір uri берілмеген"
 
-#: ../src/gajim-remote-plugin.py:562
-#: ../src/gajim-remote.py:540
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "Қате uri"
 
@@ -8573,224 +9411,215 @@ msgid "You cannot delete your current theme"
 msgstr "Ағымдағы теманы өшіре алмайсыз"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Алдымен ағымдағы ретінде басқа теманы таңдаңыз."
 
-#: ../src/groupchat_control.py:175
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s енді %(new_nick)s ретінде белгілі болады"
 
-#: ../src/groupchat_control.py:201
-#: ../src/groupchat_control.py:1706
-#: ../src/history_window.py:447
-#: ../src/notify.py:236
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s қазір %(status)s"
-
-#: ../src/groupchat_control.py:229
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Жеке хабарламаны жіберу сәтсіз"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:231
+#: ../src/groupchat_control.py:238
 #, 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:540
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Ник кірістіру"
 
-#: ../src/groupchat_control.py:721
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Сөйлесу - "
 
-#: ../src/groupchat_control.py:723
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Жалғастырылған сөйлесу"
 
-#: ../src/groupchat_control.py:1191
+#: ../src/groupchat_control.py:1268
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s тақырыпты %(subject)s етіп орнатқан"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1209
-#: ../src/groupchat_control.py:1451
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Әр қатысушы сіздің толық JID-ды көре алады"
 
-#: ../src/groupchat_control.py:1212
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетеді"
 
-#: ../src/groupchat_control.py:1214
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетпейді"
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1293
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Жекелікке байланысты емес бөлме баптауының өзгерісі орын алды"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "Бөлме тарихын сақтау енді қосулы"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "Бөлме тарихын сақтау енді сөндірулі"
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "Бөлме енді анонимды емес"
 
-#: ../src/groupchat_control.py:1227
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "Бөлме енді жартылай анонимды"
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "Бөлме енді толық анонимды"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1455
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Бөлме тарихын сақтау қосулы"
 
-#: ../src/groupchat_control.py:1457
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Жаңа бөлме жасалған"
 
-#: ../src/groupchat_control.py:1460
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер сізге бөлме никті таңдаған не сіздегісін өзгерткен"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s тебілген болса керек: %(reason)s"
 
-#: ../src/groupchat_control.py:1469
+#: ../src/groupchat_control.py:1606
 #, 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:1478
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s бандалған болса керек: %(reason)s"
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s қазір %(nick)s қатысушысын бандаған: %(reason)s"
 
-#: ../src/groupchat_control.py:1492
-#: ../src/groupchat_control.py:1596
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Бұдан былай %s ретінде белгілі боласыз"
 
-#: ../src/groupchat_control.py:1550
-#: ../src/groupchat_control.py:1555
-#: ../src/groupchat_control.py:1561
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: ../src/groupchat_control.py:1552
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "қатысуы өзгертілген"
 
-#: ../src/groupchat_control.py:1557
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "бөлімге қатысу тек мүшелер үшін деп өзгертілген"
 
-#: ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "жүйе сөндірілуі"
 
-#: ../src/groupchat_control.py:1646
+#: ../src/groupchat_control.py:1795
 #, 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:1650
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s қатысуы %(affiliation)s етіп орнатылған"
 
-#: ../src/groupchat_control.py:1665
+#: ../src/groupchat_control.py:1814
 #, 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:1669
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s ролі %(role)s етіп орнатылған"
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s шықты"
 
-#: ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s чат бөлмесіне кірді"
 
-#: ../src/groupchat_control.py:1960
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "\"%s\" топ чатынан шығуды шынымен қалайсыз ба?"
 
-#: ../src/groupchat_control.py:1962
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:2126
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Бұл терезені жапсаңыз, топ чатынан шығасыз."
 
-#: ../src/groupchat_control.py:1966
-#: ../src/gui_interface.py:685
-#: ../src/gui_interface.py:1283
-#: ../src/gui_interface.py:1323
-#: ../src/gui_interface.py:1364
-#: ../src/message_window.py:224
-#: ../src/roster_window.py:2897
-#: ../src/roster_window.py:3568
-#: ../src/roster_window.py:4307
-msgid "_Do not ask me again"
-msgstr "М_ені қайта сұрамау"
-
-#: ../src/groupchat_control.py:2000
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Тақырыпты өзгерту"
 
-#: ../src/groupchat_control.py:2001
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Жаңа тақырыпты көрсетіңіз:"
 
-#: ../src/groupchat_control.py:2008
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Ник атын өзгерту"
 
-#: ../src/groupchat_control.py:2009
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Жаңа ник атыңызды енгізіңіз:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Топ чат Jabber ID ішінде рұқсат етілмеген таңбалар бар."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2040
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Өшірілуде %s"
 
-#: ../src/groupchat_control.py:2041
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8798,23 +9627,22 @@ msgstr ""
 "Сіз бұл бөлмені жоюды қалағансыз.\n"
 "Төменде оның себебін көрсете аласыз:"
 
-#: ../src/groupchat_control.py:2043
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Басқа кездесу орнын көрсете аласыз:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2232
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "%s тебілуде"
 
-#: ../src/groupchat_control.py:2233
-#: ../src/groupchat_control.py:2560
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Төменде оның себебін көрсете аласыз:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2559
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "%s банға жіберу"
@@ -8824,8 +9652,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"
@@ -8835,165 +9667,150 @@ msgstr "Ақаулық жөнінде хаба_рлау"
 msgid "Details"
 msgstr "Көбірек"
 
-#. we talk about file
-#: ../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:377
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Файлды оқу қатесі:"
 
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Файлды өңдеу қатесі:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:421
+#: ../src/gtkgui_helpers.py:393
 #, 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:795
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim қазір негізгі Jabber клиенті емес"
 
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Gajim-ды жүйеңізде негізгі Jabber клиенті қылуды қалайсыз ба?"
 
-#: ../src/gtkgui_helpers.py:797
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Қосылғанда, әрқашан Gajim жүйеңізде негізгі Jabber клиенті екенін тексеру"
+msgstr ""
+"Қосылғанда, әрқашан Gajim жүйеңізде негізгі Jabber клиенті екенін тексеру"
 
-#: ../src/gtkgui_helpers.py:864
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Кеңейтуге қолдау жоқ"
 
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:837
 #, 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:901
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Суретті қалайша сақтау..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:126
-#: ../src/gui_interface.py:276
-#: ../src/gui_interface.py:285
-#: ../src/gui_interface.py:290
-#: ../src/gui_interface.py:293
-#: ../src/gui_interface.py:296
-#: ../src/gui_interface.py:301
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: ../src/gui_interface.py:127
+#: ../src/gui_interface.py:135
 #, 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:130
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Осындай қолайсыздық болса әрқашан осы никты қолдану"
 
-#: ../src/gui_interface.py:147
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Бұл сұранымды қабылдайсыз ба?"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "%s тіркелгісіндегі бұл сұранымды қабылдайсыз ба?"
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:160
 #, 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:195
-#: ../src/notify.py:495
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Байланысу сәтсіз"
 
-#: ../src/gui_interface.py:265
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "%s бөлмесіне кіру үшін пароль керек. Оны көрсетіңіз."
 
-#: ../src/gui_interface.py:277
-#, python-format
-msgid "Maximum number of users for %s has been reached"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "%s үшін пайдаланушылар саны максималды санына жетті"
 
-#: ../src/gui_interface.py:286
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Сізді %s топ чатынан бандаған."
 
-#: ../src/gui_interface.py:291
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "%s топтық чаты жоқ."
 
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Топтық чаттарды жасау рұқсат етілмеген."
 
-#: ../src/gui_interface.py:297
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Сіздің тіркелген ник атыңыз %s топ чатында қолданылуы керек."
 
-#: ../src/gui_interface.py:302
+#: ../src/gui_interface.py:325
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Сіз %s топ чат мүшелері тізімінде емессіз."
 
-#: ../src/gui_interface.py:433
-#: ../src/gui_interface.py:437
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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:448
-#: ../src/gui_interface.py:462
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "%(message)s жіберу кезіндегі қате ( %(error)s )"
-
-#: ../src/gui_interface.py:486
-#: ../src/notify.py:497
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Жазылуға сұраным"
 
-#: ../src/gui_interface.py:511
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Авторизация қабылданды"
 
-#: ../src/gui_interface.py:512
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" контакты өз қалып-күйін көруге сізге авторизация берген."
 
-#: ../src/gui_interface.py:520
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" контакты сізден өзіне жазылуды өшіріп тастаған"
 
-#: ../src/gui_interface.py:521
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9001,58 +9818,104 @@ msgstr ""
 "Сіз енді оны әрқашан да желіде емес ретінде көресіз.\n"
 "Оны өз контакттар тізіміңізден өшіруді қалайсыз ба?"
 
-#: ../src/gui_interface.py:542
-#: ../src/notify.py:499
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Жазылмаған"
 
-#: ../src/gui_interface.py:553
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" үшін байланысты орнату мүмкін емес"
 
-#: ../src/gui_interface.py:651
-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:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
+#: ../src/gui_interface.py:658
+#, fuzzy
+msgid ""
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
+msgstr ""
+"Сіз Gajim-ды GPG агентін қолдануға баптағансыз, бірақ, қосулы тұрған GPG "
+"агенті жоқ немесе ол қате кілтсөзді қайтарған.\n"
 
-#: ../src/gui_interface.py:653
-#: ../src/gui_interface.py:661
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Сіз қазір өзіңіздің OpenPGP кілтсіз-ақ қосулы тұрсыз."
 
-#: ../src/gui_interface.py:655
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Сіз көрсеткен кілтсөз қате"
 
-#: ../src/gui_interface.py:660
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG кілтсөзі қате"
 
-#: ../src/gui_interface.py:683
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Сертификат мерзімі біткен"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr ""
+"%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG кілті сенімді емес"
 
-#: ../src/gui_interface.py:683
-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:704
+#, fuzzy
+msgid ""
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
+msgstr ""
+"Бұл чатты шифрлеу үшін қолданылатын GPG кілті сенімді емес. Бұл хабарламаны "
+"шифрлеуді шынымен қалайсыз ба?"
+
+#: ../src/gui_interface.py:717
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+"Gnome Keyring орнатулы тұр, бірақ дұрыс қосылмаған (қоршам айнымалысы дұрыс "
+"орнатылмаған сияқты)"
+
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
 
-#: ../src/gui_interface.py:696
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring орнатулы тұр, бірақ дұрыс қосылмаған (қоршам айнымалысы дұрыс орнатылмаған сияқты)"
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
 
-#: ../src/gui_interface.py:796
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s үшін жаңа пошта бар"
 
-#: ../src/gui_interface.py:798
+#: ../src/gui_interface.py:858
 #, 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:811
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9067,330 +9930,368 @@ msgstr ""
 "Тақырыбы: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:876
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: ../src/gui_interface.py:913
-#: ../src/roster_window.py:1893
-msgid "Remote contact stopped transfer"
-msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
-
-#: ../src/gui_interface.py:916
-#: ../src/roster_window.py:1895
-msgid "Error opening file"
-msgstr "Файлды ашу қатесі"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Файлдармен алмасу аяқталды"
 
-#: ../src/gui_interface.py:948
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(name)s жіберген %(filename)s сәтті қабылдадыңыз."
 
-#. ft stopped
-#: ../src/gui_interface.py:952
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: ../src/gui_interface.py:965
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Сіз %(filename)s файлын %(name)s үшін сәтті жібердіңіз."
 
-#. ft stopped
-#: ../src/gui_interface.py:969
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: ../src/gui_interface.py:1044
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
+
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Хабарламаны декодалау мүмкін емес"
 
-#: ../src/gui_interface.py:1056
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Пайдаланушы аттардың ерегісуі"
 
-#: ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Жергілікті тіркелгіңіз үшін жаңа пайдаланушы атын енгізіңіз"
 
-#: ../src/gui_interface.py:1072
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Ресурстар ерегісуі"
 
-#: ../src/gui_interface.py:1073
-msgid "You are already connected to this account with the same resource. Please type a new one"
+#: ../src/gui_interface.py:1192
+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:1118
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s сізбен дауыс чатын бастағысы келеді."
 
-#: ../src/gui_interface.py:1121
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Дауыс чатына сұраным"
 
-#: ../src/gui_interface.py:1208
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "SSL сертификатын растау қатесі"
 
-#: ../src/gui_interface.py:1209
+#: ../src/gui_interface.py:1338
 #, 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:1218
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Бұл сертификат үшін осы қатені елемеу."
 
-#: ../src/gui_interface.py:1242
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL сертификат қатесі"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL сертификат қатесі"
 
-#: ../src/gui_interface.py:1243
+#: ../src/gui_interface.py:1375
 #, 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:1278
-#: ../src/gui_interface.py:1318
-#: ../src/gui_interface.py:1360
-msgid "Insecure connection"
-msgstr "Қауіпсіз емес байланыс"
-
-#: ../src/gui_interface.py:1279
-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:1282
-#: ../src/gui_interface.py:1322
-#: ../src/gui_interface.py:1363
-msgid "Yes, I really want to connect insecurely"
-msgstr "Иә, қауіпсіз емес байланысты орнатқым келеді"
-
-#: ../src/gui_interface.py:1319
-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:1447
+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:1361
-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:1489
+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:1867
-#: ../src/gui_interface.py:1890
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Смайликтер сөндірулі"
 
-#: ../src/gui_interface.py:1868
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "Сіз баптаған смайликтер темасы табылмады, сол үшін смайликтер сөндірілген."
+#: ../src/gui_interface.py:1996
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Сіз баптаған смайликтер темасы табылмады, сол үшін смайликтер сөндірілген."
 
-#: ../src/gui_interface.py:1891
-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:2019
+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:1922
-#: ../src/roster_window.py:3735
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2316
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Баптауларыңызды сақтау мүмкін емес"
 
-#: ../src/gui_interface.py:2860
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Кілтсөз керек"
 
-#: ../src/gui_interface.py:2861
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
+msgstr ""
+"%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
 
-#: ../src/gui_interface.py:2875
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG кілтінің мерзімі біткен"
 
-#: ../src/gui_interface.py:2876
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
-msgstr "Сіздің GPG кілтіңіздің мерзімі біткен, сол үшін сіз %s үшін байланысыңыз OpenPGP-сіз іске асырылады."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
+msgstr ""
+"Сіздің GPG кілтіңіздің мерзімі біткен, сол үшін сіз %s үшін байланысыңыз "
+"OpenPGP-сіз іске асырылады."
 
 #. ask again
-#: ../src/gui_interface.py:2885
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Кілтсөз қате"
 
-#: ../src/gui_interface.py:2886
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Өзіңіздің GPG кілтсөзіңізді қайта енгізіңіз не Бас тартуды қалаңыз."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Жаңа чат бөлмесі"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Мен өз ростеріме сізді қосқым келеді"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "'%s' бумасын жасау"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Тарих логтар дерекқоры табылмады"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Контакттар"
-
 #. holds time
-#: ../src/history_manager.py:167
-#: ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Уақыты"
 
 #. holds nickname
-#: ../src/history_manager.py:173
-#: ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Ник аты"
 
 #. holds message
-#: ../src/history_manager.py:181
-#: ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Хабарлама"
 
 #. holds subject
-#: ../src/history_manager.py:188
-#: ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 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 ҚОСУЛЫ ТҰРСА ОСЫНЫ ҚОЛДАНУ ҚАТАҢ ҰСЫНЫЛМАЙДЫ)"
+#: ../src/history_manager.py:262
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Дерекқорды тазалауды қалайсыз ба? (GAJIM ҚОСУЛЫ ТҰРСА ОСЫНЫ ҚОЛДАНУ ҚАТАҢ "
+"ҰСЫНЫЛМАЙДЫ)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Дерекқор қатесі"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Тарих логтарын экспорттау..."
 
-#: ../src/history_manager.py:536
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s уақытында %(who)s айтқан: %(message)s\n"
 
-#: ../src/history_manager.py:573
-msgid "Do you really want to delete logs of the selected contact?"
-msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "Ерекшеленген контактпен барлық сөйлесулер тарихын өшіруді қалайсыз ба?"
-msgstr[1] "Ерекшеленген контакттармен барлық сөйлесулер тарихын өшіруді қалайсыз ба?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 
-#: ../src/history_manager.py:577
-#: ../src/history_manager.py:612
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Ерекшеленген контактпен барлық сөйлесулер тарихын өшіруді қалайсыз ба?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Бұл қайтарылмайтын әрекет."
 
-#: ../src/history_manager.py:609
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Растауды тайдыру"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 msgstr[1] "Ерекшеленген хабарламаларды өшіруді шынымен қалайсыз ба?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Сіз бен %s сөйлесулер тарихы"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Диск қатесі"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s қазір %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Қате: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Қате"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Қазір қалып-күйі: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Қазір қалып-күйі: %(status)s"
 
-#: ../src/htmltextview.py:524
-#: ../src/htmltextview.py:534
-msgid "Timeout loading image"
-msgstr "Суретті жүктеу уақыты бітті"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Код жазуда"
 
-#: ../src/htmltextview.py:544
-msgid "Image is too big"
-msgstr "Сурет тым үлкен"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Сіз бірнеше чатты жабуды таңдадыңыз"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Сіз олардың барлығын жабуды таңдайсыз ба?"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Чаттар"
 
-#: ../src/message_window.py:496
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Чат бөлмелері"
 
-#: ../src/message_window.py:498
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Жеке чаттар"
 
-#: ../src/message_window.py:504
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Хабарламалар"
 
@@ -9402,399 +10303,409 @@ msgstr "- хабарламалар логқа сақталады"
 msgid "- messages will not be logged"
 msgstr "- хабарламалар логқа сақталмайды"
 
-#: ../src/notify.py:234
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s күйін өзгерткен"
-
-#: ../src/notify.py:244
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s желіге кірді"
-
-#: ../src/notify.py:252
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s желіден шықты"
-
-#: ../src/notify.py:263
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "%(nickname)s жіберген бір жаңа хабарлама"
-
-#: ../src/notify.py:270
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "%s топ чатынан жаңа жеке хабарлама"
-
-#: ../src/notify.py:272
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
-
-#: ../src/notify.py:275
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "%(nickname)s жазған"
-
-#: ../src/notify.py:281
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "%(nickname)s жіберген жаңа хабарлама"
-
-#: ../src/notify.py:538
+#: ../src/notify.py:324
 msgid "Ignore"
 msgstr "Елемеу"
 
-#: ../src/plugins/gui.py:67
+#: ../src/plugins/gui.py:82
 msgid "Plugin"
 msgstr "Плагин"
 
-#: ../src/plugins/gui.py:160
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "%s банға жіберу"
+
+#: ../src/plugins/gui.py:209
 msgid "Plugin failed"
 msgstr "Плагин сәтсіз"
 
-#: ../src/plugins/gui.py:204
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr "Плагинді дұрыс өшіру мүмкін емес"
 
 #. members not safe
-#: ../src/plugins/gui.py:212
-#: ../src/plugins/pluginmanager.py:495
-#: ../src/plugins/pluginmanager.py:503
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
 msgid "Archive is malformed"
 msgstr "Архив қате"
 
-#: ../src/plugins/gui.py:235
-#: ../src/plugins/gui.py:243
-#: ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
 msgid "Plugin already exists"
 msgstr "Плагин бар болып тұр"
 
-#: ../src/plugins/gui.py:235
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr "Үстінен жазу керек пе?"
 
-#: ../src/plugins/gui.py:264
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "Баптаулар"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:481
-#: ../src/plugins/pluginmanager.py:487
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
 msgid "Archive corrupted"
 msgstr "Архив зақымдалған"
 
-#: ../src/plugins/pluginmanager.py:483
+#: ../src/plugins/pluginmanager.py:514
 msgid "Archive empty"
 msgstr "Архив бос"
 
-#: ../src/profile_window.py:59
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Профайлды алу..."
 
-#: ../src/profile_window.py:124
-#: ../src/roster_window.py:3092
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Файл бос"
 
-#: ../src/profile_window.py:127
-#: ../src/roster_window.py:3095
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Файл жоқ"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:141
-#: ../src/profile_window.py:157
-#: ../src/roster_window.py:3097
-#: ../src/roster_window.py:3108
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: ../src/profile_window.py:228
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "Уақыт пішімі қате"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Уақыт пішімі ЖЖЖЖ-АА-КК түрінде болуы керек"
 
-#: ../src/profile_window.py:283
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Ақпарат алынды"
 
-#: ../src/profile_window.py:361
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Байланыс жоқ кезде сіз өзіңіздің контакт ақпаратын жариялай алмайсыз."
 
-#: ../src/profile_window.py:374
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Профайлды жіберу..."
 
-#: ../src/profile_window.py:393
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Ақпарат жарияланған ЖОҚ"
 
-#: ../src/profile_window.py:400
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard жариялануы қатемен аяқталды"
 
-#: ../src/profile_window.py:401
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Сіз өзіңіздің жеке ақпаратыңызды жариялау кезінде қате кетті, кейін қайталап көріңіз."
+#: ../src/profile_window.py:412
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Сіз өзіңіздің жеке ақпаратыңызды жариялау кезінде қате кетті, кейін қайталап "
+"көріңіз."
 
-#: ../src/roster_window.py:240
-#: ../src/roster_window.py:1028
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Біріктірілген тіркелгілер"
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Авторизация жіберілді"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" енді сіздің қалып-күйіңізді біле алады."
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Жазылуға сұраным жіберілді"
 
-#: ../src/roster_window.py:1983
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "Егер \"%s\" сіздің сұранымыңызды қабылдаса, сіз оның қалып-күйін біле аласыз."
+msgstr ""
+"Егер \"%s\" сіздің сұранымыңызды қабылдаса, сіз оның қалып-күйін біле аласыз."
 
-#: ../src/roster_window.py:1997
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Авторизация өшірілді"
 
-#: ../src/roster_window.py:1998
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" енді сізді әрқашан желіде емес күйінде көреді."
 
-#: ../src/roster_window.py:2025
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG қолдануға мүмкін емес"
 
-#: ../src/roster_window.py:2026
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Сіз %s үшін OpenPGP-сіз байланыс орнатасыз."
 
-#: ../src/roster_window.py:2238
-#: ../src/roster_window.py:3665
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Сіз бір не бірнеше чат бөлмесіне қатысушы болып тұрсыз"
 
-#: ../src/roster_window.py:2239
-#: ../src/roster_window.py:3666
-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:2335 ../src/roster_window.py:3826
+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:2265
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "байланыспаған"
 
-#: ../src/roster_window.py:2327
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Gajim-нан шығу керек пе?"
 
-#: ../src/roster_window.py:2328
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Gajim-нан шығуды шынымен қалайсыз ба?"
 
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Gajim-ді әрқашан жабу"
 
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "Қазір белсенді файлдармен алмасулар бар"
 
-#: ../src/roster_window.py:2413
-msgid "If you quit now, the file(s) being transferred will be stopped. Do you still want to quit?"
+#: ../src/roster_window.py:2520
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
 msgstr "Қазыр шықсаңыз, файлдармен алмасу(лар) тоқталады. Шығуды қалайсыз ба?"
 
-#: ../src/roster_window.py:2444
-#: ../src/roster_window.py:2811
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Сізде оқылмаған хабарламалар бар"
 
-#: ../src/roster_window.py:2445
-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:2552
+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:2812
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Транспортты өшіру алдында келесіні оқуыңыз керек."
 
-#: ../src/roster_window.py:2815
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" транспорты өшіріледі"
 
-#: ../src/roster_window.py:2816
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Бұл транспортты қолданатын барлық контакттарға бұдан былай хабарламаларды жібере не ала алмайтын боласыз."
+#: ../src/roster_window.py:2993
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Бұл транспортты қолданатын барлық контакттарға бұдан былай хабарламаларды "
+"жібере не ала алмайтын боласыз."
 
-#: ../src/roster_window.py:2819
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Транспорттар өшіріледі"
 
-#: ../src/roster_window.py:2824
+#: ../src/roster_window.py:3001
 #, 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:2892
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Контактты блоктауды қалағансыз. Жалғастыруды қалайсыз ба?"
 
-#: ../src/roster_window.py:2894
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Контакт бұдан былай сізді желіде емес сияқты көреді және сіз ол сізге жібергісі келетін хабарламаларды ала алмайтын боласыз."
+#: ../src/roster_window.py:3045
+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:2984
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Контакт атын ауыстыру"
 
-#: ../src/roster_window.py:2985
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "%s контакты үшін жаңа ник атын енгізіңіз"
 
-#: ../src/roster_window.py:2992
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Топ атын ауыстыру"
 
-#: ../src/roster_window.py:2993
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "%s тобы үшін жаңа атын енгізіңіз"
 
-#: ../src/roster_window.py:3038
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Топты өшіру"
 
-#: ../src/roster_window.py:3039
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Сіз ростерден %s тобын өшіруді қалайсыз ба?"
 
-#: ../src/roster_window.py:3040
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Сонымен қатар ростерден осы топтың барлық контакттарын өшіру"
 
-#: ../src/roster_window.py:3079
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP кілтін орнату"
 
-#: ../src/roster_window.py:3080
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Контактқа ілу үшін кілт таңдаңыз"
 
-#: ../src/roster_window.py:3475
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" контакты ростеріңізден өшіріледі"
 
-#: ../src/roster_window.py:3477
+#: ../src/roster_window.py:3637
 #, 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:3482
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Контактты өшірумен қатар сіз оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес сияқты көреді."
+#: ../src/roster_window.py:3642
+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:3488
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Жалғастыруды қалайсыз ба?"
 
-#: ../src/roster_window.py:3492
-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:3652
+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:3495
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Өшіруден кейін осы контакттар менің қалып-күйімді білуін қалаймын"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3499
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Контакттар ростеріңізден өшіріледі"
 
-#: ../src/roster_window.py:3504
+#: ../src/roster_window.py:3664
 #, 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:3562
-msgid "You are about to send a custom status. Are you sure you want  to continue?"
+#: ../src/roster_window.py:3722
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Сіз таңдауыңызша қалып-күйді жіберуді қалағансыз. Жалғастырамыз ба?"
 
-#: ../src/roster_window.py:3564
+#: ../src/roster_window.py:3724
 #, 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:3583
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Бірде-бір тіркелгі қолжетерсіз"
 
-#: ../src/roster_window.py:3584
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Басқа контакттармен сөйлесу үшін алдымен тіркелгіні жасауыңыз қажет."
 
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Метаконтакттарды сақтау серверіңіз қолдамайды"
 
-#: ../src/roster_window.py:4209
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Серверінің метаконтакттар ақпаратын сақтауды қолдамайды. Сол үшін, бұл ақпарат келесі рет қосылғаны үшін сақталмайды."
+#: ../src/roster_window.py:4458
+#, fuzzy
+msgid ""
+"Your server does not support storing metacontacts information. So this "
+"information will not be saved on next reconnection."
+msgstr ""
+"Серверінің метаконтакттар ақпаратын сақтауды қолдамайды. Сол үшін, бұл "
+"ақпарат келесі рет қосылғаны үшін сақталмайды."
 
-#: ../src/roster_window.py:4301
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4550
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Метаконтакт жасауды қалағансыз. Жалғастырамыз ба?"
 
-#: ../src/roster_window.py:4303
-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:4552
+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:4424
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Файл URI қате:"
 
-#: ../src/roster_window.py:4436
+#: ../src/roster_window.py:4685
 #, 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:4571
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "%s қазір %s үшін жіберу"
 
-#: ../src/roster_window.py:4582
+#: ../src/roster_window.py:4831
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s бірінші контакт қылу"
 
-#: ../src/roster_window.py:4585
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "%s және %s метаконтакт жасау"
@@ -9804,135 +10715,129 @@ msgstr "%s және %s метаконтакт жасау"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5025
-#: ../src/roster_window.py:5079
-#: ../src/roster_window.py:5088
-#: ../src/statusicon.py:263
-#: ../src/statusicon.py:310
-#: ../src/statusicon.py:316
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "%s тіркелгісін қолданып"
 
 #. add
-#: ../src/roster_window.py:5095
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "%s тіркелгісіне"
 
 #. disco
-#: ../src/roster_window.py:5100
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "%s тіркелгісін қолданып"
 
-#: ../src/roster_window.py:5139
-#: ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Бетбелгілерді басқару..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5159
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "%s тіркелгісі үшін"
 
-#: ../src/roster_window.py:5200
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "%s тіркелгісі үшін"
 
-#: ../src/roster_window.py:5260
-#: ../src/roster_window.py:5365
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: ../src/roster_window.py:5293
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Өленді жариялау"
 
-#: ../src/roster_window.py:5295
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "Орналасуды жариялау"
 
-#: ../src/roster_window.py:5298
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Қызметтерді баптау..."
 
-#: ../src/roster_window.py:5443
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "Бар_лығын жазу"
 
-#: ../src/roster_window.py:5453
-#: ../src/roster_window.py:5626
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Топ ү_шін хабарлама жіберу"
 
-#: ../src/roster_window.py:5461
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Барлық пайдаланушыларға"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Барлық желідегі пайдаланушыларға"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5646
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Контакттарды басқару"
 
 #. Edit Groups
-#: ../src/roster_window.py:5655
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Топтар_ды түзету"
 
 #. Send single message
-#: ../src/roster_window.py:5710
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Бір хабарламаны жіберу..."
 
 #. Execute Command
-#: ../src/roster_window.py:5757
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Команданы орындау..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Транспортты басқару"
 
 #. Modify Transport
-#: ../src/roster_window.py:5776
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "Тр_анспортты басқару"
 
 #. Rename
-#: ../src/roster_window.py:5786
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Атын ауысты_ру"
 
-#: ../src/roster_window.py:5846
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Максималды қылу"
 
-#: ../src/roster_window.py:5855
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "Қа_йта байланысу"
 
-#: ../src/roster_window.py:5862
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "Ба_йланысты үзу"
 
 #. History manager
-#: ../src/roster_window.py:5951
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Тарихты басқару"
 
-#: ../src/roster_window.py:5962
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "Жаңа _чат бөлмесіне кіру"
 
-#: ../src/roster_window.py:6180
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Қалып-күй хабарламасын өзгерту..."
 
@@ -9940,36 +10845,23 @@ 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 "Нәтижесі жоқ"
 
-#: ../src/session.py:91
-msgid "Disk WriteError"
-msgstr "Дискке жазу қатесі"
-
-#: ../src/session.py:203
-#, python-format
-msgid "Subject: %s"
-msgstr "Тақырыбы: %s"
-
-#: ../src/session.py:393
-#: ../src/session.py:437
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Бұл сессия опцияларын растау"
 
-#: ../src/session.py:394
-#, python-format
+#: ../src/session.py:411
+#, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9982,7 +10874,7 @@ msgstr ""
 "\n"
 "Бұл опцияларды қабылдайсыз ба?"
 
-#: ../src/session.py:438
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9997,151 +10889,151 @@ msgstr ""
 "\n"
 "Сессияны жалғастыру керек пе?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Бұл контакт үшін OpenPGP қосулы тұр ма?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "Қалып-кү_й хабарламасын өзгерту..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "Р_остерді жасыру"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Бұл мәзірді жасыру"
 
-#: ../src/tooltips.py:392
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395
-#: ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s осы чат бөлмесінде"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [блокталған]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [қайырылған]"
 
-#: ../src/tooltips.py:521
-#: ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Қалып-күй:"
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Соңғы қалып-күйі: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " %s бастап"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Байланысқан"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Байланыспаған"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Жазылу: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "%s бастап белсенді емес"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "Белсенді еместік уақыты - %s"
 
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "Көңіл-күйі: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "Көңіл-күй:"
 
-#: ../src/tooltips.py:702
-#, python-format
-msgid "Activity: %s"
-msgstr "Әрекеті: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "Әрекеті:"
 
-#: ../src/tooltips.py:706
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Өлеңі: %s"
 
-#: ../src/tooltips.py:710
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Орналасуы: %s"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Беру"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Тарату"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Түрі: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Берілген: "
 
-#: ../src/tooltips.py:755
-#: ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Басталмаған"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Тоқтатылған"
 
-#: ../src/tooltips.py:761
-#: ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Аяқталған"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Аялдатылған"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Тежеліп қалған"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Алмасуда"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Бұл қызмет әлі толық ақпаратпен жауап бермеген"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10149,64 +11041,410 @@ msgstr ""
 "Бұл қызмет толық ақпаратпен жауап бере алмайды.\n"
 "Ол ескірген не сынық сияқты"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Клиент:Белгісіз"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?ОЖ:Белгісіз"
 
-#: ../src/vcard.py:310
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Уақыты:Белгісіз"
 
-#: ../src/vcard.py:334
-#: ../src/vcard.py:344
-#: ../src/vcard.py:552
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "%s бастап"
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>Ролі:</b>"
 
-#: ../src/vcard.py:371
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Қатысуы:</b>"
 
-#: ../src/vcard.py:379
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Бұл контакт сіздің бар болуы ақпаратыңызға қызығада, сіз болсаңыз, оған қызықпайсыз"
+#: ../src/vcard.py:408
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Бұл контакт сіздің бар болуы ақпаратыңызға қызығада, сіз болсаңыз, оған "
+"қызықпайсыз"
 
-#: ../src/vcard.py:381
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:410
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr "Сіз контакттың бар болуына қызығасыз, ол болса, сіздікіне қызықпайды"
 
-#: ../src/vcard.py:383
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Сіз бен контакт өзара бар болуы ақпаратына қызығасыз"
 
 #. None
-#: ../src/vcard.py:385
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Сіз контакттың бар болуына қызықпайсыз, және ол да өз ретінде сіздікіне қызықпайды"
+#: ../src/vcard.py:414
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Сіз контакттың бар болуына қызықпайсыз, және ол да өз ретінде сіздікіне "
+"қызықпайды"
 
-#: ../src/vcard.py:392
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Сіз осы контакттың өзіңіз жіберген жазылуға сұраным жауабын күтудесіз"
 
-#: ../src/vcard.py:394
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Кезекте жазылуға сұранымдар жоқ."
 
-#: ../src/vcard.py:399
-#: ../src/vcard.py:453
-#: ../src/vcard.py:575
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " ресурс приоритеті"
 
+#~ msgid "Choose Client Cert"
+#~ msgstr "Клиент сертификатын таңдау"
+
+#~ msgid "The path to the client certificate and key in PKCS#12 format"
+#~ msgstr "PKCS#12 пішіміндегі клиент сертификатына дейінгі жол"
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " бұл контактпен ашылған терезе/бет"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Әрекеттер</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Шарттар</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Кеңейтілген әрекеттер"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Кеңейтілген әрекеттерді басқару"
+
+#~ msgid "All statuses"
+#~ msgstr "Барлық күйлер"
+
+#~ msgid "Busy "
+#~ msgstr "Бос емес"
+
+#~ msgid "Contact Change Status "
+#~ msgstr "Контакт қалып-күйді өзгерту"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "Контакт байланыспаған"
+
+#~ msgid "Don't have "
+#~ msgstr "Жоқ "
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Файлдармен алмасу басталды"
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Топ чат хабарламасының  ерекшелеу түсі"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Топ чат хабарламасы алынған"
+
+#~ msgid "Have "
+#~ msgstr "Бар "
+
+#~ msgid "Launch a command"
+#~ msgstr "Команданы орындау"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Бір не бірнеше ерекше қалып-күйлер..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Желіде / Чатқа дайын"
+
+#~ msgid "Play a sound"
+#~ msgstr "Дыбысты ойнату"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Хабарлама алу"
+
+#~ msgid "When "
+#~ msgstr "Қашан"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Есептер панелінде чат терезісі жыпылықтауы үшін терезелер басқарушысының "
+#~ "UrgencyHint белсенді қылу"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "Ча_т терезесінің автоашылуын сөндіру"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Бар қалқымалы хабарлама терезелерін сөндіру"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "Бұ_л оқиға үшін бар дыбысты сөндіру"
+
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "Оқ_иғаны жүйелік сөреде көрсетуді сөндіру"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Оқиғаны ростерде көрсетуді сөндіру"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "М_ені қалқымалы хабарлама терезесімен ескерту"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Оқиға_ны ростерде көрсету"
+
+#~ msgid "and I "
+#~ msgstr "мен де"
+
+#~ msgid "contact(s)"
+#~ msgstr "контакт(тар)"
+
+#~ msgid "everybody"
+#~ msgstr "әркім"
+
+#~ msgid "for "
+#~ msgstr "үшін: "
+
+#~ msgid "group(s)"
+#~ msgstr "топ(тар)"
+
+#~ msgid "when I'm in"
+#~ msgstr "Мен келесіде болғанда: "
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Контакт профайлын көрсету (Ctrl+I)"
+
+#~ msgid "label"
+#~ msgstr "белгі"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Оға_н менің қалып-күйімді көруді рұқсат ету"
+
+#~ msgid "Descrition:"
+#~ msgstr "Анықтамасы: "
+
+#~ msgid "button"
+#~ msgstr "батырма"
+
+#~ msgid "Advanced..."
+#~ msgstr "Кеңейтілген..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Ростердегі контакттардың немен _айналысқанын көрсету"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Ростердегі контакттардың т_ындайтынын көрсету"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Ростерде_гі контакттардың көңіл-күйлерін көрсету"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Белгіленген болса, Gajim ростердегі контакттар үшін белсенділігін "
+#~ "көрсетеді"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Белгіленген болса, Gajim ростерде контакттардың орналасуын көрсетеді"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Белгіленген болса, Gajim ростердегі контакттар үшін өленін көрсетеді"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Бі_р хабарламаны жіберу..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Пайдаланушы аватары:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim жедел хабарласу"
+
+#~ msgid "English"
+#~ msgstr "Ағылшын"
+
+#~ msgid "Belarusian"
+#~ msgstr "Беларус"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Болгар"
+
+#~ msgid "Breton"
+#~ msgstr "Бретон"
+
+#~ msgid "Czech"
+#~ msgstr "Чех"
+
+#~ msgid "German"
+#~ msgstr "Неміс"
+
+#~ msgid "Greek"
+#~ msgstr "Грек"
+
+#~ msgid "British"
+#~ msgstr "Британиялық"
+
+#~ msgid "Esperanto"
+#~ msgstr "Эсперанто"
+
+#~ msgid "Spanish"
+#~ msgstr "Испаниялық"
+
+#~ msgid "Basque"
+#~ msgstr "Баск"
+
+#~ msgid "French"
+#~ msgstr "Француз"
+
+#~ msgid "Croatian"
+#~ msgstr "Хорватиялық"
+
+#~ msgid "Italian"
+#~ msgstr "Италияндық"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Норвегиялық (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Голландия"
+
+#~ msgid "Norwegian"
+#~ msgstr "Норвегиялық"
+
+#~ msgid "Polish"
+#~ msgstr "Поляк"
+
+#~ msgid "Portuguese"
+#~ msgstr "Португалдық"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Бразилия португалдық"
+
+#~ msgid "Russian"
+#~ msgstr "Орыс"
+
+#~ msgid "Serbian"
+#~ msgstr "Сербиялық"
+
+#~ msgid "Slovak"
+#~ msgstr "Словак"
+
+#~ msgid "Swedish"
+#~ msgstr "Швециялық"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Қытай (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Емле тілі"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Талап етеді: python-farsight."
+
+#~ 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 ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Көрсетілетін latex формулалар өлшемдерін өзгерту. Жоғары мән үлкенін "
+#~ "білдіреді."
+
+#~ msgid "all or space separated status"
+#~ msgstr "барлық не бос аралықпен ажыратылған күй"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', немесе 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' немесе ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Байланысты тексеріңіз не кейін қайталап көріңіз"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Орындау қатесі, \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "қате: оқу үшін %s ашу мүмкін емес"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "%s портын басқару мүмкін емес."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Сізде Gajim бірнеше рет қосулы тұрған шығар. Файлдармен алмасудан бас "
+#~ "тартылады."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ jabber клиенті"
+
+#~ msgid "Condition"
+#~ msgstr "Күйі"
+
+#~ msgid "when I am "
+#~ msgstr "Мен болғанда:"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr ""
+#~ "pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour) талап етеді."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "$$ $$ арасында LaTeX өрнектерін түрлендіру."
+
+#~ 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 or ImageMagick). Сізге "
+#~ "кеңейтілген баптаулар түзеткішінде 'use_latex' опциясын True мәніне "
+#~ "орнату керек."
+
+#~ 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 не ImageMagick) (Барлығы да "
+#~ "MikTeX ішінде). Сізге кеңейтілген баптаулар түзеткішінде 'use_latex' "
+#~ "опциясын True мәніне орнату керек."
+
+#~ msgid "Contacts"
+#~ msgstr "Контакттар"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Дискке жазу қатесі"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Тақырыбы: %s"
+
+#~ msgid "Mood: %s"
+#~ msgstr "Көңіл-күйі: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "Әрекеті: %s"
+
 #~ msgid "Requires gpg and python-GnuPGInterface."
 #~ msgstr "Талап етеді: gpg мен python-GnuPGInterface."
 
@@ -10305,9 +11543,6 @@ msgstr " ресурс приоритеті"
 #~ "Бөлмелер тарихы\n"
 #~ "Барлық чаттар тарихы"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Тіркелгілерді басқару"
-
 #~ msgid "gtk-delete"
 #~ msgstr "Өшіру"
 
diff --git a/po/lt.po b/po/lt.po
index 1f8d55aca..e99ba10cd 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,15 +3,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian <>\n"
@@ -21,302 +17,296 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Būklė"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Asmeniniai Įvykiai"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Pradėti pokalbį..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Jungtis į _Grupės Pokalbį..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Įtraukti asmenį..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Ieškoti Paslaugų"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Vykdyti komandą..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Keisti Prieigą"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Atidaryti Gmail paštą"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Asmeniniai Įvykiai"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Pradėti pokalbį..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Būklė"
+msgid "_Modify Account"
+msgstr "_Keisti Prieigą"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Prieigos kūrimo vedlys"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Jungiamasi prie serverio</b>\n"
-"\n"
-"Prašome palaukti..."
+"Kad prisijungtumėte privalote turėti prieigą\n"
+"Jabber tinkle."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Noriu už_registruoti naują prieigą"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prašome pasirinkti vieną iš variantų žemiau:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Įveskite jūsų turimos prieigos duomenis</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Slaptažodis:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Išsaugoti _slaptažodį"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anoniminė autentikacija"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Prisijungti, kai paspausiu Baigti"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Prieigos kūrimo vedlys"
+msgid "Anon_ymous authentication"
+msgstr "Anoniminė autentikacija"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Serveris:"
 
 #: ../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į"
+msgid "Prox_y:"
+msgstr "_Proksis:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Valdyti..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Naudoti parinktą serverio adresą/prievadą"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "_Proksis:"
+msgid "_Hostname:"
+msgstr "_Serverio adresas: "
 
 #: ../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į"
+msgid "_Port:"
+msgstr "_Portas:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Nustatyti mano profilį, kai prisijungsiu"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Papildomas"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Kad prisijungtumėte privalote turėti prieigą\n"
-"Jabber tinkle."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Baigti"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Serverio adresas: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Jungiamasi prie serverio</b>\n"
+"\n"
+"Prašome palaukti..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Prisijungti, kai paspausiu Baigti"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Slaptažodis:"
+msgid "Set my profile when I connect"
+msgstr "Nustatyti mano profilį, kai prisijungsiu"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Portas:"
+msgid "_Finish"
+msgstr "_Baigti"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Serveris:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Įvairūs</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Joks"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Prieiga"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Asmeninė informacija</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Įtraukti"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<i>Proksis</i>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Trinti"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "_Nustatyti būklei"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Pe_rvadinti"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Prieiga"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Į_jungti"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Prieiga"
+msgid "Anonymous authentication"
+msgstr "Anoniminė autentikaciją"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administravimo operacijos"
+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 ""
+"Šaltinis siunčiamas į Jabber serverį, tam, kad būtų atskirti JID, kai yra "
+"prisijungę du ar daugiau klientų tuo pačiu metu, tame pačiame serveryje ir "
+"prie tos pačios prieigos. Jūs galite būti prisijungę prie tos pačios  "
+"prieigos su šaltiniu 'Namai' ir 'Darbas', tuo pačiu metu. Šaltinis, kuris "
+"turi didžiausią prioritetą gaus visus pranešimus. (žiūrėkite žemiau)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anoniminė autentikaciją"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatiškai bandyti prisijungti, kai prarandamas ryšys"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Sinchronizuoti kontaktus"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Browse"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "_Prisijungti, kai Gajim pasileis"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "_Keisti slaptažodį"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Spauskite, kad pakeisti prieigos slaptažodį"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+msgid "Administration operations"
+msgstr "Administravimo operacijos"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Choose File to Send..."
+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 ""
+"Prioritetas, Jabber'yje naudojamas, kad nustatyti, kas turi gauti pranešimus "
+"iš jabber serverio, kai du ar daugiau klientų yra prisijungę prie tos pačios "
+"prieigos; Klientas, turintis aukščiausią prioritetą gaus pranešimus"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Pasirinkite _Raktą..."
+msgid "A_djust to status"
+msgstr "_Nustatyti būklei"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Spauskite, kad pakeisti prieigos slaptažodį"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritetas keisis automatiškai, priklausomai nuo jūsų būklės."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "_Prioritetas:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Blogas CA sertifikatas"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "_Prisijungti, kai Gajim pasileis"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Prisijungimas"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "El. paštas:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Vardas:"
+msgid "Resour_ce:"
+msgstr "Šal_tinis:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Browse"
 
 #: ../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 ""
-"Jei pažymėta, Gajim siųs užklausimą į kelis IP išskyrus Jūsų IP, tokiu būdu "
-"pagerės bylos siuntimas."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[This message is encrypted]"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Jei pažymėta, Gajim ims slaptažodį iš GPG agento, tokio kaip seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Blogas CA sertifikatas"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Prieiga"
 
 #: ../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 ""
-"Jei pažymėta, Gajim siuntinės „aš-gyvas“ paketus, kad nebūtų prarastas "
-"ryšys, dėl ko gali įvyksta savaiminiai atsijungimai"
+msgid "C_onnect on Gajim startup"
+msgstr "_Prisijungti, kai Gajim pasileis"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -327,6 +317,18 @@ msgstr ""
 "naudodamas šią prieigą"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatiškai bandyti prisijungti, kai prarandamas ryšys"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Saugoti visų asmenų pokalbių žurnalus"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -335,176 +337,202 @@ msgstr ""
 "Jei pažymėta, bet koks globalus būklės pakeitimas (įvykdytas iš sąrašo, "
 "pagrindinio lango apačioje) įtakos ir šios prieigos būklę accordingly"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Jei prievadas, pagal nutylėjimą, kuris naudojamas įeinančioms žinutėms "
-"neatitinka jūsų nustatymų, čia galite pasirinkti kitą.\n"
-"Turėtumėte pakeisti leistinus ugniasienės nustatymus."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Naudoti failų siuntimo proksius"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Pavardė:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Jei pažymėta, Gajim siųs užklausimą į kelis IP išskyrus Jūsų IP, tokiu būdu "
+"pagerės bylos siuntimas."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Apjun_gti prieigas"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Bendros parinktys"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Raktas nepasirinktas"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Asmeninė informacija"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Valdyti..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<i>Proksis</i>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "_Prioritetas:"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritetas, Jabber'yje naudojamas, kad nustatyti, kas turi gauti pranešimus "
-"iš jabber serverio, kai du ar daugiau klientų yra prisijungę prie tos pačios "
-"prieigos; Klientas, turintis aukščiausią prioritetą gaus pranešimus"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritetas keisis automatiškai, priklausomai nuo jūsų būklės."
+msgid "Send _keep-alive packets"
+msgstr "Siųsti „aš-gyvas“ paketus"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Pe_rvadinti"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Jei pažymėta, Gajim siuntinės „aš-gyvas“ paketus, kad nebūtų prarastas "
+"ryšys, dėl ko gali įvyksta savaiminiai atsijungimai"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Šal_tinis:"
+msgid "Use cust_om hostname/port"
+msgstr "Naudoti parinktą serverio adresą/prievadą"
 
 #: ../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 ""
-"Šaltinis siunčiamas į Jabber serverį, tam, kad būtų atskirti JID, kai yra "
-"prisijungę du ar daugiau klientų tuo pačiu metu, tame pačiame serveryje ir "
-"prie tos pačios prieigos. Jūs galite būti prisijungę prie tos pačios  "
-"prieigos su šaltiniu 'Namai' ir 'Darbas', tuo pačiu metu. Šaltinis, kuris "
-"turi didžiausią prioritetą gaus visus pranešimus. (žiūrėkite žemiau)"
+msgid "_Hostname: "
+msgstr "_Serverio adresas: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Saugoti visų asmenų pokalbių žurnalus"
+msgid "_Port: "
+msgstr "_Prievadas:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Įvairūs</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Siųsti „aš-gyvas“ paketus"
+msgid "Connection"
+msgstr "Prisijungimas"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Raktas nepasirinktas"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
+msgid "Choose _Key..."
+msgstr "Pasirinkite _Raktą..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Sinchronizuoti kontaktus"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Jei pažymėta, Gajim ims slaptažodį iš GPG agento, tokio kaip seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Naudoti parinktą serverio adresą/prievadą"
+msgid "_Edit Personal Information..."
+msgstr "_Keisti Asmeninę Informaciją..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Naudoti parinktą prievadą:"
+msgid "Information about you, as stored in the server"
+msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Naudoti failų siuntimo proksius"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Asmeninė informacija</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Asmeninė informacija"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Keisti Asmeninę Informaciją..."
+msgid "Co_nnect on Gajim startup"
+msgstr "_Prisijungti, kai Gajim pasileis"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Į_jungti"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Serverio adresas: "
+msgid "Use cust_om port:"
+msgstr "Naudoti parinktą prievadą:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Valdyti..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Jei prievadas, pagal nutylėjimą, kuris naudojamas įeinančioms žinutėms "
+"neatitinka jūsų nustatymų, čia galite pasirinkti kitą.\n"
+"Turėtumėte pakeisti leistinus ugniasienės nustatymus."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Vardas:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Prievadas:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Pavardė:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "El. paštas:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Apjun_gti prieigas"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Prieiga:"
+msgid "Add New Contact"
+msgstr "Prijungti naują asmenį"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Leisti šiam asmeniui matyti mano būklę"
+msgid "A_ccount:"
+msgstr "_Prieiga:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Prijungti naują asmenį"
+msgid "_Protocol:"
+msgstr "_Protokolas:"
 
-#: ../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 "Norėšiau jus įtraukti į savo kontaktų sąrašą."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Naudotojo ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Slapyvardis:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupė:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Leisti šiam asmeniui matyti mano būklę"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Sutikimas"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -516,7 +544,11 @@ msgstr ""
 "protokolo. Jei norite tęsti, spustelkite ant mygtuko\n"
 "registruoti."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registracija"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -524,712 +556,507 @@ msgstr ""
 "Kad galėtumėte pridėti asmenį iš šio protokolo, turite\n"
 "būti prisijungęs prie perlaidos."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupė:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Slapyvardis:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokolas:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registracija"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Sutikimas"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Naudotojo ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Įvyko klaida:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Komandos - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Pasirinktie komandą vykdymui:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Prašome luktelti, kol atsisiųs komandų sąrašas..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Komandos - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Pasirinktie komandą vykdymui:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Patikrinti dar kartą"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Klaidos aprašymas..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Prašome luktelti, kol siunčiama komanda..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Baigti"
+msgid "Please wait..."
+msgstr "Prašome palaukti..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Prašome luktelti, kol atsisiųs komandų sąrašas..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Ši jabber esybė nepateikė jokių komando."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Prašome luktelti, kol siunčiama komanda..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Įvyko klaida:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Prašome palaukti..."
+msgid "Error description..."
+msgstr "Klaidos aprašymas..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Ši jabber esybė nepateikė jokių komando."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Baigti"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Išplėstinis konfigūracijos redaktorius"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtras:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Aprašymas</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>PASTABA:</b> Kad įsigaliotų tam tikri nustatymai turite perkrauti Gajim"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Išplėstinis konfigūracijos redaktorius"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtras:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Trinti MOTD"
+msgid "Show _XML Console"
+msgstr "Rodyti _XML konsolę"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Keisti _Privačiuosius Sąrašus..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administratorius"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Siųsti Žinutę Serveriui..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Nustatyti MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Nustatyti dienos žinutę"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Rodyti _XML konsolę"
+msgid "Set MOTD..."
+msgstr "Nustatyti MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Atnaujinti MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Atnaujinti MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administratorius"
+msgid "Delete MOTD"
+msgstr "Trinti MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Siųsti Žinutę Serveriui..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " atidarytas langas/žymė su šiuo asmeniu "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Veiksmai</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Sąlygos</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Garsai</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Išplėstiniai veiksmai"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Išplėstinis pranešimų valdymas"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Manęs nėra"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Užsiėmęs "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Contact Changed Status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contact Disconnected"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Neturiu "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Failų siuntimai"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "File Transfer Request"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "File Transfer Stopped"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Group Chat Message Highlight"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Group Chat Message Received"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Turiu "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Nematomas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Paleisti komandą"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Esu išėjęs"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Viena ar daugiau specialių būklių..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Prisijungęs / Laisvas susirašinėti"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Groti garsą"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "New Private Message"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kai "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktyvuoti langų tvarkyklės UrgencyHint, kad pokalbio langas mirksėtų "
-"užduočių juostoje"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Padaryti, kad pokalbių langas automatiškai neiššoktu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Uždrausti esančius iššokstančius (pop-up) langus"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Uždrausti esmą garsą šiam įvykiui"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 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"
-msgstr "_Informuok mane su iššokstančiu langu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Atidaryti pokalbio langą su šiuo naudotoju"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "_Rodyti įvykį kontaktų sąraše"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "ir aš "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Asmuo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "dėl "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupės"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "kai būsiu"
+msgid "Deletes Message of the Day"
+msgstr "Ištrins dienos žinutę"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Joks"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Parinktys"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Automatinis prsijungimas"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Joks"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Parinktys"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Automatinis prsijungimas"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Įrašas:"
+msgid "New entry received"
+msgstr "Gautas naujas įrašas"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Jūs gavote naują įrašą:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Kanalo pavadinimas:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Įrašas:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Paskutinį kartą keista:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Gautas naujas įrašas"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Jūs gavote naują įrašą:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Žinutė:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Žinutė:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Žinutė:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Nuotaika:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Žinutė:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Keisti slaptažodį"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Įveskite jį dar kartą, dėl patvirtinimo:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Įveskite naują slaptažodį:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Įveskite jį dar kartą, dėl patvirtinimo:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Įveskite naują būklės žinutę</b>"
+msgid "Save as Preset..."
+msgstr "Išsaugoti kaip nustatytą..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktyvumas:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Nuotaika:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktyvumas:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Nustatytos žinutės:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Išsaugoti kaip nustatytą..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Įveskite naują būklės žinutę</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Prisijungti prie pokalbio grupėje"
+msgid "_Copy Link Location"
+msgstr "_Kopijuoti nuorodos adresą"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "Įtr_aukti į kontaktų sąrašą..."
+msgid "_Open Link in Browser"
+msgstr "_Atverti nuorodą naršyklėje"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopijuoti JID/El. pašto adresą"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopijuoti nuorodos adresą"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Atidaryti el. pašto programą"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Atverti nuorodą naršyklėje"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Pradėti pokalbį"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Prisijungti prie pokalbio grupėje"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "Įtr_aukti į kontaktų sąrašą..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Siųsti žinutę"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Siųsti"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Pak_viesti"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC serveris"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
+msgid "MUC server"
+msgstr "MUC serveris"
+
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Pak_viesti"
 
 #: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Siųsti užklausimą, kad galėtumėte matyti jo/jos būklę"
+msgid "Start _Chat"
+msgstr "Pradėti _Pokalbį"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Įtraukti Specialų Pranešimą..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Siųsti ži_nutę..."
 
 #: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Priskirti Open_PGP Raktą..."
-
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "_Vykdyti Komandą..."
-
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Keisti _Grupes..."
+msgid "Send _File..."
+msgstr "Siųsti _Failą..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "_Trinti"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Įjungti Open_PGP kodavimą"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Įjungti Abipusį Šifravimą"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Siųsti _Parinktą Būklę"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "_Vykdyti Komandą..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Siųsti ži_nutę..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Valdyti Kontaktus"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Siųsti _Failą..."
+msgid "_Rename..."
+msgstr "_Pervadinti..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+msgid "Edit _Groups..."
+msgstr "Keisti _Grupes..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Pradėti _Pokalbį"
+msgid "Assign Open_PGP Key..."
+msgstr "Priskirti Open_PGP Raktą..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Įjungti Abipusį Šifravimą"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Įjungti Open_PGP kodavimą"
+msgid "Add Special _Notification..."
+msgstr "Įtraukti Specialų Pranešimą..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Sutikimas"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Leisti jam/jai matyti mano būklę"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Leisti šiam asmeniui matyti mano būklę"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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 ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Siųsti užklausimą, kad galėtumėte matyti jo/jos būklę"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Istorija"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Valdyti Kontaktus"
+msgid "_Unignore"
+msgstr "_Nebeignoruoti"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Pervadinti..."
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Sutikimas"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "_Trinti"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Nebeignoruoti"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Istorija"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Užpildykite formą."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Kambario nustatymai"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Užpildykite formą."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Keisti grupę"
@@ -1242,55 +1069,47 @@ msgstr ""
 msgid "_Verify"
 msgstr ""
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Savybės"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Savybės"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
+msgid "File Transfers"
+msgstr "Failų siuntimai"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Atšaukti failo siuntimą"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Rodyti failų siuntimų sąrašą tarp jūsų ir kitų"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Atšaukti pažymėtų failų siuntimą"
+msgid "file transfers list"
+msgstr "failų siuntimų sąrašas"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Atšaukti pažymėtų failų siuntimą ir ištrinti nepilnus failus"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Išvalyti"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Pranešti, kai failo siuntimas bus baigtas"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Failų siuntimai"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Slėpti langą"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Pašalinti užbaigtus, atšauktus ir lūžusius failų siuntimus iš sąrašo"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Pašalinti failo siuntimą iš sąrašo."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Pašalinti užbaigtus, atšauktus ir lūžusius failų siuntimus iš sąrašo"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Rodyti failų siuntimų sąrašą tarp jūsų ir kitų"
-
-#: ../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"
@@ -1298,82 +1117,108 @@ msgstr ""
 "Šis veiksmas pašalins vieną failo siuntimą iš sąrašo. Jei failo siuntimas "
 "yra aktyvus, jis iš pradžių bus sustabdytas ir tada ištrintas"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Išvalyti"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pauzė"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Atšaukti pažymėtų failų siuntimą ir ištrinti nepilnus failus"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Tęsti"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Atšaukti failo siuntimą"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Pranešti, kai failo siuntimas bus baigtas"
+msgid "Cancels the selected file transfer"
+msgstr "Atšaukti pažymėtų failų siuntimą"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Atidaryti katalogą, kuriame yra failas"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Slėpti langą"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pauzė"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Tęsti"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "failų siuntimų sąrašas"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Atidaryti katalogą, kuriame yra failas"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Pokalbių būklės žymių spalvos</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Prieiga"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Paryškintas"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Group"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Asmuo"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Kuriama"
+msgid "Gajim Themes Customization"
+msgstr "Gajim temų keitimas"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Asmuo"
+msgid "Text _color:"
+msgstr "Teksto _spalva:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Šrifto stilius:"
+msgid "_Background:"
+msgstr "_Fonas:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim temų keitimas"
+msgid "Text _font:"
+msgstr "Teksto šri_ftas:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Dingo"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Group"
+msgid "Font style:"
+msgstr "Šrifto stilius:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktyvus"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Paryškintas"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Pasviręs"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "sustabdytas"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Kuriama"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Neaktyvus"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Pokalbių būklės žymių spalvos</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Dingo"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1381,7 +1226,7 @@ msgstr ""
 "MUC\n"
 "Žinutės"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1389,107 +1234,100 @@ msgstr ""
 "MUC skirtos\n"
 "Žinutės"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "sustabdytas"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Teksto _spalva:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Teksto šri_ftas:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Fonas:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Keisti _Slapyvardį..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Valdyti Kambarį"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Keisti _Temą..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Keisti Kambario Nustatymus..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "Žy_mės"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr ""
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Valdyti Kambarį"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr ""
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Balsas"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "Žy_mės"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_deratorius"
+msgid "_Send Private Message"
+msgstr "_Siųsti privačią žinutę"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Valdytojo Veiksmai"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Siųsti _Failą"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Valdytojo Veiksmai"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "Įtr_aukti į kontaktų sąrašą"
+msgid "_Voice"
+msgstr "_Balsas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_deratorius"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Dalyvis"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Adminas"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Banas"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Savininkas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Išspirti"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Dalyvis"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Savininkas"
+msgid "_Ban"
+msgstr "_Banas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Siųsti privačią žinutę"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Balsas"
+msgid "_Add to Roster"
+msgstr "Įtr_aukti į kontaktų sąrašą"
 
-#: ../data/gui/groupchat_control.ui.h:1
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Žy_mės"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Rodyti formatavimo sąrašą"
 
 #: ../data/gui/groupchat_control.ui.h:3
-msgid "Change the room's subject (Alt+T)"
+msgid "Change your nickname (Ctrl+N)"
 msgstr ""
 
 #: ../data/gui/groupchat_control.ui.h:4
-msgid "Change your nickname (Ctrl+N)"
+msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
+#: ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Žy_mės"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Kurti naują pranešimą"
@@ -1500,39 +1338,19 @@ msgid "From:"
 msgstr "Nuo:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../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."
-msgstr ""
-"<b>ĮSPĖJIMAS:</b>\n"
-"Jei planuojate daryti masinius trynimus, įsitikinkite, kad Gajim yra "
-"išjungtas. Stenkitės netrinti kontaktų su kuriais dabar bendraujate."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim Istorijos Žurnalų Valdymas"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Trinti"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Eksportuoti"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim Istorijos Žurnalų Valdymas"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1541,171 +1359,196 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>ĮSPĖJIMAS:</b>\n"
+"Jei planuojate daryti masinius trynimus, įsitikinkite, kad Gajim yra "
+"išjungtas. Stenkitės netrinti kontaktų su kuriais dabar bendraujate."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Paieška duomenų bazėje"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Old stories"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Pokalbio istorija"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Eksportuoti"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Contact name"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Groupchats"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Old stories"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Pokalbio istorija"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Ieškoti:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Registruoti pokalbio istoriją"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Registruoti asmenų būklės pakitimus"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
+msgid "otr"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
+msgid "concede"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Prisijungti prie šio kambario automatiškai."
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Kambarys:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Slapyvardis:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Nesenai:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Nesenai:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Prisijungti prie šio kambario automatiškai."
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Kambarys:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Žy_mės"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Serveris:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Žy_mės"
+msgid "Bro_wse Rooms"
+msgstr "_Browse"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Jungtis"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automatinis prsijungimas"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Jei pažymėta, Gajim, startuodamas jungsis prie šio pokalbio grupėje"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Žymių valdymas"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Antraštė:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Rodyti būklę:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatinis prsijungimas"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Jei pažymėta, Gajim, startuodamas jungsis prie šio pokalbio grupėje"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Antraštė:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1716,97 +1559,100 @@ msgid "_Configure"
 msgstr "_Konfigūruoti"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Savybės</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Prisijungta"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Nustatymai</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Prisijungta"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Proxi profilių valdymas"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Tipas:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Slaptažodis:"
+msgid "_Name:"
+msgstr "_Pavadinimas:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proksi _Serveris:"
+msgid "<b>Properties</b>"
+msgstr "<b>Savybės</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proksi _Prievadas:"
+msgid "Use HTTP prox_y"
+msgstr "_Naudoti HTTP proksi"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
+msgid "_BOSH URL:"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "_Naudoti HTTP proksi"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Naudoti proksi _autentikaciją"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Naudotojo vardas:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr ""
+msgid "Pass_word:"
+msgstr "_Slaptažodis:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Pavadinimas:"
+msgid "Proxy _Host:"
+msgstr "Proksi _Serveris:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Tipas:"
+msgid "Proxy _Port:"
+msgstr "Proksi _Prievadas:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Naudotojo vardas:"
+msgid "<b>Settings</b>"
+msgstr "<b>Nustatymai</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Prieigų valdymas"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Slapta frazė"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torizuoti"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "Esu išėjęs"
+msgid "Version:"
+msgstr "GTK+ Version:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigūruoti"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Aprašymas: "
+msgid "Authors:"
+msgstr "Au_torizuoti"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1814,38 +1660,31 @@ msgid "Homepage:"
 msgstr "<b>Asmeninė svetainė:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
-msgid "Installed"
-msgstr ""
+#, fuzzy
+msgid "Description:"
+msgstr "Aprašymas: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigūruoti"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
+msgid "Installed"
 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"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1859,1006 +1698,1021 @@ msgid "Event desc"
 msgstr "Įvykiai"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Išplėstinis konfigūracijos redaktorius</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Programos</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Kitaip</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Veiksmai</b>"
+msgid "All chat states"
+msgstr "Visos būklės"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatinė Būklė</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Kuriama"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Pokalbio Išvaizda</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Disabled"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Pokalbio Eilutės Spalvos</b>"
+#, fuzzy
+msgid "Never"
+msgstr "_Niekada"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Pokalbio būklės pranešimai</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Sąlygos</b>"
+msgid "Always"
+msgstr "Manęs nėra"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Rodyk"
 
-#. 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>Kitaip</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Pranešti man apie tai"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Šriftas</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Rodyti tik kontaktų _sąrašą"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail nustatymai</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Nustatytosios būklės žinutės</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<i>Privatumas</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Last status: %s"
+
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Būklės Žinutės</b>"
+msgid "Preferences"
+msgstr "Parinktys"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Temos</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Antras:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
+"lange"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Vizualinis informavimas</b>"
+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:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Išplėstinis"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Rodyti kontaktų nuotaikas sąraše"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Išplėstinis..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Visos būklės"
+msgid "Sort contacts by status"
+msgstr "Rūšiuoti kontaktus pagal būklę"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Leisti siųsti informaciją apie _OS"
+msgid "in _roster"
+msgstr "_sąraše"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Leisti siųsti informaciją apie _OS"
+msgid "in _group chats"
+msgstr "pokalbiuose _grupėje"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Leisti pop-up/informavimą, kai esu _nuėjęs/nepasiekamas/užimtas/namatomas"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Manęs nėra"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Prašyti įvesti būklės žinutę, kai aš:"
+msgid "_Emoticons:"
+msgstr "Šyp_senėlės:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "_Padaryti žinučių langus kompaktiškus"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Slėpti visus mygtukus pokalbio languose"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignoruoti formatuotą turinį įeinančioms žinutėms"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Būklės pranešimas:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Startuojant tikrinti ar Gajim yra pagrindinis Jabber klientas"
+msgid "_Highlight misspelled words"
+msgstr "Žymėti žodžius su _gramatine klaida"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Kuriama"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Nustatyti sąsajos spalvą ir šriftą"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Rodyk _Kontaktų Sąrašą"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Būklės pranešimas:"
+msgid "Show icon when your messages are received"
+msgstr "Sound to play when any MUC message arrives."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Contact name"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Kitaip</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Pokalbio Išvaizda</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Naujam įvykiui įvykus:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Pranešti apie _prisijungusius kontaktus"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Pranešti apie _atsijungusius kontaktus"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Disabled"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Leisti pop-up/informavimą, kai esu _nuėjęs/nepasiekamas/užimtas/namatomas"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Rodyti kontaktų _aktyvumą sąraše"
+msgid "Notify on new _GMail email"
+msgstr "Pranešk apie naujus _GMail laiškus"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Rodyti papildomus _el. pašto duomenis"
+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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Rodyti kontaktų nuotaikas sąraše"
+msgid "Display _extra email details"
+msgstr "Rodyti papildomus _el. pašto duomenis"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
 msgstr ""
+"Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail nustatymai</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Rodyti kontaktų nuotaikas sąraše"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizualinis informavimas</b>"
 
 #: ../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 gali išsiųsti ir parsisiųsti meta-informaciją, susijusią su pokalbiu, "
-"kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
-"koduotę rodyti pokalbių languose."
+msgid "Play _sounds"
+msgstr "Groti _garsus"
 
 #: ../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 gali išsiųsti ir parsisiųsti meta-informaciją, susijusią su pokalbiu, "
-"kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
-"koduotę išsiųsti kitai šaliai."
+msgid "Ma_nage..."
+msgstr "Val_dyti..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 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:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Garsai</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "Slėpti visus mygtukus pokalbio languose"
+msgid "Notifications"
+msgstr "Pranešimai"
 
 #: ../data/gui/preferences_window.ui.h:59
 msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
+"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 ""
-"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
+"Gajim gali išsiųsti ir parsisiųsti meta-informaciją, susijusią su pokalbiu, "
+"kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
+"koduotę rodyti pokalbių languose."
 
 #: ../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ą"
+msgid "_Display chat state notifications:"
+msgstr "Rodyti _pokalbio būklės pranešimus:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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 gali išsiųsti ir parsisiųsti meta-informaciją, susijusią su pokalbiu, "
+"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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+msgid "_Send chat state notifications:"
+msgstr "_Siųsti pokalbio būklės pranešimus:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
-"lange"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Pokalbio būklės pranešimai</b>"
 
 #: ../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 ""
-"Jei pažymėta, Gajim rodys žiničių būkles žemiau kontaktinio asmens vardo, "
-"kontaktų sąraše ir pokalbių grupėse"
+msgid "Personal Events"
+msgstr "Asmeniniai Įvykiai"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Nuėjęs po:"
 
 #: ../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"
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
 
 #: ../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"
+msgid "_Not available after:"
+msgstr "_Nepasiekiamas po:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"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: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 ""
+msgid "minutes"
+msgstr "minutės"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Jei pažymėta, Gajim ignoruos visas įeinančias žinutes iš kontaktų, kurie "
-"neįtraukti į jūsų kontaktų sąrašą. Naudokite šią funkciją atsargiai, todėl, "
-"kad negausite jokių žinučių iš žmonių, kurie neįtraukti į jūsų kontaktų "
-"sąrašą."
-
-#: ../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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Jei pažymėsite, Gajim parodys pranešimą, kai gausite naują laišką į GMail"
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Jei pažymėta, Gajim naudos specifinius protokolo būklės paveiksliukus. "
-"(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: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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"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:76
-msgid "Log _encrypted chat session"
-msgstr ""
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatinė Būklė</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "_Padaryti žinučių langus kompaktiškus"
+msgid "Ask status message when I:"
+msgstr "Prašyti įvesti būklės žinutę, kai aš:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Val_dyti..."
+msgid "Sign _in"
+msgstr "Pr_isijungti"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Niekada"
+msgid "Sign _out"
+msgstr "_Atsijungti"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Pranešimai"
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Pranešti apie _prisijungusius kontaktus"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Būklės Žinutės</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Pranešti apie _atsijungusius kontaktus"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Nustatytosios būklės žinutės</b>"
 
-#: ../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:83 ../src/config.py:398
+msgid "Status"
+msgstr "Būklė"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Pranešk apie naujus _GMail laiškus"
+msgid "Use system _default"
+msgstr "Naudoti sisteminius nustatymus"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+msgid "Chat message:"
+msgstr "Būklės pranešimas:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Asmeniniai Įvykiai"
+msgid "<b>Font</b>"
+msgstr "<b>Šriftas</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Groti _garsus"
+msgid "Use _transports icons"
+msgstr "Naudoti _pernašos piktogramas"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Rodyk"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Jei pažymėta, Gajim naudos specifinius protokolo būklės paveiksliukus. "
+"(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:89
-msgid "Preferences"
-msgstr "Parinktys"
+msgid "Status _iconset:"
+msgstr "Būklės _piktogramų rinkinys:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Nustatyti sąsajos spalvą ir šriftą"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Tema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Serveris:"
+msgid "<b>Themes</b>"
+msgstr "<b>Temos</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
+msgid "Contact's nickname:"
+msgstr "Contact name"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Rodyti tik kontaktų _sąrašą"
+msgid "Your nickname:"
+msgstr "B_efore nickname:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Pr_isijungti"
+msgid "_Status message:"
+msgstr "_Būklės pranešimas:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Atsijungti"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
 #: ../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 ""
-"Kai kurios žinutės gali turėti formatuotą turinį (pastorinimai, spalvos ir "
-"pan.). Jei pažymėsite, Gajim rodys tiesiog tekstą, be jokių formatavimų."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Būklės pranešimas:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Rūšiuoti kontaktus pagal būklę"
+#, fuzzy
+msgid "Your message:"
+msgstr "Error message: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Būklė"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Group Chat Message Highlight"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Būklės _piktogramų rinkinys:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Pokalbio Eilutės Spalvos</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stilius"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Tema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Veiksmai</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Naudoti _pernašos piktogramas"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Antras:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Naudoti sisteminius nustatymus"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Serveris:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Sąlygos</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "Naujam įvykiui įvykus:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Error message: %s"
+msgid "_File manager:"
+msgstr "_Failų menedžeris:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "B_efore nickname:"
+msgid "_Mail client:"
+msgstr "_El. pašto programa:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Nuėjęs po:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Naršyklė:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Rodyti _pokalbio būklės pranešimus:"
+msgid "<b>Custom</b>"
+msgstr "<b>Kitaip</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "Šyp_senėlės:"
+msgid "<b>Applications</b>"
+msgstr "<b>Programos</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Failų menedžeris:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "Žymėti žodžius su _gramatine klaida"
+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 ""
+"Jei pažymėta, Gajim ignoruos visas įeinančias žinutes iš kontaktų, kurie "
+"neįtraukti į jūsų kontaktų sąrašą. Naudokite šią funkciją atsargiai, todėl, "
+"kad negausite jokių žinučių iš žmonių, kurie neįtraukti į jūsų kontaktų "
+"sąrašą."
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Leisti siųsti informaciją apie _OS"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignoruoti formatuotą turinį įeinančioms žinutėms"
+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:128
-msgid "_Log status changes of contacts"
-msgstr "_Registruoti asmenų būklės pakitimus"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Leisti siųsti informaciją apie _OS"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_El. pašto programa:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Nepasiekiamas po:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Atidaryti..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Leisti siųsti informaciją apie _OS"
 
 #: ../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:134
-msgid "_Status message:"
-msgstr "_Būklės pranešimas:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+msgid "<b>Privacy</b>"
+msgstr "<i>Privatumas</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Registruoti asmenų būklės pakitimus"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "pokalbiuose _grupėje"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "_sąraše"
+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:139
-msgid "minutes"
-msgstr "minutės"
+msgid "_Open..."
+msgstr "_Atidaryti..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Išplėstinis konfigūracijos redaktorius</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Išplėstinis"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privatūs Sąrašai:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Pridėti / Keisti taisyklę</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Privatus sąrašas"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Taisyklių sąrašas</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privatus Sąrašas</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktyvus šiai sesijai"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktyvus kiekvieno paleidimo metu"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Taisyklių sąrašas</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Visi"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Pridėti / Keisti taisyklę</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Visi (įskaitant prenumeratas)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Leisti"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Atmesti"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "visus grupėje"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Tvarka:"
+msgid "all by subscription"
+msgstr "visus pagal užsisakymą"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Privatus sąrašas"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Visi"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "visus pagal užsisakymą"
+msgid "to send me messages"
+msgstr "žinučių siuntimui"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "visus grupėje"
+msgid "to send me queries"
+msgstr "užklausimų siuntimui"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Abu"
+msgid "to view my status"
+msgstr "mano būklės peržiūrai"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Nuo"
+msgid "to send me status"
+msgstr "informavimui mane, apie būklę"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "vienas"
+msgid "All (including subscription)"
+msgstr "Visi (įskaitant prenumeratas)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "du"
+msgid "Order:"
+msgstr "Tvarka:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "žinučių siuntimui"
+#, fuzzy
+msgid "none"
+msgstr "vienas"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "užklausimų siuntimui"
+#, fuzzy
+msgid "both"
+msgstr "Abu"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "informavimui mane, apie būklę"
+#, fuzzy
+msgid "from"
+msgstr "Nuo"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "mano būklės peržiūrai"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresas</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Atvaizdas:</b>"
+#, fuzzy
+msgid "to"
+msgstr "du"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Gimtadienis:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Miestas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Pavardė:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Kompanija:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Šalis:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Antras:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Skyrius:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>El. paštas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Titulas:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Papildomas adresas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Duotas:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Pavardė:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sufiksas:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Pilnas Vardas</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Gatvė:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Duotas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Miestas:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Asmeninė svetainė:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Valstija:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Papildomas adresas:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Antras:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Pašto Kodas:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Vardas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Šalis:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Slapyvardis:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresas</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Tel. Nr.:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Asmeninė svetainė:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Pareigos:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Vardas:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Pašto Kodas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Slapyvardis:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Tel. Nr.:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Titulas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formatas: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Vaidmuo:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Gimtadienis:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Valstija:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>El. paštas:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Gatvė:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Atvaizdas:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Spauskia čia, kad įkeltum savo atvaizdą"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sufiksas:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Asmeninė Informacija"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Kompanija:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Apie"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Pareigos:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Spauskia čia, kad įkeltum savo atvaizdą"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Skyrius:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formatas: YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Vaidmuo:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Asmeninė Informacija"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Darbas"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Ką norėtumėte veikti?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Apie"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Pašalinti prieigą, _tik iš Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Ką norėtumėte veikti?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Trinti"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Įtraukti _Kontaktą..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "_Savybės"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Veiksmai"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Failų _Siuntimai"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Įtraukti _Kontaktą..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Dažniausiai Užduodami Klausimai (prisijungus)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Redaguoti"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Pagalba tinkle"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Prieigos"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profilis, At_vaizdas"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Rodinys"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Rodyti _Atsijungusius Asmenis"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Rodyti _Pernašas"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Rodyti _Atsijungusius Asmenis"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Prieigos"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Failų _Siuntimai"
 
-#. 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 "_Veiksmai"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Pagalba"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Redaguoti"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Pagalba tinkle"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_DUK"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Pagalba"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "_Siųsti Žinutę..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Dažniausiai Užduodami Klausimai (prisijungus)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Rodinys"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Palaukite, kol atsisiųs paieškos forma..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Savybės"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Ieškoti"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Palaukite, kol atsisiųs paieškos forma..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Įtr_aukti Kontaktą"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informacija"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Ieškoti"
 
@@ -2878,41 +2732,37 @@ msgstr "Registruotis prie"
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Atsakyti šiai žinutei"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Kam:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Siųsti"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Siųsti žinutę"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Išsiųsti žinutę ir uždaryti langą"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Atsakyti"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Kam:"
+msgid "Reply to this message"
+msgstr "Atsakyti šiai žinutei"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Atsakyti"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Išsiųsti "
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Išsiųsti žinutę ir uždaryti langą"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torizuoti"
+msgid "Subscription Request"
+msgstr "Sutikimo užklausimas"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autorizuoti asmenį, kad jis arba ji žinotu kada esate prisijungęs"
+msgid "_Deny"
+msgstr "_Drausti"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2922,261 +2772,273 @@ msgstr ""
 "Drausti autorizacija šiam asmeniui, jis arba ji negalės matyti ar esate "
 "prisijungęs"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Sutikimo užklausimas"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torizuoti"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Drausti"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizuoti asmenį, kad jis arba ji žinotu kada esate prisijungęs"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Sinchronizuoti kontaktus"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Pažymėkite kontaktus kuriuos norėsite sinchronizuoti"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sinchronizuoti : pažymėkite kontaktus"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Išjungti Garsus"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Siųsti Vieną Ži_nutę"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Rodyti Visus Laukiančius Į_vykius"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Pažymėkite kontaktus kuriuos norėsite sinchronizuoti"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "_Būklė"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "Pokalbiai _Grupėje"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Klausk:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Siųsti Vieną Ži_nutę"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klientas:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Kontakto laikas:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Išjungti Garsus"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Asmens Informacija"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Šaltinis:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Būklė:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Prenumerata:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klientas:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Sistema:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentarai"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Kontakto laikas:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Atvaizdas:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Nustatytas atvaizdas:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Asmuo"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Prenumerata:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Asmens Informacija"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Klausk:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Daugiau"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Naudotojo atvaizdas:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Asmuo"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Šriftas</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentarai"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Srautas</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Įvestis</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Informacija/Užklausa"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Šriftas</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Informacija/Užklausa"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Buvimas"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "Ži_nutė"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Buvimas"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Įvestis</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Keisti Prieigą..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Vietinis jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Asmeninis"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Šaltinis:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Būklė:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klientas"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Asmeninis"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Greitųjų žinučių programa"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klientas"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klientas"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Atšaukti sutikimą"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Invalid File"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 msgid "The form is not filled correctly."
 msgstr ""
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Komandos - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(None)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -3187,293 +3049,234 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Jūs gavote naujų įrašų (ir %d nerodomi):"
 msgstr[1] "Jūs gavote naujų įrašų (ir %d nerodomi):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "English"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Belarusian"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgarian"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
+#: ../src/chat_control.py:209
+msgid "Ping?"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
+#: ../src/chat_control.py:219
+msgid "Error."
 msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Rašybos tikrinimo kalba"
-
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Pabraukimas"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Perbraukimas"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Šriftas"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Valyti formatavimą"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Tikrai siųsti failą?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG šifravimas įjungtas"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Ne Sąraše"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Automatinio nebuvimo būklės žinutė"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Siųsti _Failą"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG šifravimas išjungtas"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "ir patvirtintas"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Ši žinutė šifruota"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E šifravimas išjungtas"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Ši žinutė NEBUVO šifruota"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Ši žinutė buvo šifruota"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3481,240 +3284,597 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s dabar %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Failų siuntimai"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Size: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Priimti"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "File transfer completed"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Groupchat Invitation"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr ""
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr ""
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Failo siuntimas sustabdytas"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "File transfer cancelled"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Connection with peer cannot be established."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Usage: /%s, hide the chat buttons."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Usage: /%s, hide the chat buttons."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s not found"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Manęs nėra"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Esu išėjęs"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Usage: /%s, clears the text window."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Įjungti Open_PGP kodavimą"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Sends file to a contact"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Spauskite, kad pamatytumėte buvusius pokalbius su šiuo asmeniu"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Connection not available"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Connection not available"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Nickname not found: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Ask before closing a group chat tab/window."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Pak_viesti į"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Jūs esate išmestas iš grupės pokalbio %s."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Invalid File"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+msgid "Invalid affiliation given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Usage: /%s , display the names of group chat occupants."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Missing argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "creating logs database"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Change status information"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Change status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Jūs palikote šių grupių pokalbius:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Persiųsti neskaitytas žinutes"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Persiųsti neskaitytas žinutes"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Nutolęs, nes nesinaudoja kompiuteriu, daugiau kaip $T min)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nepasiekiamas, nes nesinaudoja kompiuteriu daugiau kaip $T min)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Įeinančio slapyvardžio spalva."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Būklės žinutės teksto spalva."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Rodyti įvykį kontaktų sąraše"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Rodyti įvykį kontaktų sąraše"
+
+#. red
+#: ../src/common/config.py:104
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "File Transfer Request"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "File transfer cancelled"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Groupchat Invitation"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Įeinančio slapyvardžio šriftas."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Išeinančio slapyvardžio spalva."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Būklės žinutės teksto šriftas."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "įprastas"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3724,24 +3884,24 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3751,7 +3911,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3759,7 +3919,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3767,7 +3927,13 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3777,50 +3943,60 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3828,11 +4004,11 @@ msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3841,11 +4017,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3857,13 +4033,13 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3871,7 +4047,7 @@ msgstr ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3879,60 +4055,68 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 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
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -3940,17 +4124,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -3959,13 +4143,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3973,7 +4157,7 @@ msgstr ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3981,11 +4165,11 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -3993,7 +4177,7 @@ msgstr ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4001,9 +4185,10 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4015,29 +4200,33 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4047,7 +4236,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4058,7 +4247,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4066,35 +4255,43 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Paslėps mygtukus pokalbių languose."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4102,25 +4299,25 @@ msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Lygus žinutės slinkimas pokalbio lange"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4128,19 +4325,19 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 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
+#: ../src/common/config.py:288
 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
+#: ../src/common/config.py:289
 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 "
@@ -4150,7 +4347,7 @@ msgstr ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4158,13 +4355,13 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4172,7 +4369,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4180,91 +4377,105 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4272,83 +4483,96 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4356,141 +4580,189 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s wants to send you a file."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anoniminė autentikaciją"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anoniminė autentikacija"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all or space separated status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', or 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4498,27 +4770,182 @@ 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Kam"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "unsubscribe request from %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Kambarys buvo sunaikintas"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Invalid Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "New Single Message"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "New Single Message from %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "New Private Message"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "New Private Message from group chat %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "New Message"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Changed Status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is now %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Contact Changed Status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Signed In"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contact Signed In"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Signed Out"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contact Signed Out"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
@@ -4528,209 +4955,187 @@ msgstr "Unable to load idle module"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registracija sėkminga"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registracija nesėkminga"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Nematomumo funkcijos nėra"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Invalid 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: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 ""
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "I would like to add you to my roster."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Nepavyksta iškoduoti siuntėjo viešojo rakto"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4739,176 +5144,186 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serveris atsakė: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nepavyko prisijungti prie %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Siųsti kontaktus:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Išsiregistruoti nepavyko"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus is not present on this machine or python module is missing"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus is not present on this machine or python module is missing"
@@ -4922,7 +5337,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Service not available: Gajim is not running, or remote_control is False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus is not present on this machine or python module is missing"
 
@@ -5107,267 +5522,293 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr ""
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr ""
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr ""
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Užimtas"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Esu išėjęs"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Prisijungęs"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "All"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "N_ematomas"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Nematomas"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Būklė nežinoma"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Būklė klaidinga"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Kam"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Nuo"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Abu"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d žinutė laukia"
 msgstr[1] "%d žinutės laukia"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr ""
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Unable to load idle module"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kambario nustatymai"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5379,111 +5820,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Error message: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Žinutė pagal nutylėjimą"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Size: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "File: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "green"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "error: cannot open %s for reading"
+msgid "Error: cannot open %s for reading"
+msgstr ""
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -6120,51 +6575,132 @@ msgstr ""
 msgid "Writing"
 msgstr ""
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "įprastas"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+msgid "building"
+msgstr ""
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Šalis:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Prieiga"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Description"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Avahi error"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "vienas"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "room"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6173,44 +6709,43 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr ""
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6222,25 +6757,25 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Žinutė pagal nutylėjimą"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6249,68 +6784,68 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr ""
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6318,143 +6853,144 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Pervadinti Prieigą"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr ""
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6462,11 +6998,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6474,11 +7010,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6486,11 +7022,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6498,7 +7034,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6508,142 +7044,139 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Account name is in use"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "What do you want to do?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Pašalinti prieigą, _tik iš Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 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:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr ""
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr ""
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr ""
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr ""
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr ""
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr ""
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6653,7 +7186,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6661,313 +7194,331 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Konfigūruoti"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "First Message Received"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr ""
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr ""
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Cituoti"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Yesterday"
 msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Unable to load idle module"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nematomumo funkcijos nėra"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr ""
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr ""
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr ""
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber klientas"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6976,100 +7527,151 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Nesaugus ryšys"
+
+#: ../src/dialogs.py:1846
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Do _not ask me again"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+msgid "The nickname contains invalid characters."
 msgstr ""
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "MUC serveris"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "This is not a group chat"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr ""
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr ""
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, 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:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7078,168 +7680,138 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contact Signed In"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "New Message"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "New Private Message"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Groupchat Invitation"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Contact Changed Status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, python-format
 msgid "Form %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Įtraukti"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Keisti"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Trinti"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7247,187 +7819,183 @@ msgid ""
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Keisti"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr ""
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupės"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Įtr_aukti Kontaktą"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Įtr_aukti Kontaktą"
+msgstr[1] "Įtr_aukti Kontaktą"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Removes contact from roster"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Removes contact from roster"
+msgstr[1] "Removes contact from roster"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Invalid File"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr ""
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr ""
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr ""
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr ""
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr ""
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "All files"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condition"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "when I am "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7435,38 +8003,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7476,77 +8044,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "Įveskite naują prieigos %s pavadinimą"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Blogas CA sertifikatas"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7554,425 +8160,413 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr ""
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Vykdyti komandą"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr ""
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr ""
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
-msgstr ""
-
 #: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
-msgstr ""
+#, fuzzy
+msgid "OpenPGP message encryption"
+msgstr "OpenPGP Key Selection"
 
 #: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
+msgstr "Šifruojamos pokalbio žinutės."
+
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
-msgid "Network-manager"
+msgid "Requires gpg.exe in PATH."
 msgstr ""
 
 #: ../src/features_window.py:66
-msgid "Autodetection of network status."
+msgid "Network-manager"
 msgstr ""
 
 #: ../src/features_window.py:67
+msgid "Autodetection of network status."
+msgstr ""
+
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
-msgid "Notification"
+msgid "Requires libgtkspell and libenchant."
 msgstr ""
 
 #: ../src/features_window.py:86
-msgid "Passive popups notifying for new events."
+msgid "Notification"
 msgstr ""
 
 #: ../src/features_window.py:87
+msgid "Passive popups notifying for new events."
+msgstr ""
+
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
-msgid "Automatic status"
-msgstr ""
-
 #: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
+msgid "Automatic status"
 msgstr ""
 
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 msgid "End to End message encryption"
 msgstr ""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Šifruojamos pokalbio žinutės."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST Generatorius"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Prisijungęs"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Savybė"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Time"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "File transfer completed"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "File transfer cancelled"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Connection with peer cannot be established."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Failo siuntimas sustabdytas"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Aprašymas: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "File: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Description: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-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:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7980,33 +8574,64 @@ 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Save File as..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "File: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Description: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s wants to send you a file:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Sending profile..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "File Transfer Error"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8014,68 +8639,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "message"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Šyp_senėlės:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Rodyti tik kontaktų _sąrašą"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Išplėstinis konfigūracijos redaktorius"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Kambario nustatymai"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim needs PySQLite2 to run"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:189
-msgid "Gajim needs GTK 2.16 or above"
-msgstr ""
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
+msgstr "Gajim needs PySQLite2 to run"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8084,12 +8747,11 @@ msgstr ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8097,28 +8759,28 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8126,51 +8788,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "account"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8178,20 +8844,42 @@ 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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "_Prioritetas:"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr ""
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8201,34 +8889,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8238,133 +8921,130 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 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-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8372,44 +9052,92 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Change status"
+
+#: ../src/gajim-remote.py:271
+msgid "Picture to use"
+msgstr ""
+
+#: ../src/gajim-remote.py:272
+#, 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:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr ""
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "room"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Kambario JID"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nick"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr ""
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "password"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8418,165 +9146,63 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Usage: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 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
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr ""
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Theme"
@@ -8599,199 +9225,233 @@ msgid "You cannot delete your current theme"
 msgstr "You cannot delete your current theme"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Pokalbis su "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Pokalbio tęsinys"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s has been banned: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr ""
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr ""
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr ""
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr ""
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr ""
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 
-#: ../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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr ""
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr ""
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "The group chat Jabber ID has invalid characters."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr ""
@@ -8814,63 +9474,57 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#. we talk about file
-#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr ""
-
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr ""
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8878,192 +9532,179 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr ""
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr ""
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 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."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr ""
 "Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Sutikimo užklausimas"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr ""
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
+msgstr "OpenPGP passphrase was not given"
+
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Passphrase Required"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Enter your password for account %s"
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:704
+msgid ""
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:717
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:755
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9073,99 +9714,86 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr ""
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr ""
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Failų siuntimai"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "File transfer of %(filename)s from %(name)s stopped."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Nepavyko iškoduoti žinutės"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9173,15 +9801,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Adding Special Notification for %s"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9192,136 +9825,122 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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: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:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 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:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "OpenPGP Key Selection"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr ""
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/history_manager.py:114
-msgid "Cannot find history logs database"
-msgstr ""
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "creating %s directory"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
+#: ../src/history_manager.py:126
+msgid "Cannot find history logs database"
 msgstr ""
 
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr ""
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr ""
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr ""
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9330,93 +9949,105 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr ""
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../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] ""
+#: ../src/history_manager.py:602
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr ""
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr ""
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Atšaukti sutikimą"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
+#: ../src/htmltextview.py:523
+msgid "Loading"
 msgstr ""
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Messages"
 
@@ -9428,100 +10059,110 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Changed Status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr ""
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Signed In"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Signed Out"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Saved in: %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "New Single Message from %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registracija nesėkminga"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "New Private Message from group chat %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "This file already exists"
+
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
 msgstr ""
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Kambario nustatymai"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
 msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
+#: ../src/plugins/pluginmanager.py:514
+msgid "Archive empty"
 msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr ""
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr ""
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Asmens Informacija"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formatas: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9529,51 +10170,51 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+msgid "OpenPGP is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9581,221 +10222,226 @@ 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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Atšaukti failo siuntimą"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, 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:2800
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr ""
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr ""
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr ""
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr ""
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr ""
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 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:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 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:3392
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, 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:3459
+#: ../src/roster_window.py:3722
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4552
 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:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr ""
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr ""
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Sends file to a contact"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr ""
@@ -9805,129 +10451,129 @@ msgstr ""
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr ""
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr ""
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr ""
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr ""
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr ""
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr ""
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Konfigūruoti Paslaugas..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr ""
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Visiems naudotojams"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr ""
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Redaguoti _Grupes"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Siųsti Vieną Žinutę"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Vykdyti Komandą..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Valdyti Pernašą"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Keisti Pernašą"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Pervadinti"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr ""
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr ""
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -9944,31 +10590,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Subject: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9978,178 +10614,183 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Is OpenPGP enabled for this contact?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "_sąraše"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Resource: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Atsijungta"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr ""
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr ""
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Console for %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Nuotaika:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktyvumas:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Type: %s"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Padėtis:"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr ""
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr ""
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr ""
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr ""
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr ""
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr ""
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr ""
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr ""
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 msgstr ""
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr ""
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10157,7 +10798,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10165,13 +10806,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10179,18 +10820,252 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Choose File to Send..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " atidarytas langas/žymė su šiuo asmeniu "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Veiksmai</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Sąlygos</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Išplėstiniai veiksmai"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Išplėstinis pranešimų valdymas"
+
+#~ msgid "All statuses"
+#~ msgstr "Visos būklės"
+
+#~ msgid "Busy "
+#~ msgstr "Užsiėmęs "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Contact Changed Status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contact Disconnected"
+
+#~ msgid "Don't have "
+#~ msgstr "Neturiu "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "File Transfer Stopped"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Group Chat Message Highlight"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Group Chat Message Received"
+
+#~ msgid "Have "
+#~ msgstr "Turiu "
+
+#~ msgid "Launch a command"
+#~ msgstr "Paleisti komandą"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Viena ar daugiau specialių būklių..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Prisijungęs / Laisvas susirašinėti"
+
+#~ msgid "Play a sound"
+#~ msgstr "Groti garsą"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "New Private Message"
+
+#~ msgid "When "
+#~ msgstr "Kai "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktyvuoti langų tvarkyklės UrgencyHint, kad pokalbio langas mirksėtų "
+#~ "užduočių juostoje"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Padaryti, kad pokalbių langas automatiškai neiššoktu"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Uždrausti esančius iššokstančius (pop-up) langus"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Uždrausti esmą garsą šiam įvykiui"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Uždrausti įvykių rodyma kantaktų sąraše"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Uždrausti įvykių rodyma kantaktų sąraše"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informuok mane su iššokstančiu langu"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Atidaryti pokalbio langą su šiuo naudotoju"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Rodyti įvykį kontaktų sąraše"
+
+#~ msgid "and I "
+#~ msgstr "ir aš "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Asmuo"
+
+#~ msgid "for "
+#~ msgstr "dėl "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupės"
+
+#~ msgid "when I'm in"
+#~ msgstr "kai būsiu"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Leisti jam/jai matyti mano būklę"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Aprašymas: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Išplėstinis..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Rodyti kontaktų _aktyvumą sąraše"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Rodyti kontaktų nuotaikas sąraše"
+
+#~ 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"
+
+#, 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Siųsti Žinutę..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Naudotojo atvaizdas:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Greitųjų žinučių programa"
+
+#~ msgid "English"
+#~ msgstr "English"
+
+#~ msgid "Belarusian"
+#~ msgstr "Belarusian"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarian"
+
+#~ msgid "Spelling language"
+#~ msgstr "Rašybos tikrinimo kalba"
+
+#~ msgid "all or space separated status"
+#~ msgstr "all or space separated status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', or 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' or ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Check your connection or try again later"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "error: cannot open %s for reading"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Unable to bind to port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "A GTK+ jabber client"
+
+#~ msgid "Condition"
+#~ msgstr "Condition"
+
+#~ msgid "when I am "
+#~ msgstr "when I am "
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Subject: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Nuotaika:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktyvumas:"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Uždrausti įvykių rodyma sistemos dėkle"
 
@@ -10207,28 +11082,12 @@ msgstr " resource with priority "
 #~ 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"
 
@@ -10313,9 +11172,6 @@ msgstr " resource with priority "
 #~ "Asmens eilutė\n"
 #~ "Pokalbio paveiksliukas"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Prieigų valdymas"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10382,9 +11238,6 @@ msgstr " resource with priority "
 #~ msgid "_Outgoing message:"
 #~ msgstr "_Išeinanti žinutė:"
 
-#~ msgid "OpenPGP passphrase was not given"
-#~ msgstr "OpenPGP passphrase was not given"
-
 #~ msgid ""
 #~ "To continue sending and receiving messages, you will need to reconnect."
 #~ msgstr ""
@@ -10397,9 +11250,6 @@ msgstr " resource with priority "
 #~ "You are not connected or not visible to others. Your message could not be "
 #~ "sent."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[This message is encrypted]"
-
 #~ msgid "%i days ago"
 #~ msgstr "%i days ago"
 
@@ -10412,12 +11262,6 @@ msgstr " resource with priority "
 #~ msgid "Commands: %s"
 #~ msgstr "Commands: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Usage: /%s, clears the text window."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Usage: /%s, hide the chat buttons."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10426,10 +11270,6 @@ msgstr " resource with priority "
 #~ "Usage: /%s <action>, sends action to the current group chat. Use third "
 #~ "person. (e.g. /%s explodes.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Usage: /%s, hide the chat buttons."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "No help info for /%s"
 
@@ -10446,10 +11286,6 @@ msgstr " resource with priority "
 #~ msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Nickname not found: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10461,13 +11297,6 @@ msgstr " resource with priority "
 #~ "Does NOT support spaces in nickname."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10504,12 +11333,6 @@ msgstr " resource with priority "
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
 #~ "message to the occupant specified by nickname."
 
-#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-#~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
-
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Usage: /%s , display the names of group chat occupants."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -10541,10 +11364,6 @@ msgstr " resource with priority "
 #~ msgid "_Host:"
 #~ msgstr "_Hostas:"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Rodyk _Kontaktų Sąrašą"
-
 #~ msgid "Modify Account"
 #~ msgstr "Keisti Prieigą"
 
@@ -10602,9 +11421,6 @@ msgstr " resource with priority "
 #~ msgid "Encryption disabled"
 #~ msgstr "Encryption disabled"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Spauskite, kad pamatytumėte buvusius pokalbius su šiuo asmeniu"
-
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Spauskite, kad pamatytumėte buvusius pokalbius šiame kambaryje"
 
@@ -10622,9 +11438,6 @@ msgstr " resource with priority "
 #~ msgid "Query Builder..."
 #~ msgstr "Užklasų kūrimas..."
 
-#~ msgid "Accept"
-#~ msgstr "Priimti"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Gautas pakvietimas"
 
@@ -10674,9 +11487,6 @@ msgstr " resource with priority "
 #~ msgid "The auto away status message"
 #~ msgstr "Automatinio nuėjimo būklės pranešimas"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "Automatinio nebuvimo būklės žinutė"
-
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Laikyti visas įeinančias žinutes kaip:"
 
@@ -10704,9 +11514,6 @@ msgstr " resource with priority "
 #~ msgid "Company:"
 #~ msgstr "Kompanija:"
 
-#~ msgid "Country:"
-#~ msgstr "Šalis:"
-
 #~ msgid "Given:"
 #~ msgstr "Vardas:"
 
diff --git a/po/nb.po b/po/nb.po
index 165439aa1..d9fe46754 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-30 19:46+0100\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -173,13 +173,13 @@ msgstr "_Avslutt"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
-#: ../src/config.py:1259 ../src/config.py:1273 ../src/config.py:1278
-#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1744
-#: ../src/config.py:1749 ../src/config.py:2325 ../src/config.py:2404
-#: ../src/config.py:2417 ../src/config.py:3690 ../src/config.py:3765
-#: ../src/dialogs.py:313 ../src/dialogs.py:315 ../src/dialogs.py:521
-#: ../src/dialogs.py:534 ../src/roster_window.py:3214
-#: ../src/roster_window.py:3220 ../src/roster_window.py:3225
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
 msgid "None"
 msgstr "Ingen"
 
@@ -188,19 +188,19 @@ msgid "Accounts"
 msgstr "Kontoer"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3426
-#: ../src/dialogs.py:3472
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 msgid "Add"
 msgstr "Legg til"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3430
-#: ../src/dialogs.py:3527
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
 msgid "Delete"
 msgstr "Slett"
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5844
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
@@ -355,10 +355,10 @@ msgstr ""
 #. 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:37 ../data/gui/preferences_window.ui.h:46
-#: ../src/common/contacts.py:135 ../src/dialogs.py:113 ../src/dialogs.py:125
-#: ../src/roster_window.py:3156 ../src/roster_window.py:4284
-#: ../src/roster_window.py:5894
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
 msgid "General"
 msgstr "Generelle"
 
@@ -366,7 +366,7 @@ msgstr "Generelle"
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_bruk HTTP_PROXY system variabel"
 
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
 msgid "_Manage..."
 msgstr "_Behandle..."
 
@@ -410,7 +410,7 @@ msgstr "_Maskinnavn:"
 msgid "_Port: "
 msgstr "_Port:"
 
-#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
@@ -419,7 +419,7 @@ msgid "Connection"
 msgstr "Tilkobling"
 
 #: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
-#: ../src/config.py:2418
+#: ../src/config.py:2436
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
@@ -494,7 +494,7 @@ msgstr "E-Post:"
 
 #: ../data/gui/accounts_window.ui.h:67
 #: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:841
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -582,7 +582,8 @@ msgid "Check once more"
 msgstr "Sjekk en gang til"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Please wait while the command is sending..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
 msgstr "Vennligst vent, sender kommandoer..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
@@ -747,8 +748,8 @@ msgstr "Blokkerte Kontakter"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5863
-#: ../src/roster_window.py:5990 ../src/roster_window.py:6123
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Frigi"
 
@@ -835,57 +836,88 @@ msgstr "Bli med i _Gruppe Samtale"
 msgid "_Add to Roster..."
 msgstr "_Legg til Kontaktliste..."
 
-#: ../data/gui/chat_control.ui.h:1
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Vis en liste over uttrykksikon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:2
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
+
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Søk gjennom samtale historikken (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
 msgid "#"
 msgstr "#"
 
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Send melding"
+
 #. 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:3 ../data/gui/groupchat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:10 ../data/gui/groupchat_control.ui.h:10
 #: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
 msgid "_Send"
 msgstr "_Send"
 
-#: ../data/gui/chat_control.ui.h:4
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:13
+#: ../data/gui/chat_control.ui.h:20
 msgid "*"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:14 ../data/gui/single_message_window.ui.h:3
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
 msgid "0"
 msgstr "0"
 
@@ -928,8 +960,8 @@ msgstr "Send _Fil..."
 #. Invite to
 #. Invite to Groupchat
 #: ../data/gui/contact_context_menu.ui.h:4
-#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5799
-#: ../src/roster_window.py:5958
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -945,8 +977,8 @@ msgstr "Endre Open_PGP Kryptering"
 msgid "Toggle End to End Encryption"
 msgstr "Endre Ende til Ende Kryptering"
 
-#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5809
-#: ../src/roster_window.py:6047
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
@@ -984,20 +1016,23 @@ msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Tillat han/henne å se min status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Ti_llat denne kontakten å se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-msgid "A_sk to see his/her status"
+#, fuzzy
+msgid "A_sk to see contact status"
 msgstr "F_orespør å se hans/hennes status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "_Forby han/henne å se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:21
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5871
-#: ../src/roster_window.py:5996 ../src/roster_window.py:6126
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
 msgid "_Block"
 msgstr "_Blokker"
 
@@ -1016,7 +1051,7 @@ msgstr "_Fjern"
 #: ../data/gui/contact_context_menu.ui.h:26
 #: ../data/gui/gc_control_popup_menu.ui.h:9
 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
-#: ../src/roster_window.py:6197
+#: ../src/roster_window.py:6145
 msgid "_History"
 msgstr "_Historie"
 
@@ -1097,7 +1132,8 @@ msgid "_Pause"
 msgstr "_Pause"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "Cancels the selected file transfer and removes incomplete file"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Avbryter valgte filoverføring og fjerner den uferdige filen"
 
 #: ../data/gui/filetransfers.ui.h:13
@@ -1116,7 +1152,7 @@ msgstr "Lukker vinduet"
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3274
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
 #: ../src/filetransfers_window.py:213
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
@@ -1160,11 +1196,11 @@ msgstr "Tekst _font:"
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1050
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
 msgid "Bold"
 msgstr "Fet"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1051
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1233,7 +1269,7 @@ msgstr "_Minimer ved lukking"
 msgid "_Request Voice"
 msgstr "_Stemme"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1799
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
 msgid "_Bookmark"
 msgstr "_Bokmerke"
 
@@ -1281,11 +1317,7 @@ msgstr "_Utvis"
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Vis en liste over uttrykksikon (Alt+M)"
-
-#: ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 msgid "Show a list of formattings"
 msgstr "Vis en liste over formatteringer"
 
@@ -1301,15 +1333,6 @@ msgstr "Endre rommets emne (Alt+T)"
 msgid "Bookmark this room (Ctrl+B)"
 msgstr "_Bokmerke dette rommet (Ctrl+B)"
 
-#: ../data/gui/groupchat_control.ui.h:6
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Søk gjennom samtale historikken (Ctrl+H)"
-
-#: ../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/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Lag en ny post"
@@ -1379,7 +1402,7 @@ msgstr "Gruppesamtaler"
 msgid "All Chat Histories"
 msgstr "Gamle historier"
 
-#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:324
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
@@ -1392,7 +1415,7 @@ msgid "_In date search"
 msgstr ""
 
 #: ../data/gui/history_window.ui.h:7
-msgid "searching only in the selected day "
+msgid "Searching only in the selected day "
 msgstr ""
 
 #: ../data/gui/history_window.ui.h:8
@@ -1400,6 +1423,11 @@ msgstr ""
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Logg status endringer til kontakter"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
 msgid "expire"
 msgstr ""
@@ -1414,7 +1442,7 @@ msgid "otr"
 msgstr "Varm"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
@@ -1427,9 +1455,6 @@ msgid "false"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../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"
 
@@ -1461,7 +1486,7 @@ msgstr ""
 msgid "require"
 msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2372
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1500,8 +1525,8 @@ msgstr "Server:"
 msgid "Bro_wse Rooms"
 msgstr "_Utforsk"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3309
-#: ../src/disco.py:1360 ../src/disco.py:1803
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1609,6 +1634,11 @@ msgstr "Proxy _Port:"
 msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Behandle Kontoer"
+
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passord setning"
@@ -1702,8 +1732,8 @@ msgstr "Alle statuser"
 msgid "Composing only"
 msgstr "Skriver"
 
-#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:173
-#: ../src/config.py:691
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
 msgid "Disabled"
 msgstr "Deaktivert"
 
@@ -1794,7 +1824,8 @@ msgstr ""
 "i kontaktliste vinduet og i gruppesamtaler"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Display m_ood of contacts in roster"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
 #: ../data/gui/preferences_window.ui.h:24
@@ -1803,58 +1834,26 @@ msgid ""
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "Display _activity of contacts in roster"
-msgstr "Vis _aktivitet til kontakter i kontaktlisten"
-
-#: ../data/gui/preferences_window.ui.h:26
-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:27
-msgid "Display _tunes of contacts in roster"
-msgstr "Vis _sanger til kontakter i kontaktlisten"
-
-#: ../data/gui/preferences_window.ui.h:28
-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:29
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Vis h_umør til kontakter i kontaktlisten"
-
-#: ../data/gui/preferences_window.ui.h:30
-#, 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:31
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/gui/preferences_window.ui.h:32
+#: ../data/gui/preferences_window.ui.h:26
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/gui/preferences_window.ui.h:33
+#: ../data/gui/preferences_window.ui.h:27
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:28
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>"
 
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:29
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:30
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1862,23 +1861,23 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:31
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:32
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:34
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:35
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1886,11 +1885,11 @@ 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:42
+#: ../data/gui/preferences_window.ui.h:36
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:37
 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 "
@@ -1900,28 +1899,33 @@ 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:44
+#: ../data/gui/preferences_window.ui.h:38
 #, fuzzy
 msgid "_Show roster on startup:"
 msgstr "Vis _kontaktliste"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:39
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Lyd som spilles når en ny samtalerom melding mottas."
+
+#: ../data/gui/preferences_window.ui.h:40
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Samtale Utseende</b>"
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:42
 msgid "When new event is received:"
 msgstr "Når en ny hendelse blir motatt:"
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:45
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1929,67 +1933,68 @@ 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:51
+#: ../data/gui/preferences_window.ui.h:46
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:48
 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:54
+#: ../data/gui/preferences_window.ui.h:49
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:50
+#, fuzzy
 msgid ""
-"If checked, Gajim will also include information about the sender of the new "
+"If checked, Gajim will also include information about the sender of new "
 "emails"
 msgstr ""
 "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:51
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail Valg</b>"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Show notification area icon:"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:53
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/gui/preferences_window.ui.h:61
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Allow sound when I'm _busy"
 msgstr "Tillat lyd når jeg er _opptatt"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:57
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyder</b>"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../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 "
@@ -1999,11 +2004,11 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:60
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2013,33 +2018,33 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:62
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:63
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Samtale status alarmer</b>"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:64
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:65
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:66
 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:72
+#: ../data/gui/preferences_window.ui.h:67
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -2047,11 +2052,11 @@ 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:74
+#: ../data/gui/preferences_window.ui.h:69
 msgid "minutes"
 msgstr "minutter"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2063,7 +2068,7 @@ msgstr ""
 "$S byttes ut av tidligere status melding\n"
 "$T byttest ut av automatisk-borte tidsavbrudd"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:73
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2075,23 +2080,23 @@ 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:81
+#: ../data/gui/preferences_window.ui.h:76
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatisk Status</b>"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:79
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:80
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2099,187 +2104,193 @@ 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:86
+#: ../data/gui/preferences_window.ui.h:81
 msgid "<b>Status Messages</b>"
 msgstr "<b>Status Meldinger</b>"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:82
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../data/gui/preferences_window.ui.h:88 ../src/config.py:403
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Chat message:"
 msgstr "Samtale melding:"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:86
 msgid "<b>Font</b>"
 msgstr "<b>Font</b>"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:88
+#, fuzzy
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
 "etc...)"
 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:94
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/gui/preferences_window.ui.h:95
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:91
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:92
 msgid "<b>Themes</b>"
 msgstr "<b>Temaer</b>"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontakt navn"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Your nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:95
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:96
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:97
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Samtale melding:"
 
-#: ../data/gui/preferences_window.ui.h:104
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Your message:"
 msgstr "Feil melding: %s"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Gruppe Samtale Melding Utheving"
+
+#: ../data/gui/preferences_window.ui.h:101
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Samtale Linje Farger</b>"
 
-#: ../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 "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:109
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "<b>Audio</b>"
 msgstr "<b>Handlinger</b>"
 
-#: ../data/gui/preferences_window.ui.h:110
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:112
+#: ../data/gui/preferences_window.ui.h:108
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:113
+#: ../data/gui/preferences_window.ui.h:109
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "View own video source"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
 msgid "<b>Video</b>"
 msgstr "<b>Mellomnavn:</b>"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:112
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:113
 msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:114
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:116
 #, fuzzy
 msgid "<b>Connection</b>"
 msgstr "<b>Betingelser</b>"
 
-#: ../data/gui/preferences_window.ui.h:121 ../src/features_window.py:102
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:118
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:119
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:122
 msgid "<b>Custom</b>"
 msgstr "<b>Egendefinert</b>"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:123
 msgid "<b>Applications</b>"
 msgstr "<b>Applikasjoner</b>"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:124
 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:129
+#: ../data/gui/preferences_window.ui.h:125
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2289,12 +2300,12 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:126
 #, fuzzy
 msgid "Allow client / _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:127
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -2302,23 +2313,23 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "Allow local system time information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:129
 #, fuzzy
 msgid "If checked, Gajim will allow others to detect the time on your system"
 msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:130
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:131
 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 "
@@ -2328,36 +2339,36 @@ 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:136
+#: ../data/gui/preferences_window.ui.h:132
 #, fuzzy
 msgid "Allow my _idle time to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:133
 msgid "Global proxy:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:135
 msgid "<b>Privacy</b>"
 msgstr "<i>Privatliv</i>"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:137
 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:143
+#: ../data/gui/preferences_window.ui.h:139
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/gui/preferences_window.ui.h:144
+#: ../data/gui/preferences_window.ui.h:140
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editering av Avanserte Instillinger</b>"
 
-#: ../data/gui/preferences_window.ui.h:145
+#: ../data/gui/preferences_window.ui.h:141
 msgid "Advanced"
 msgstr "Avansert"
 
@@ -2365,7 +2376,7 @@ msgstr "Avansert"
 msgid "Privacy Lists:"
 msgstr "Liste over Uønskede:"
 
-#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4023
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -2620,8 +2631,8 @@ msgstr "<b>Hva ønsker du å gjøre?</b>"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5881
-#: ../src/roster_window.py:6006 ../src/roster_window.py:6136
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Fjern"
 
@@ -2656,7 +2667,7 @@ msgstr "_Handlinger"
 msgid "Add _Contact..."
 msgstr "Legg til _Kontakt..."
 
-#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1519
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -2738,11 +2749,11 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6148
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1372
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2770,10 +2781,6 @@ msgstr "Til:"
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message"
-msgstr "Send melding"
-
 #: ../data/gui/single_message_window.ui.h:7
 msgid "_Reply"
 msgstr "_Svar"
@@ -2990,6 +2997,10 @@ msgstr "Jabber IM Klient"
 msgid "A GTK+ Jabber client"
 msgstr "En GTK+ Jabber klient"
 
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
 #: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
@@ -3048,7 +3059,7 @@ msgstr "Nummer"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1070
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Farge"
 
@@ -3060,16 +3071,16 @@ msgstr "Foretrukket Navn"
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced_configuration_window.py:122
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:177
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:303
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Gjemt"
 
@@ -3080,279 +3091,184 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 msgstr[1] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:87
-msgid "English"
-msgstr "Engelsk"
-
-#: ../src/chat_control.py:87
-msgid "Belarusian"
-msgstr "Bulgarsk"
-
-#: ../src/chat_control.py:87
-msgid "Bulgarian"
-msgstr "Bulgarsk"
-
-#: ../src/chat_control.py:88
-msgid "Breton"
-msgstr "Bretagner"
-
-#: ../src/chat_control.py:88
-msgid "Czech"
-msgstr "Tsjekkisk"
-
-#: ../src/chat_control.py:88
-msgid "German"
-msgstr "Tysk"
-
-#: ../src/chat_control.py:89
-msgid "Greek"
-msgstr "Gresk"
-
-#: ../src/chat_control.py:89
-msgid "British"
-msgstr "Brtisk"
-
-#: ../src/chat_control.py:89
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:90
-msgid "Spanish"
-msgstr "Spansk"
-
-#: ../src/chat_control.py:90
-msgid "Basque"
-msgstr "Baskisk"
-
-#: ../src/chat_control.py:90
-msgid "French"
-msgstr "Fransk"
-
-#: ../src/chat_control.py:91
-msgid "Croatian"
-msgstr "Kroatisk"
-
-#: ../src/chat_control.py:91
-msgid "Italian"
-msgstr "Italiensk"
-
-#: ../src/chat_control.py:91
-msgid "Norwegian (b)"
-msgstr "Norsk (b)"
-
-#: ../src/chat_control.py:92
-msgid "Dutch"
-msgstr "Nederlansk"
-
-#: ../src/chat_control.py:92
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: ../src/chat_control.py:92
-msgid "Polish"
-msgstr "Polsk"
-
-#: ../src/chat_control.py:93
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: ../src/chat_control.py:93
-msgid "Brazilian Portuguese"
-msgstr "Brasiliansk Portugisisk"
-
-#: ../src/chat_control.py:94
-msgid "Russian"
-msgstr "Russisk"
-
-#: ../src/chat_control.py:94
-msgid "Serbian"
-msgstr "Serbisk"
-
-#: ../src/chat_control.py:94
-msgid "Slovak"
-msgstr "Slovakisk"
-
-#: ../src/chat_control.py:95
-msgid "Swedish"
-msgstr "Svensk"
-
-#: ../src/chat_control.py:95
-msgid "Chinese (Ch)"
-msgstr "Kinesisk (Ch)"
-
-#: ../src/chat_control.py:95
-msgid "Hebrew"
-msgstr ""
-
-#: ../src/chat_control.py:238
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/chat_control.py:243
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:248
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/chat_control.py:583
-msgid "Spelling language"
-msgstr "Stavekontroll språk"
-
 #. we are not connected
-#: ../src/chat_control.py:615 ../src/chat_control.py:831
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:616 ../src/chat_control.py:832
+#: ../src/chat_control.py:801
 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:1052
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Understrek"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Streik"
 
-#: ../src/chat_control.py:1076
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:1085
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:1162
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:1163
+#: ../src/chat_control.py:1158
 #, 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:1646 ../src/chat_control.py:2208
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG kryptering påslått"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Denne kontakten støtter ikke filoverføring."
+
 #. Add to roster
-#: ../src/chat_control.py:1700 ../src/common/contacts.py:152
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67
-#: ../src/common/helpers.py:261 ../src/dialogs.py:1101 ../src/dialogs.py:2266
-#: ../src/dialogs.py:2295 ../src/gui_interface.py:484
-#: ../src/gui_menu_builder.py:263 ../src/gui_menu_builder.py:417
-#: ../src/roster_window.py:767 ../src/roster_window.py:1722
-#: ../src/roster_window.py:1724 ../src/roster_window.py:2072
-#: ../src/roster_window.py:3689 ../src/roster_window.py:3716
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Ikke i kontaktliste"
 
 #. change tooltip text for audio and video buttons if python-farstream is
 #. not installed
-#: ../src/chat_control.py:1725
-#: ../src/command_system/implementation/standard.py:214
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
 msgid "Toggle audio session"
 msgstr ""
 
-#: ../src/chat_control.py:1726
-#: ../src/command_system/implementation/standard.py:224
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
 msgid "Toggle video session"
 msgstr ""
 
-#: ../src/chat_control.py:1728
+#: ../src/chat_control.py:1763
 #, fuzzy
 msgid "Feature not available, see Help->Features"
 msgstr "Funksjon ikke tilgjengelig i Windows."
 
-#: ../src/chat_control.py:1732
+#: ../src/chat_control.py:1767
 msgid "Feature not supported by remote client"
 msgstr ""
 
-#: ../src/chat_control.py:1749
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Send Fil"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1788
 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:1870
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:2098
 #, 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:2188 ../src/dialogs.py:5092
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:2189
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:2198
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:2224
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:2243
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:2243
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2245
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:2245
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2249
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2253
+#: ../src/chat_control.py:2294
 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:2260
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3361,32 +3277,32 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:2398
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2400
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesjonen VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2409
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:2412
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:2414
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2419
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3394,25 +3310,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2421
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:2469 ../src/chat_control.py:2483
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:2475
+#: ../src/chat_control.py:2526
 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:2746
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2747
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3420,14 +3336,14 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2914 ../src/common/connection_handlers_events.py:912
-#: ../src/common/connection_handlers.py:953
-#: ../src/common/connection_handlers.py:1075 ../src/common/connection.py:462
-#: ../src/common/logger.py:1155 ../src/gajim.py:214 ../src/session.py:98
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2915
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3436,7 +3352,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:3152 ../src/gui_interface.py:1151
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3445,55 +3361,55 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/chat_control.py:3185
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
 
-#: ../src/chat_control.py:3244
+#: ../src/chat_control.py:3321
 #, fuzzy
 msgid "File transfer"
 msgstr "Fil Overføringer"
 
-#: ../src/chat_control.py:3247
+#: ../src/chat_control.py:3324
 #, fuzzy
 msgid "Size"
 msgstr "Størrelse: "
 
-#: ../src/chat_control.py:3249
+#: ../src/chat_control.py:3326
 #, fuzzy
 msgid "_Accept"
 msgstr "Godkjenn"
 
-#: ../src/chat_control.py:3270 ../src/filetransfers_window.py:211
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/chat_control.py:3306 ../src/dialogs.py:2828
-#: ../src/gui_interface.py:645 ../src/notify.py:278
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/chat_control.py:3328 ../src/gui_interface.py:1009
-#: ../src/roster_window.py:1981
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføring"
 
-#: ../src/chat_control.py:3330 ../src/gui_interface.py:1012
-#: ../src/roster_window.py:1983
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: ../src/chat_control.py:3332 ../src/filetransfers_window.py:247
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
 msgid "File transfer stopped"
 msgstr "Fil overføring stoppet"
 
-#: ../src/chat_control.py:3335 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:233
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/chat_control.py:3336 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:234
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
@@ -3546,7 +3462,8 @@ msgstr "%s ikke funnet"
 msgid "Limit must be an integer"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:129
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -3556,102 +3473,102 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:147
+#: ../src/command_system/implementation/standard.py:148
 msgid "Set the current status to away"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:150
-#: ../src/common/commands.py:109 ../src/common/helpers.py:249
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
 #: ../src/tooltips.py:189
 msgid "Away"
 msgstr "Borte"
 
-#: ../src/command_system/implementation/standard.py:161
+#: ../src/command_system/implementation/standard.py:162
 msgid "Set the current status to online"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:164
+#: ../src/command_system/implementation/standard.py:165
 #, fuzzy
 msgid "Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/command_system/implementation/standard.py:184
-#: ../src/command_system/implementation/standard.py:266
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/command_system/implementation/standard.py:189
+#: ../src/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "Toggle the GPG encryption"
+msgid "Toggle the OpenPGP encryption"
 msgstr "Endre Open_PGP Kryptering"
 
-#: ../src/command_system/implementation/standard.py:194
+#: ../src/command_system/implementation/standard.py:195
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Bruk: /%s, sender en ping til kontakten"
 
-#: ../src/command_system/implementation/standard.py:197
+#: ../src/command_system/implementation/standard.py:198
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Kommando ikke støttet for zeroconf konto."
 
-#: ../src/command_system/implementation/standard.py:201
+#: ../src/command_system/implementation/standard.py:202
 msgid "Send DTMF sequence through an open audio session"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:204
+#: ../src/command_system/implementation/standard.py:205
 #, fuzzy
 msgid "No open audio sessions with the contact"
 msgstr "Klikk for å se tidligere samtaler med denne kontakten"
 
-#: ../src/command_system/implementation/standard.py:207
+#: ../src/command_system/implementation/standard.py:208
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s er ikke et gyldig loggnivå"
 
-#: ../src/command_system/implementation/standard.py:217
+#: ../src/command_system/implementation/standard.py:218
 #, fuzzy
 msgid "Audio sessions are not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/command_system/implementation/standard.py:227
+#: ../src/command_system/implementation/standard.py:228
 #, fuzzy
 msgid "Video sessions are not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/command_system/implementation/standard.py:234
+#: ../src/command_system/implementation/standard.py:235
 msgid "Send a message to the contact that will attract his (her) attention"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:273
+#: ../src/command_system/implementation/standard.py:274
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Endre ditt _Kallenavn (Ctrl+N)"
 
 #. invalid char
-#: ../src/command_system/implementation/standard.py:278 ../src/config.py:3379
-#: ../src/dialogs.py:2113
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/command_system/implementation/standard.py:283
+#: ../src/command_system/implementation/standard.py:284
 #, fuzzy
 msgid "Open a private chat window with a specified occupant"
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
 "spesifiserte brukeren."
 
-#: ../src/command_system/implementation/standard.py:289
-#: ../src/command_system/implementation/standard.py:298
-#: ../src/command_system/implementation/standard.py:352
-#: ../src/command_system/implementation/standard.py:363
-#: ../src/command_system/implementation/standard.py:374
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/command_system/implementation/standard.py:292
+#: ../src/command_system/implementation/standard.py:293
 #, fuzzy
 msgid ""
 "Open a private chat window with a specified occupant and send him a message"
@@ -3659,30 +3576,30 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
 "spesifiserte brukeren."
 
-#: ../src/command_system/implementation/standard.py:301
+#: ../src/command_system/implementation/standard.py:302
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/command_system/implementation/standard.py:309
+#: ../src/command_system/implementation/standard.py:310
 msgid "Invite a user to a room for a reason"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:312
+#: ../src/command_system/implementation/standard.py:313
 #, fuzzy, python-format
 msgid "Invited %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/command_system/implementation/standard.py:315
+#: ../src/command_system/implementation/standard.py:316
 msgid "Join a group chat given by a jid, optionally using given nickname"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:332
+#: ../src/command_system/implementation/standard.py:333
 msgid ""
 "Leave the groupchat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:337
+#: ../src/command_system/implementation/standard.py:338
 msgid ""
 "\n"
 "    Ban user by a nick or a jid from a groupchat\n"
@@ -3691,48 +3608,60 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:349
+#: ../src/command_system/implementation/standard.py:350
 #, fuzzy
 msgid "Kick user by a nick from a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/command_system/implementation/standard.py:356
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
 msgid ""
 "Set occupant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:361
+#: ../src/command_system/implementation/standard.py:363
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Ugyldig server"
 
-#: ../src/command_system/implementation/standard.py:367
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
 msgid ""
 "Set occupant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:372
+#: ../src/command_system/implementation/standard.py:375
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "tilhørighet endret"
 
-#: ../src/command_system/implementation/standard.py:380
+#: ../src/command_system/implementation/standard.py:383
 #, fuzzy
 msgid "Display names of all group chat occupants"
 msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
 
-#: ../src/command_system/implementation/standard.py:402
+#: ../src/command_system/implementation/standard.py:405
 msgid "Forbid an occupant to send you public or private messages"
 msgstr ""
 
-#: ../src/command_system/implementation/standard.py:407
+#: ../src/command_system/implementation/standard.py:410
 msgid "Allow an occupant to send you public or private messages"
 msgstr ""
 
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Mangler argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
 #: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "lager logg database"
@@ -3768,84 +3697,84 @@ msgstr "%s er en katalog men skulle vært en fil"
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/commands.py:85
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Endre statusinformasjon"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Endre status"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Sett fraværstype og beskrivelse"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Ledig for samtale"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-#: ../src/common/commands.py:111
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: ../src/common/commands.py:112
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Frakoblet - ikke kontakt"
 
-#: ../src/common/commands.py:117
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:152 ../src/common/commands.py:324
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Statusen har blitt endret."
 
-#: ../src/common/commands.py:184 ../src/common/commands.py:210
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Gå ut av Gruppesamtale"
 
-#: ../src/common/commands.py:200
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s fra %(room_jid)s"
 
-#: ../src/common/commands.py:204
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Du har ikke blitt med i en gruppesamtale."
 
-#: ../src/common/commands.py:211
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:215 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:67 ../src/roster_window.py:820
-#: ../src/roster_window.py:1726 ../src/roster_window.py:1728
-#: ../src/roster_window.py:2611 ../src/roster_window.py:5766
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: ../src/common/commands.py:256
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Du gikk ut av følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:268
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Videresend uleste meldinger"
 
-#: ../src/common/commands.py:294
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
-#: ../src/common/commands.py:302
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Videresend uleste meldinger"
@@ -3871,7 +3800,8 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Borte på grunn av inaktivitet i mer enn $T min)"
 
 #: ../src/common/config.py:83
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S vil bli byttet ut med gjeldende status melding, $T av automatisk borte "
 "tid. "
@@ -3885,7 +3815,8 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Ikke tilgjengelig på grunn av inaktivitet i mer enn $T min)"
 
 #: ../src/common/config.py:86
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 
 #: ../src/common/config.py:89
@@ -3998,9 +3929,9 @@ msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:117 ../src/common/config.py:531
+#: ../src/common/config.py:117 ../src/common/config.py:533
 #: ../src/common/optparser.py:295 ../src/common/optparser.py:491
-#: ../src/common/optparser.py:525 ../src/gui_interface.py:2761
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "standard"
 
@@ -4068,11 +3999,11 @@ msgstr ""
 
 #: ../src/common/config.py:160
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
+"If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -4083,37 +4014,38 @@ msgstr ""
 "strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Legg til * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:182
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
@@ -4121,16 +4053,16 @@ msgid ""
 msgstr ""
 "Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:183
 #, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Hvor mange minutter med logg skal man be om når man går inn i en "
 "gruppesamtale. "
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -4139,12 +4071,12 @@ msgstr ""
 "tilkobling til en samtale som du har blitt frakoblet. Sett til 0 for "
 "deaktiver automatisk re-tilkobling"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:185
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4152,11 +4084,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4165,11 +4097,11 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:195
 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 "
@@ -4181,12 +4113,12 @@ msgstr ""
 "at de synkroniserer med global status) basert på statusen til nettverks "
 "tilkoblingen."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4194,7 +4126,7 @@ msgstr ""
 "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
 "avslått."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4202,35 +4134,38 @@ msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Spør før lukking av fanet samtalevindu dersom det er kontrol som kan miste "
 "data (samtale, privat samtale, gruppesamtaler vil ikke bli minimert)"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4239,34 +4174,34 @@ msgstr ""
 "grensesnitt, for Fil Overføring i tilfelle adresse oversetting/port "
 "videresending."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:211
 msgid ""
 "If False, Gajim will display a static event icon instead of the blinking "
 "status icon in the notification area when notifying on event."
 msgstr ""
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis notatblokk faner i samtalevinduer?"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:220
 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 "
@@ -4277,16 +4212,16 @@ msgstr ""
 "separert med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. Høyere "
 "nummer er mer sikre men tar lenger å kalkulere når du starter en sesjon. "
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvik nye meldinger i popup vindu?"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4295,14 +4230,14 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
 "oppstart."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4310,7 +4245,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4318,12 +4253,12 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definer posisjo for avatar i kontaktlisten. Kan være venste eller høyre"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 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."
@@ -4331,7 +4266,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 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."
@@ -4339,9 +4274,10 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4352,33 +4288,33 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid "Log XHTML messages instead of plain text messages."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget ut."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 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 "
@@ -4388,7 +4324,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 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 "
@@ -4399,7 +4335,8 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:272
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4407,7 +4344,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
@@ -4420,7 +4357,7 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -4428,31 +4365,31 @@ msgid ""
 "'last_state' - Restore the last state roster."
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen."
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:277
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:281
 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."
@@ -4460,15 +4397,15 @@ msgstr ""
 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
 "samme person som snakker som i den forrige meldingen."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4476,11 +4413,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4488,7 +4425,7 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4496,7 +4433,7 @@ msgstr ""
 "Skal vi vise bekrefte blokk kontakt dialog eller ikke? Tomt tekststreng "
 "betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4504,7 +4441,7 @@ msgstr ""
 "Skal vi vise bekrefte egendefinert status dialog eller ikke? Tomt "
 "tekststreng betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:288
+#: ../src/common/config.py:289
 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 "
@@ -4514,7 +4451,7 @@ msgstr ""
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din server."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4522,7 +4459,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4530,7 +4467,7 @@ msgstr ""
 "Dersom True vil Gajim bruke KDE Wallet (dersom kwalletcli er tilgjengelig) "
 "til å lagre konto passord."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4538,7 +4475,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4546,7 +4483,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4554,18 +4491,18 @@ msgstr ""
 "Dersom True vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4574,11 +4511,11 @@ msgstr ""
 "Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4586,22 +4523,23 @@ msgstr ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
 "\"ekte\" uri. (mailto og xmpp håndteres separat)"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Spør om frakoblet status melding til alle frakoblede kontakter når en "
 "tilkobling til en konto etableres. ADVARSEL: Dette forårsaker mange "
 "forespørsler!"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Dersom True, vil komplettering i samtalerom gjøres slik som shell basert "
 "komplettering."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4609,51 +4547,60 @@ msgstr ""
 "Når skal selv kontakt raden vises. Kan være \"always\",\"when_other_resource"
 "\" eller \"never\""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:309
 msgid "If True, You will also see your webcam"
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:315
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
 msgstr ""
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:316
 msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
 msgstr ""
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:317
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
+"beskjed vil benyttes isteden."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4661,7 +4608,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:340
 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"
@@ -4670,39 +4617,39 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Dersom True, vil kontakter som ber om godkjenning bli automatisk akseptert."
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Dersom False vil bildeikoner bli slått av og ikke vises i kontaktliste "
 "vinduet."
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Dersom deaktivert, ikke signer tilstedeværelser med GPG nøkkel, selv om GPG "
 "er konfigurert."
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4710,7 +4657,7 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:352
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -4718,55 +4665,56 @@ msgid ""
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarsels dialog før bruk av standard SSL bibliotek."
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:362
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:363
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: ../src/common/config.py:364
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Mellomrom sendt etter inaktivitet"
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt etter inaktivitet"
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Hvor mange sekunder skal man vente på svar fra ping alive pakker før vi "
 "prøver å koble til på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:373
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:376
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4774,21 +4722,21 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:377
+#: ../src/common/config.py:379
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: ../src/common/config.py:391
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:392
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:403
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -4796,12 +4744,12 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:404
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4809,52 +4757,52 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:406
+#: ../src/common/config.py:408
 #, fuzzy
 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:407
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:408
+#: ../src/common/config.py:410
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: ../src/common/config.py:409
+#: ../src/common/config.py:411
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: ../src/common/config.py:410
+#: ../src/common/config.py:412
 #, fuzzy
 msgid "Latest token for Oauth2 authentication."
 msgstr "Anonym autentisering"
 
-#: ../src/common/config.py:411
+#: ../src/common/config.py:413
 #, fuzzy
 msgid "client_id for Oauth2 authentication."
 msgstr "Anon_ym autentisering"
 
-#: ../src/common/config.py:412
+#: ../src/common/config.py:414
 msgid "redirect_url for Oauth2 authentication."
 msgstr ""
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:415
 msgid ""
-"Space separated list of jid for which we want to re-open a chat window on "
+"Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4862,11 +4810,11 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:477 ../src/common/config.py:480
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:483
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
@@ -4874,99 +4822,99 @@ msgid ""
 msgstr ""
 "Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:484
 #, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit, -2 means global value"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 "Hvor mange minutter med logg skal man be om når man går inn i en "
 "gruppesamtale. "
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:487
 msgid ""
 "State whether plugins should be activated on startup (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:490 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:491
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:491
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:492 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:492
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:494 ../src/common/pep.py:185
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:496
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:496
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:507
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:508
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:509 ../src/config.py:1650
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:510
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:511
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:512 ../src/common/config.py:513
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:524
+#: ../src/common/config.py:526
 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."
@@ -4975,32 +4923,32 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:525
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:534 ../src/common/optparser.py:309
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:538 ../src/common/optparser.py:295
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:542
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:546
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:553
+#: ../src/common/config.py:555
 #, fuzzy
 msgid "Tor"
 msgstr "Til"
 
-#: ../src/common/connection_handlers_events.py:369
+#: ../src/common/connection_handlers_events.py:370
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5010,23 +4958,23 @@ msgstr ""
 "kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
 "fjerne den"
 
-#: ../src/common/connection_handlers_events.py:824
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers_events.py:909
-#: ../src/common/connection_handlers.py:336
-#: ../src/common/connection_handlers.py:951
-#: ../src/common/connection_handlers.py:1073 ../src/common/connection.py:459
-#: ../src/common/logger.py:1153 ../src/gajim.py:414 ../src/session.py:95
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers_events.py:913
-#: ../src/common/connection_handlers.py:954
-#: ../src/common/connection_handlers.py:1076 ../src/common/connection.py:463
-#: ../src/common/logger.py:1156 ../src/gajim.py:215 ../src/session.py:99
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -5037,142 +4985,146 @@ msgstr ""
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:934
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers_events.py:942
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers_events.py:1026
-#: ../src/common/connection_handlers_events.py:1066
-#: ../src/common/connection.py:263 ../src/config.py:2147 ../src/config.py:2156
-#: ../src/config.py:2224 ../src/config.py:3654 ../src/dataforms_widget.py:633
-#: ../src/dialogs.py:3133
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers_events.py:1027
-#: ../src/common/connection_handlers_events.py:1067
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 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."
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1098
-#: ../src/gui_interface.py:432 ../src/gui_interface.py:446
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/common/connection_handlers_events.py:1570
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
-#: ../src/common/connection_handlers_events.py:2163 ../src/dialogs.py:2818
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
 #: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "Ny Melding"
 
-#: ../src/common/connection_handlers_events.py:2165
+#: ../src/common/connection_handlers_events.py:2213
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2169 ../src/dialogs.py:2819
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
 #: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/common/connection_handlers_events.py:2171
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %s"
 
-#: ../src/common/connection_handlers_events.py:2174
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/connection_handlers_events.py:2177
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Melding fra %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2181 ../src/dialogs.py:2818
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
 #: ../src/notify.py:266
 msgid "New Message"
 msgstr "Ny Melding"
 
-#: ../src/common/connection_handlers_events.py:2183
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2326
+#: ../src/common/connection_handlers_events.py:2375
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/common/connection_handlers_events.py:2328
-#: ../src/groupchat_control.py:205 ../src/groupchat_control.py:1772
-#: ../src/history_window.py:448
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/common/connection_handlers_events.py:2333 ../src/dialogs.py:2830
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
 #: ../src/notify.py:280
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/common/connection_handlers_events.py:2335
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
 #. default value
-#: ../src/common/connection_handlers_events.py:2340 ../src/dialogs.py:2814
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
 #: ../src/notify.py:262
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/common/connection_handlers_events.py:2342
+#: ../src/common/connection_handlers_events.py:2389
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/common/connection_handlers_events.py:2347 ../src/dialogs.py:2816
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
 #: ../src/notify.py:264
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
-#: ../src/common/connection_handlers.py:89
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:122
+#: ../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:130
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:131
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:140
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:141
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -5180,16 +5132,16 @@ msgstr ""
 "Registrering med agenten %(agent)s feilet med melding %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:573 ../src/common/connection.py:1582
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:574 ../src/common/connection.py:1583
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1739
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
@@ -5321,27 +5273,28 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:264 ../src/dialogs.py:3134
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:286
+#: ../src/common/connection.py:304
 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:289
+#: ../src/common/connection.py:307
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) passer ikke sammen med nøkkelen tildelt i Gajim."
 
 #. we're not english: one in locale and one en
-#: ../src/common/connection.py:343
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:446
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5350,74 +5303,78 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:877
+#: ../src/common/connection.py:942
 #, 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"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:919
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:936
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:937
+#: ../src/common/connection.py:1002
 #, 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:1229 ../src/common/connection.py:1390
-#: ../src/common/connection.py:2020
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Kunne ikke koble til \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1230 ../src/gui_interface.py:541
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:1235
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:1250
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:1288 ../src/common/connection.py:1366
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:1289 ../src/common/connection.py:1367
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1316
+#: ../src/common/connection.py:1388
 #, 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:1319
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -5426,7 +5383,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:1321
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -5435,31 +5392,33 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:1348
+#: ../src/common/connection.py:1420
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: ../src/common/connection.py:1391
-msgid "Check your connection or try again later"
-msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1426
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1427
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:1502
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:1503
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5468,39 +5427,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:1887
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1890
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:2037 ../src/common/connection.py:2059
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:2620
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:2621
+#: ../src/common/connection.py:2827
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Avregistrering med server %(server)s feilet: %(error)s"
 
 #: ../src/common/contacts.py:129 ../src/common/helpers.py:67
-#: ../src/gui_interface.py:484
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "Observerere"
 
 #: ../src/common/contacts.py:133 ../src/common/contacts.py:361
-#: ../src/common/helpers.py:67 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1516 ../src/roster_window.py:859
-#: ../src/roster_window.py:1608 ../src/roster_window.py:1718
-#: ../src/roster_window.py:1720 ../src/roster_window.py:1882
-#: ../src/roster_window.py:2579
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporter"
 
@@ -5542,7 +5501,7 @@ msgstr ""
 "Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
 "til False"
 
-#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
 
@@ -6007,12 +5966,12 @@ msgstr "CRL er ikke gyldig enda"
 msgid "Error loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rom Instillinger"
 
-#: ../src/common/jingle_rtp.py:113
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -6024,30 +5983,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:218
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:218
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/common/jingle_rtp.py:352
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:355
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:410
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:419
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
@@ -6056,84 +6015,84 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldig loggnivå"
 
-#: ../src/common/multimedia_helpers.py:39
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Standard Melding"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:60
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:79
-#: ../src/common/multimedia_helpers.py:93
-#: ../src/common/multimedia_helpers.py:111
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Størrelse: %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
 #, fuzzy, python-format
 msgid "Pulse: %s"
 msgstr "Fil: %s"
 
 #. Fake sink
-#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:90
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
 #. Funny things, just to test...
 #. self.devices['GOOM'] = 'audiotestsrc ! goom'
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:100
 #, fuzzy
 msgid "Screen"
 msgstr "grønn"
 
 #. Fake video output
-#: ../src/common/multimedia_helpers.py:105
+#: ../src/common/multimedia_helpers.py:107
 msgid "Fake video output"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:108
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:110
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:203
-#: ../src/gtkgui_helpers.py:219
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
@@ -6563,7 +6522,7 @@ msgstr "Spiser Lunch"
 msgid "Exercising"
 msgstr "Trener"
 
-#: ../src/common/pep.py:133 ../src/common/pep.py:177
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Sykler"
 
@@ -6664,226 +6623,230 @@ msgid "Relaxing"
 msgstr "Slapper Av"
 
 #: ../src/common/pep.py:160
+msgid "Fishing"
+msgstr "Fisker"
+
+#: ../src/common/pep.py:161
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Going out"
 msgstr "Går ut"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Partying"
 msgstr "Fester"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Reading"
 msgstr "Leser"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Shopping"
 msgstr "Sover"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Smoking"
 msgstr "Røyker"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Socializing"
 msgstr "Sosialiserer"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Sunbathing"
 msgstr "Soler seg"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Watching TV"
 msgstr "Ser på TV"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Watching a Movie"
 msgstr "Ser på en Film"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Talking"
 msgstr "Snakker"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "In Real Life"
 msgstr "I det Virkelige Liv"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "On the Phone"
 msgstr "Sitter i Telefonen"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "On Video Phone"
 msgstr "På Video Telefon"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "Traveling"
 msgstr "Reiser"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Driving"
 msgstr "Kjører"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "In a Car"
 msgstr "I en Bil"
 
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:181
 msgid "On a Bus"
 msgstr "På en Buss"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "On a Plane"
 msgstr "På et Fly"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "On a Train"
 msgstr "På et Tog"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Trip"
 msgstr "På en Reise"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "Walking"
 msgstr "Spaserer"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "In a Meeting"
 msgstr "I et Møte"
 
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:189
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:194
+#: ../src/common/pep.py:195
 msgid "accuracy"
 msgstr ""
 
-#: ../src/common/pep.py:195
+#: ../src/common/pep.py:196
 #, fuzzy
 msgid "alt"
 msgstr "standard"
 
-#: ../src/common/pep.py:196
+#: ../src/common/pep.py:197
 msgid "area"
 msgstr ""
 
-#: ../src/common/pep.py:197
+#: ../src/common/pep.py:198
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: ../src/common/pep.py:198
+#: ../src/common/pep.py:199
 #, fuzzy
 msgid "building"
 msgstr "Gjemmer seg"
 
-#: ../src/common/pep.py:199
+#: ../src/common/pep.py:200
 #, fuzzy
 msgid "country"
 msgstr "Land:"
 
-#: ../src/common/pep.py:200
+#: ../src/common/pep.py:201
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: ../src/common/pep.py:201
+#: ../src/common/pep.py:202
 msgid "datum"
 msgstr ""
 
-#: ../src/common/pep.py:202
+#: ../src/common/pep.py:203
 #, fuzzy
 msgid "description"
 msgstr "Beskrivelse"
 
-#: ../src/common/pep.py:203
+#: ../src/common/pep.py:204
 #, fuzzy
 msgid "error"
 msgstr "Feil"
 
-#: ../src/common/pep.py:204
+#: ../src/common/pep.py:205
 msgid "floor"
 msgstr ""
 
-#: ../src/common/pep.py:205
+#: ../src/common/pep.py:206
 msgid "lat"
 msgstr ""
 
-#: ../src/common/pep.py:206
+#: ../src/common/pep.py:207
 msgid "locality"
 msgstr ""
 
-#: ../src/common/pep.py:207
+#: ../src/common/pep.py:208
 #, fuzzy
 msgid "lon"
 msgstr "en"
 
-#: ../src/common/pep.py:208
+#: ../src/common/pep.py:209
 msgid "postalcode"
 msgstr ""
 
-#: ../src/common/pep.py:209
+#: ../src/common/pep.py:210
 msgid "region"
 msgstr ""
 
-#: ../src/common/pep.py:210 ../src/gajim-remote.py:288
+#: ../src/common/pep.py:211
 msgid "room"
 msgstr "rom"
 
-#: ../src/common/pep.py:211
+#: ../src/common/pep.py:212
 msgid "speed"
 msgstr ""
 
-#: ../src/common/pep.py:212
+#: ../src/common/pep.py:213
 msgid "street"
 msgstr ""
 
-#: ../src/common/pep.py:213
+#: ../src/common/pep.py:214
 msgid "text"
 msgstr ""
 
-#: ../src/common/pep.py:214
+#: ../src/common/pep.py:215
 msgid "timestamp"
 msgstr ""
 
-#: ../src/common/pep.py:215 ../src/gajim-remote.py:279
+#: ../src/common/pep.py:216
 msgid "uri"
 msgstr "uri"
 
-#: ../src/common/pep.py:357
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Ukjent Artist"
 
-#: ../src/common/pep.py:360
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/common/pep.py:363
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/common/pep.py:366
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6893,7 +6856,7 @@ msgstr ""
 "fra  <i>%(source)s</i>"
 
 #. we're not english
-#: ../src/common/stanza_session.py:427
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6942,17 +6905,15 @@ msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:352
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:366
-#: ../src/common/zeroconf/connection_zeroconf.py:407
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:434
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6965,24 +6926,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:409
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:418
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:473 ../src/config.py:477 ../src/config.py:3159
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:761 ../src/dialogs.py:1495
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:762
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6991,69 +6952,69 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1232
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1232
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1559 ../src/dialogs.py:2574 ../src/dialogs.py:2641
-#: ../src/dialogs.py:3437 ../src/disco.py:885 ../src/disco.py:1743
-#: ../src/disco.py:2045 ../src/history_window.py:91
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1659
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1660
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1814 ../src/config.py:1947
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kan ikke brukes på denne maskinen"
 
-#: ../src/config.py:1987 ../src/config.py:2034
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1988
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:2017
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:2018
+#: ../src/config.py:2022
 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:2030 ../src/config.py:2575 ../src/config.py:2612
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:2031
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:2035
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:2041
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:2042
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -7061,143 +7022,144 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:2046 ../src/config.py:2050
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:2047
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:2051
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:2128
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:2129
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:2157
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2380 ../src/config.py:3700
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2381 ../src/config.py:3701
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2402
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2437
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2438
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2446
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2466
 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:2454 ../src/dialogs.py:2325 ../src/dialogs.py:2563
-#: ../src/dialogs.py:2751 ../src/disco.py:515 ../src/profile_window.py:369
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2474
 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:2459
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2460
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2576 ../src/config.py:2613
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2582
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2605
 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:2740
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2778
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2779
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2779
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2844 ../src/disco.py:892 ../src/history_manager.py:207
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2854
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2861
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2867
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2894
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2896
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -7205,11 +7167,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2898
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2899
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -7217,11 +7179,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2901
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2902
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -7229,11 +7191,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2904
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2905
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -7241,7 +7203,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2906
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -7257,106 +7219,106 @@ msgstr ""
 "4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:3007
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:3022
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/config.py:3023
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:3036 ../src/gui_interface.py:285
-#: ../src/gui_interface.py:732
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:3037 ../src/gui_interface.py:712
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:3038 ../src/gui_interface.py:732
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:3049
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:3063
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/config.py:3064
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/config.py:3065
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/config.py:3066
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3159
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3160
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:3161
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3220
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:3253
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:3254
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
-#: ../src/config.py:3380 ../src/config.py:3391 ../src/config.py:3400
-#: ../src/config.py:3411 ../src/config.py:3419
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3391 ../src/config.py:3399 ../src/config.py:3411
-#: ../src/config.py:3676
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3418
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Ugyldig rom"
 
-#: ../src/config.py:3588
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3589 ../src/config.py:3595
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -7366,33 +7328,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3594
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3633
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3635
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3677
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3733 ../src/gui_interface.py:1303
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3734 ../src/gui_interface.py:1304
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3822
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7407,7 +7369,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3828 ../src/gui_interface.py:1332
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7418,82 +7380,89 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3860 ../src/config.py:3894
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3959
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3960
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:4090
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/config.py:4091
+#: ../src/config.py:4119
 #, 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:4119
+#: ../src/config.py:4147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Konfigurer"
 
-#: ../src/config.py:4135 ../src/plugins/gui.py:88
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4143
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:4177
+#: ../src/config.py:4205
 #, fuzzy
 msgid "Attention Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:4178
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:4179
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:4181
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:4182
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:4183
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:4184
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:4185
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:4186
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:4187
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:602
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -7503,7 +7472,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:621
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -7511,44 +7480,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:741
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:766
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:783
+#: ../src/conversation_textview.py:835
 #, 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:796
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:799
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:805
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1302
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7556,7 +7525,7 @@ msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1351 ../src/history_window.py:481
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -7593,157 +7562,157 @@ msgstr "ny@jabber.id"
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:198
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:205
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:302
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:477
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:597
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:805
 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:811
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:812
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:843
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:844
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:883
 #, 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:884
+#: ../src/dialogs.py:886
 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:1076 ../src/dialogs.py:1082 ../src/dialogs.py:1087
-#: ../src/dialogs.py:3672
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1083
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1088
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1102
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1156 ../src/dialogs.py:1190
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1275
+#: ../src/dialogs.py:1279
 #, fuzzy
 msgid "A GTK+ Jabber/XMPP client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1276
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1277
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1295
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1301
+#: ../src/dialogs.py:1305
 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:1313
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1496
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7756,109 +7725,156 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1912
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Usikker tilkobling"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
+"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
+"ønsker å fortsette?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jeg ønsker å koble til usikkert"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/dialogs.py:1950
 msgid "_Resume"
 msgstr ""
 
-#: ../src/dialogs.py:1920
+#: ../src/dialogs.py:1958
 msgid "Re_place"
 msgstr ""
 
-#: ../src/dialogs.py:2114 ../src/dialogs.py:2515
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:2233
+#: ../src/dialogs.py:2277
 #, 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:2236
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:2320 ../src/gui_interface.py:2056
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2370
 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:2370
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2501
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Feil uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Dette er ikke en samtalegruppe"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2502
+#: ../src/dialogs.py:2599
 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:2514
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2519 ../src/dialogs.py:2525
-#: ../src/groupchat_control.py:2099
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2520
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2526 ../src/groupchat_control.py:2100
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2531 ../src/gui_interface.py:2038
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2532 ../src/gui_interface.py:2039
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2564
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2613
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2614
+#: ../src/dialogs.py:2713
 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:2639
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2700
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7867,138 +7883,138 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2730 ../src/dialogs.py:3114 ../src/dialogs.py:3350
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2731 ../src/dialogs.py:3115 ../src/dialogs.py:3351
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2740 ../src/dialogs.py:2743
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2743
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2771
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2771
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2775
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2776
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: ../src/dialogs.py:2819 ../src/gui_interface.py:873 ../src/notify.py:276
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2821 ../src/gui_interface.py:933 ../src/notify.py:269
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2823 ../src/gui_interface.py:835
-#: ../src/gui_interface.py:899 ../src/notify.py:271
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2825 ../src/gui_interface.py:1022
-#: ../src/gui_interface.py:1048 ../src/gui_interface.py:1069
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
 #: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2826 ../src/gui_interface.py:1025
-#: ../src/gui_interface.py:1052 ../src/gui_interface.py:1073
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
 #: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:3035
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:3037
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3063
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3086
+#: ../src/dialogs.py:3185
 #, 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:3170
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:3171
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3231
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3380
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Lei seg"
 
-#: ../src/dialogs.py:3380
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3381
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:3410
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -8006,186 +8022,186 @@ 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:3428 ../src/dialogs.py:3503
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Endre"
 
 #. holds jid
-#: ../src/dialogs.py:3434 ../src/history_manager.py:156
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3440
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3548
+#: ../src/dialogs.py:3646
 #, 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:3562
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "_Legg til kontakt"
 msgstr[1] "_Legg til kontakt"
 
-#: ../src/dialogs.py:3600
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Fjerner kontakt fra kontaktlisten"
 msgstr[1] "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/dialogs.py:3641 ../src/dialogs.py:3818
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3681
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/dialogs.py:3682
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3729
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3949
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Tjenesten returnerte en feil."
 
-#: ../src/dialogs.py:4017
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:4021
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:4088
+#: ../src/dialogs.py:4186
 #, 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:4093
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:4144
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:4255
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:4354
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4544
 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:4481
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:4484
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:4486
+#: ../src/dialogs.py:4585
 #, 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:4494
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:4496
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:4512
+#: ../src/dialogs.py:4612
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: ../src/dialogs.py:4563
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4573 ../src/dialogs.py:4615 ../src/dialogs.py:4671
-#: ../src/dialogs.py:4759
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:4578
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4605
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:4620
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:4658
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:4676
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4746
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:4764
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:4790
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:4792
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#: ../src/dialogs.py:5012
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -8196,19 +8212,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5015
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:5021 ../src/dialogs.py:5105
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:5027
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:5032
+#: ../src/dialogs.py:5133
 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 "
@@ -8218,19 +8234,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:5035 ../src/dialogs.py:5086 ../src/dialogs.py:5099
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:5040
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:5051
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:5052
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -8245,64 +8261,69 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5053
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:5087
+#: ../src/dialogs.py:5189
 #, 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:5093
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5100
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG nøkkel er tildelt denne kontaken, men du <b>stoler ikke på denne "
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:5106
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/dialogs.py:5171
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5173
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5175
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5179
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/dialogs.py:5248
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/dialogs.py:5248
+#: ../src/dialogs.py:5376
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -8324,37 +8345,42 @@ msgid ""
 "SHA1 Fingerprint: %(sha1)s"
 msgstr ""
 
-#: ../src/dialogs.py:5283 ../src/dialogs.py:5300
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
 msgid "View cert..."
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Selvsignert sertifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8362,93 +8388,93 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:765 ../src/disco.py:1101
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:806 ../src/disco.py:816
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:869
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:913
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:1102
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1342
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1352 ../src/disco.py:1521
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1562
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1753
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1761
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1769
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1834 ../src/gui_interface.py:2574
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2575
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1844 ../src/gui_interface.py:2589
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2590
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2054
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:2062
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
@@ -8508,11 +8534,13 @@ msgid "Feature not available under Windows."
 msgstr "Funksjon ikke tilgjengelig i Windows."
 
 #: ../src/features_window.py:62
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP meldingskryptering"
 
 #: ../src/features_window.py:63
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Krypterer samtalemeldinger med gpg nøkler."
 
 #: ../src/features_window.py:64
@@ -8720,7 +8748,7 @@ msgstr "Størrelse: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
-#: ../src/history_manager.py:541
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Du"
 
@@ -8730,7 +8758,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
-#: ../src/tooltips.py:756
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -8761,7 +8789,7 @@ msgstr ""
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:329 ../src/tooltips.py:791
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Beskrivelse:"
 
@@ -8773,12 +8801,12 @@ msgstr "Gajim får ikke tilgang til filen"
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8786,23 +8814,23 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:418 ../src/gtkgui_helpers.py:862
+#: ../src/filetransfers_window.py:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
@@ -8868,11 +8896,11 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:730 ../src/tooltips.py:746
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:732 ../src/tooltips.py:750
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -8880,40 +8908,78 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:198
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "melding"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Uttrykksikoner:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Vis bare i _kontaktliste"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Avansert Konfigurasjons Editor"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Rom Instillinger"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "_Konfigurer"
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importering av PyGTK feilet: %s"
 
-#: ../src/gajim.py:241
+#: ../src/gajim.py:256
 #, fuzzy
 msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim trenger PyGTK 2.12 eller høyere"
 
-#: ../src/gajim.py:242
+#: ../src/gajim.py:257
 #, fuzzy
 msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:244
+#: ../src/gajim.py:259
 #, fuzzy
 msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim trenger GTK 2.12 eller høyere"
 
-#: ../src/gajim.py:245
+#: ../src/gajim.py:260
 #, fuzzy
 msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:254
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:255
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8922,12 +8988,11 @@ msgstr ""
 "Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den "
 "på %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:389
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:390
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8935,28 +9000,28 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8964,35 +9029,37 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:110
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -9001,11 +9068,18 @@ msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "melding"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -9013,19 +9087,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
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "Endrer prioritet på konto eller kontoer"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "prioritet"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "prioritet du ønsker å gi til kontoen"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:122
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -9033,23 +9108,23 @@ 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.py:128
 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.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
 
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:140
 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 "
@@ -9059,30 +9134,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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.py:153
 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 "
@@ -9092,133 +9167,133 @@ 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.py:158
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 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.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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.py:197
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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.py:208
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -9226,17 +9301,17 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Endre status"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Picture to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -9245,63 +9320,74 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr "Konto som du ønsker å benytte for å håndtere det"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "Meldings innhold"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
+msgstr "rom"
+
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 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
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:349
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -9310,15 +9396,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:352
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 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:432
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -9327,25 +9413,27 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:440
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:446
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:515
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9354,7 +9442,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9363,11 +9451,11 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:539
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:541
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -9393,213 +9481,217 @@ msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:179 ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, 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:234
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:236
+#: ../src/groupchat_control.py:238
 #, 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:568
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:751
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:753
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
-#: ../src/groupchat_control.py:1232
+#: ../src/groupchat_control.py:1268
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1250 ../src/groupchat_control.py:1516
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
-#: ../src/groupchat_control.py:1253
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/groupchat_control.py:1255
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/groupchat_control.py:1257
+#: ../src/groupchat_control.py:1293
 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/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/groupchat_control.py:1268
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1523
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1526
+#: ../src/groupchat_control.py:1597
 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:1532
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1606
 #, 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:1544
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1547
+#: ../src/groupchat_control.py:1618
 #, 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:1558 ../src/groupchat_control.py:1662
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1616 ../src/groupchat_control.py:1621
-#: ../src/groupchat_control.py:1627
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1618
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1623
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1629
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1712
+#: ../src/groupchat_control.py:1795
 #, 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:1716
+#: ../src/groupchat_control.py:1799
 #, 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:1731
+#: ../src/groupchat_control.py:1814
 #, 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:1735
+#: ../src/groupchat_control.py:1818
 #, 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:1765
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1770
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:2026
+#: ../src/groupchat_control.py:2124
 #, 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:2028
+#: ../src/groupchat_control.py:2126
 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:2032 ../src/gui_interface.py:704
-#: ../src/gui_interface.py:1411 ../src/gui_interface.py:1451
-#: ../src/gui_interface.py:1492 ../src/message_window.py:222
-#: ../src/roster_window.py:3064 ../src/roster_window.py:3799
-#: ../src/roster_window.py:4612
-#, fuzzy
-msgid "_Do not ask me again"
-msgstr "_Ikke spør meg igjen"
-
-#: ../src/groupchat_control.py:2066
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:2067
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:2074
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:2075
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2106
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:2107
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9607,28 +9699,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:2109
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
-#: ../src/groupchat_control.py:2141 ../src/gui_interface.py:604
-#: ../src/roster_window.py:3390
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
-
 #. ask for reason
-#: ../src/groupchat_control.py:2306
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2307 ../src/groupchat_control.py:2639
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2638
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -9653,57 +9739,57 @@ msgstr "_Rapporter Feil"
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../src/gtkgui_helpers.py:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 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:392
+#: ../src/gtkgui_helpers.py:393
 #, 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:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:768
+#: ../src/gtkgui_helpers.py:769
 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:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:133 ../src/gui_interface.py:297
-#: ../src/gui_interface.py:306 ../src/gui_interface.py:312
-#: ../src/gui_interface.py:315 ../src/gui_interface.py:318
-#: ../src/gui_interface.py:323
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/gui_interface.py:134
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9714,86 +9800,86 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gui_interface.py:137
+#: ../src/gui_interface.py:138
 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:154
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gui_interface.py:156
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:160
 #, 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:202 ../src/notify.py:282
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gui_interface.py:286
+#: ../src/gui_interface.py:287
 #, 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:298
+#: ../src/gui_interface.py:299
 #, fuzzy, python-format
 msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Maksimum antall brukere for %s er nådd"
 
-#: ../src/gui_interface.py:307
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/gui_interface.py:313
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/gui_interface.py:316
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/gui_interface.py:319
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:325
 #, 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:417 ../src/gui_interface.py:421
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
-#: ../src/gui_interface.py:473 ../src/notify.py:284
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Abonnerings forespørsel"
 
-#: ../src/gui_interface.py:498
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gui_interface.py:499
+#: ../src/gui_interface.py:500
 #, 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:507
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gui_interface.py:508
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9801,68 +9887,72 @@ 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:529 ../src/notify.py:286
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Fjern Abonnement"
 
-#: ../src/gui_interface.py:540
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:625
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:628
+#: ../src/gui_interface.py:629
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:657
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:659 ../src/gui_interface.py:667
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gui_interface.py:661
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gui_interface.py:666
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG Passordord er ikke riktig"
 
-#: ../src/gui_interface.py:679
+#: ../src/gui_interface.py:681
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Sertifikatet har utløpt"
 
-#: ../src/gui_interface.py:680
+#: ../src/gui_interface.py:682
 #, fuzzy, python-format
 msgid "Enter the passphrase for the certificate for account %s"
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:702
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG nøkkel ikke tiltrodd"
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
 "virkelig å kryptere denne meldingen?"
 
-#: ../src/gui_interface.py:715
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
@@ -9871,29 +9961,29 @@ 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:753
+#: ../src/gui_interface.py:755
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: ../src/gui_interface.py:756
+#: ../src/gui_interface.py:758
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: ../src/gui_interface.py:846
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:848
+#: ../src/gui_interface.py:858
 #, 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:861
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9908,65 +9998,65 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:931
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1028
+#: ../src/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fil Overføringer"
 
-#: ../src/gui_interface.py:1049
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
 #. ft hash error
-#: ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1067
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gui_interface.py:1070
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
-#: ../src/gui_interface.py:1074
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
 #. ft hash error
-#: ../src/gui_interface.py:1078
+#: ../src/gui_interface.py:1088
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gui_interface.py:1153
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gui_interface.py:1165
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gui_interface.py:1166
+#: ../src/gui_interface.py:1176
 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:1181
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9975,21 +10065,21 @@ msgstr ""
 "et annet"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1237
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1240
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/gui_interface.py:1327
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gui_interface.py:1328
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -10000,15 +10090,20 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gui_interface.py:1337
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gui_interface.py:1362
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL sertifikats validering"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gui_interface.py:1363
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -10025,32 +10120,6 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
 
-#: ../src/gui_interface.py:1402 ../src/gui_interface.py:1446
-#: ../src/gui_interface.py:1488
-msgid "Insecure connection"
-msgstr "Usikker tilkobling"
-
-#: ../src/gui_interface.py:1403
-#, fuzzy, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) with an "
-"insecure connection. This means all your conversations will be exchanged "
-"unencrypted. This type of connection is really discouraged.\n"
-"Are you sure you want to do that?"
-msgstr ""
-"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
-"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
-"ønsker å fortsette?"
-
-#: ../src/gui_interface.py:1409 ../src/gui_interface.py:1450
-#: ../src/gui_interface.py:1491
-msgid "Yes, I really want to connect insecurely"
-msgstr "Ja, jeg ønsker å koble til usikkert"
-
-#: ../src/gui_interface.py:1410
-msgid "Gajim will NOT connect unless you check this box"
-msgstr ""
-
 #: ../src/gui_interface.py:1447
 msgid ""
 "You are about to send your password on an insecure connection. You should "
@@ -10092,7 +10161,7 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2063 ../src/roster_window.py:3966
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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"
 
@@ -10102,74 +10171,82 @@ msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gui_interface.py:3008
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gui_interface.py:3009
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3023
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG nøkkel utgått"
 
-#: ../src/gui_interface.py:3024
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3033
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gui_interface.py:3034
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
 #: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:432
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/history_manager.py:116
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "lager %s mappe"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds time
-#: ../src/history_manager.py:169 ../src/history_manager.py:213
-#: ../src/history_window.py:99
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:176 ../src/history_manager.py:232
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:185 ../src/history_manager.py:220
-#: ../src/history_window.py:107
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Melding"
 
 #. holds subject
-#: ../src/history_manager.py:193 ../src/history_manager.py:226
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../src/history_manager.py:252
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Ønsker du å rengjøre databasen? (STERKT FRARÅDET MENS GAJIM KJØRER)"
 
-#: ../src/history_manager.py:254
+#: ../src/history_manager.py:264
 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 "
@@ -10183,83 +10260,87 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:259
+#: ../src/history_manager.py:269
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Database feil"
 
-#: ../src/history_manager.py:477
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:592
+#: ../src/history_manager.py:602
 #, fuzzy, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
 msgstr "Ønsker du virkelig å slette den valgte meldingen?"
 
-#: ../src/history_manager.py:596
+#: ../src/history_manager.py:606
 #, fuzzy
 msgid "Do you really want to delete logs of the selected contacts?"
 msgstr "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 
-#: ../src/history_manager.py:598 ../src/history_manager.py:637
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/history_manager.py:634
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:306
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:356
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:444
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:455
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../src/history_window.py:457
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/history_window.py:459
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:462
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:522
+#: ../src/htmltextview.py:523
 #, fuzzy
 msgid "Loading"
 msgstr "Koder"
 
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
+
 #: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Du kommer til å lukke flere tabber"
@@ -10296,53 +10377,53 @@ msgstr "- -meldinger vil ikke bli logget"
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/plugins/gui.py:78
+#: ../src/plugins/gui.py:82
 msgid "Plugin"
 msgstr ""
 
-#: ../src/plugins/gui.py:145
+#: ../src/plugins/gui.py:151
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Utvise %s"
 
-#: ../src/plugins/gui.py:199
+#: ../src/plugins/gui.py:209
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registrering feilet"
 
-#: ../src/plugins/gui.py:244
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
 #. members not safe
-#: ../src/plugins/gui.py:252 ../src/plugins/pluginmanager.py:523
-#: ../src/plugins/pluginmanager.py:531
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/plugins/gui.py:276 ../src/plugins/gui.py:284
-#: ../src/plugins/pluginmanager.py:539
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/plugins/gui.py:276
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr ""
 
-#: ../src/plugins/gui.py:306
+#: ../src/plugins/gui.py:316
 #, fuzzy
 msgid "Configuration"
 msgstr "Rom Instillinger"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:509 ../src/plugins/pluginmanager.py:515
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
 msgid "Archive corrupted"
 msgstr ""
 
-#: ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/pluginmanager.py:514
 #, fuzzy
 msgid "Archive empty"
 msgstr "Filen er tom"
@@ -10351,52 +10432,53 @@ msgstr "Filen er tom"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:129 ../src/roster_window.py:3259
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:132 ../src/roster_window.py:3262
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:146 ../src/profile_window.py:162
-#: ../src/roster_window.py:3264 ../src/roster_window.py:3275
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:233
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformasjon"
 
-#: ../src/profile_window.py:234
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:292
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:370
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:383
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:402
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:409
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:410
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10404,53 +10486,54 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1031
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:2049
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:2050
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:2073
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:2074
+#: ../src/roster_window.py:2084
 #, 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:2088
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:2089
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:2116
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2117
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
-#: ../src/roster_window.py:2324 ../src/roster_window.py:3896
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2325 ../src/roster_window.py:3897
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10458,38 +10541,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:2351
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2417
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2418
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2419
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filoverføring"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2541 ../src/roster_window.py:2978
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2542
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10497,16 +10580,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:2979
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2982
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2983
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10514,11 +10597,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2986
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2991
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10527,12 +10610,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:3059
+#: ../src/roster_window.py:3043
 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:3061
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10541,57 +10624,57 @@ msgstr ""
 "sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:3151
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:3159
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:3160
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:3206
+#: ../src/roster_window.py:3139
 #, 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:3207
+#: ../src/roster_window.py:3140
 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:3246
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:3247
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3706
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3637
 #, 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:3713
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10600,11 +10683,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3719
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3723
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10612,16 +10695,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:3726
+#: ../src/roster_window.py:3655
 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:3730
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3735
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10631,7 +10714,7 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3793
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -10639,7 +10722,7 @@ msgstr ""
 "Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
 "fortsette?"
 
-#: ../src/roster_window.py:3795
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10648,19 +10731,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:3814
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3744
 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:4512
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:4514
+#: ../src/roster_window.py:4458
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -10669,13 +10752,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:4606
+#: ../src/roster_window.py:4550
 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:4608
+#: ../src/roster_window.py:4552
 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 "
@@ -10685,28 +10768,28 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4729
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4741
+#: ../src/roster_window.py:4685
 #, 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:4876
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4887
+#: ../src/roster_window.py:4831
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Gjør %s og %s metakontakter"
 
-#: ../src/roster_window.py:4890
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -10716,130 +10799,130 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5346 ../src/roster_window.py:5400
-#: ../src/roster_window.py:5409 ../src/statusicon.py:277
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
 #: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:5416
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:5421
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:5460 ../src/statusicon.py:340
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5480
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:5521
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:5581 ../src/roster_window.py:5689
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:5614
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5616
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5619
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
-#: ../src/roster_window.py:5777 ../src/roster_window.py:5950
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5785
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5789
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5970
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5979
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:6034
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:6081
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:6091
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:6100
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:6110
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:6170
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:6179
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:6186
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:6275
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:6286
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:6514
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -10856,7 +10939,7 @@ msgstr "Feil i motatt dataskjema"
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:409 ../src/session.py:468
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
@@ -10875,7 +10958,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:470
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10890,7 +10973,7 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/session.py:473
+#: ../src/session.py:474
 #, fuzzy
 msgid "Always accept for this contact"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
@@ -10908,134 +10991,134 @@ msgstr "i _kontaktliste"
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:393 ../src/tooltips.py:613
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:396 ../src/tooltips.py:617
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne samtalegruppen"
 
-#: ../src/tooltips.py:510
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:514
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../src/tooltips.py:529 ../src/tooltips.py:789
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:574
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:576
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:594
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:596
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:624
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:634
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:658
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/tooltips.py:712
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Humør:"
 
-#: ../src/tooltips.py:716
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivitet:"
 
-#: ../src/tooltips.py:720
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Sang:"
 
-#: ../src/tooltips.py:724
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Varslinger"
 
-#: ../src/tooltips.py:749
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:755
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:762
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:771 ../src/tooltips.py:788
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:773
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:775 ../src/tooltips.py:778
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:781
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:784
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:786
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:823
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:826
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -11043,36 +11126,32 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/upower_listener.py:31
-msgid "Machine going to sleep"
-msgstr ""
-
-#: ../src/vcard.py:296
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:298
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:347 ../src/vcard.py:357 ../src/vcard.py:565
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:380
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:384
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:392
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -11080,7 +11159,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:394
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -11088,13 +11167,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:396
+#: ../src/vcard.py:412
 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:398
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -11102,18 +11181,138 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:405
+#: ../src/vcard.py:421
 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:407
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:412 ../src/vcard.py:466 ../src/vcard.py:588
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Tillat han/henne å se min status"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Vis h_umør til kontakter i kontaktlisten"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Vis _aktivitet til kontakter i kontaktlisten"
+
+#~ 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"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Vis _sanger til kontakter i kontaktlisten"
+
+#~ 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"
+
+#, 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"
+
+#~ msgid "English"
+#~ msgstr "Engelsk"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bulgarsk"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarsk"
+
+#~ msgid "Breton"
+#~ msgstr "Bretagner"
+
+#~ msgid "Czech"
+#~ msgstr "Tsjekkisk"
+
+#~ msgid "German"
+#~ msgstr "Tysk"
+
+#~ msgid "Greek"
+#~ msgstr "Gresk"
+
+#~ msgid "British"
+#~ msgstr "Brtisk"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spansk"
+
+#~ msgid "Basque"
+#~ msgstr "Baskisk"
+
+#~ msgid "French"
+#~ msgstr "Fransk"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroatisk"
+
+#~ msgid "Italian"
+#~ msgstr "Italiensk"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norsk (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederlansk"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norsk"
+
+#~ msgid "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugisisk"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brasiliansk Portugisisk"
+
+#~ msgid "Russian"
+#~ msgstr "Russisk"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbisk"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovakisk"
+
+#~ msgid "Swedish"
+#~ msgstr "Svensk"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kinesisk (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Stavekontroll språk"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Humør:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivitet:"
+
 #, fuzzy
 #~ msgid "Choose Client Cert"
 #~ msgstr "Velg Fil for Sending..."
@@ -11233,12 +11432,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "when I'm in"
 #~ msgstr "når jeg er i"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
 #~ msgid "Show the contact's profile (Ctrl+I)"
 #~ msgstr "Vis kontaktens profil (Ctrl+I)"
 
@@ -11287,9 +11480,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "error: cannot open %s for reading"
 #~ msgstr "feil: kan ikke åpne %s for lesing"
 
-#~ msgid "Fishing"
-#~ msgstr "Fisker"
-
 #~ msgid "Unable to bind to port %s."
 #~ msgstr "Klarer ikke å lytte til port %s."
 
@@ -11522,9 +11712,6 @@ msgstr " ressurs med prioritet"
 #~ "Gruppesamtale Historikk\n"
 #~ "All Samtale Historikk"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Behandle Kontoer"
-
 #~ msgid "gtk-delete"
 #~ msgstr "delete"
 
@@ -12300,9 +12487,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
 
-#~ msgid "Send File"
-#~ msgstr "Send Fil"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "_Bli med i Nytt Rom"
 
diff --git a/po/nl.po b/po/nl.po
index 435bba7d7..c64a818ba 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,15 +5,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -23,322 +19,315 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Persoonlijke Informatie"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Start Gesprek"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Neem deel aan _Groepsgesprek"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Contact Toevoegen..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 #, fuzzy
 msgid "_Execute Command..."
 msgstr "commando"
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Account Be_werken..."
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Open Email Samensteller"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Persoonlijke Informatie"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Start Gesprek"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Account Be_werken..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Wizard Account Aanmaken"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Account wordt aangemaakt</b>\n"
-"\n"
-"Een ogenblik geduld..."
+"Je hebt een account nodig om verbinding te maken\n"
+"met het Jabber netwerk."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+msgid "I want to _register for a new account"
+msgstr "Ik wil een nieuwe account _registreren"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Kies een van de volgende opties:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Wachtwoord:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Sla _wachtwoord op"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Gebruik aanmelding"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Verbind zodra ik Afronden druk"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Wizard Account Aanmaken"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Gebruik aanmelding"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Beheer..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Gebruik aangepaste hostnaam/poort"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Proxy:"
+msgid "_Hostname:"
+msgstr "Hostnaam: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Sla _wachtwoord op"
+msgid "_Port:"
+msgstr "_Poort:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "Gea_vanceerd"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Je hebt een account nodig om verbinding te maken\n"
-"met het Jabber netwerk."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Afronden"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Hostnaam: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Account wordt aangemaakt</b>\n"
+"\n"
+"Een ogenblik geduld..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Verbind zodra ik Afronden druk"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Wachtwoord:"
+#, 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:29
-msgid "_Port:"
-msgstr "_Poort:"
+msgid "_Finish"
+msgstr "_Afronden"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Overige</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Geen"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Persoonlijke Informatie</b>"
+msgid "Accounts"
+msgstr "Accounts"
 
-#: ../data/gui/accounts_window.ui.h:4
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 #, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Eigenschappen</b>"
+msgid "Add"
+msgstr "Adres"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
 #, fuzzy
-msgid "A_djust to status"
-msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Account"
+msgid "Delete"
+msgstr "Wis MOTD"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Accounts"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Her_noem"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "_Administrator"
+msgid "_Enable"
+msgstr "Inschakelen"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Gebruik aanmelding"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"De bron wordt verstuurd naar de Jabber server om onderscheid te maken tussen "
+"twee of meer dezelfde JIDs. Op deze manier is het mogelijk om bijvoorbeeld "
+"met zowel met een bron 'Thuis' als een bron 'Werk' ingelogd te zijn. De "
+"prioriteit bepaald dan wie berichten ontvangt. (zie hieronder)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
+msgid "Synchronize contacts"
+msgstr "_Offline Contacten Weergeven"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Bladeren"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Automatisch _verbinding maken als Gajim opstart"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Verander Wachtwoord"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klik om het wachtwoord van de account te veranderen"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "_Administrator"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Kies het Bestand om te Sturen"
+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 ""
+"Prioriteit wordt in Jabber gebruikt om te bepalen welke client berichten  "
+"ontvangt als er twee keer op dezelfde account ingelogd is; de hoogste  "
+"prioriteit wint."
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Kies _Sleutel..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klik om het wachtwoord van de account te veranderen"
+msgid "Priority will change automatically according to your status."
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "Priori_teit"
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "Ongeldige gebruikersnaam"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "Automatisch _verbinding maken als Gajim opstart"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Verbinding"
+msgid "Resour_ce:"
+msgstr "_Bron: "
 
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
+#: ../data/gui/accounts_window.ui.h:25
 #, fuzzy
-msgid "First Name:"
-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: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: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"
+msgid "Browse..."
+msgstr "_Bladeren"
 
 #: ../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 ""
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Dit bericht is versleuteld]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
+msgid "Client certificate"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Account"
 
 #: ../data/gui/accounts_window.ui.h:29
-#, fuzzy
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Indien aangevinkt zal Gajim keep-alive-paketten sturen om de verbinding in "
-"stand te houden"
+msgid "C_onnect on Gajim startup"
+msgstr "Automatisch _verbinding maken als Gajim opstart"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -349,6 +338,19 @@ msgstr ""
 "bij het opstarten"
 
 #: ../data/gui/accounts_window.ui.h:31
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Sla gespreks_logboek op voor alle contacten"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synch_roniseer account status met globale status"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -358,242 +360,253 @@ msgstr ""
 "lijstknop onderaan het roostervenster) de status van deze account "
 "meeveranderen."
 
-#: ../data/gui/accounts_window.ui.h:32
+#: ../data/gui/accounts_window.ui.h:35
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "bestandsoverdrachtlijst"
+
+#: ../data/gui/accounts_window.ui.h:36
 msgid ""
-"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."
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
 msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "Informatie over jou, zoals op de server opgeslagen"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Algemeen"
 
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
 #, fuzzy
-msgid "Last Name:"
-msgstr "Naam:"
+msgid "_Manage..."
+msgstr "Beheer..."
 
-#: ../data/gui/accounts_window.ui.h:37
+#: ../data/gui/accounts_window.ui.h:40
 #, fuzzy
-msgid "Mer_ge accounts"
-msgstr "Accounts _samenvoegen"
-
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Geen sleutel geselecteerd"
-
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Persoonlijke Informatie"
+msgid "<b>Proxy</b>"
+msgstr "<b>Eigenschappen</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_teit"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioriteit wordt in Jabber gebruikt om te bepalen welke client berichten  "
-"ontvangt als er twee keer op dezelfde account ingelogd is; de hoogste  "
-"prioriteit wint."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr ""
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Keep-alive-pakketten verzenden"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Her_noem"
+#: ../data/gui/accounts_window.ui.h:44
+#, fuzzy
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Indien aangevinkt zal Gajim keep-alive-paketten sturen om de verbinding in "
+"stand te houden"
 
 #: ../data/gui/accounts_window.ui.h:45
 #, fuzzy
-msgid "Resour_ce:"
-msgstr "_Bron: "
+msgid "Use cust_om hostname/port"
+msgstr "Gebruik aangepaste hostnaam/poort"
 
 #: ../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 ""
-"De bron wordt verstuurd naar de Jabber server om onderscheid te maken tussen "
-"twee of meer dezelfde JIDs. Op deze manier is het mogelijk om bijvoorbeeld "
-"met zowel met een bron 'Thuis' als een bron 'Werk' ingelogd te zijn. De "
-"prioriteit bepaald dan wie berichten ontvangt. (zie hieronder)"
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Hostnaam: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Sla gespreks_logboek op voor alle contacten"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Poort:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Overige</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Keep-alive-pakketten verzenden"
+msgid "Connection"
+msgstr "Verbinding"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synch_roniseer account status met globale status"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Geen sleutel geselecteerd"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Synch_roniseer account status met globale status"
+msgid "Choose _Key..."
+msgstr "Kies _Sleutel..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "_Offline Contacten Weergeven"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Gebruik aangepaste hostnaam/poort"
+msgid "_Edit Personal Information..."
+msgstr "Wijzig Persoonlijke Informatie..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Gebruik aangepaste hostnaam/poort"
+msgid "Information about you, as stored in the server"
+msgstr "Informatie over jou, zoals op de server opgeslagen"
 
 #: ../data/gui/accounts_window.ui.h:57
-#, fuzzy
-msgid "Use file transfer proxies"
-msgstr "bestandsoverdrachtlijst"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Persoonlijke Informatie</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Persoonlijke Informatie"
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Wijzig Persoonlijke Informatie..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Automatisch _verbinding maken als Gajim opstart"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Inschakelen"
+msgid "Synchroni_ze account status with global status"
+msgstr "Synch_roniseer account status met globale status"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Hostnaam: "
+msgid "Use cust_om port:"
+msgstr "Gebruik aangepaste hostnaam/poort"
+
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
 
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
 #, fuzzy
-msgid "_Manage..."
-msgstr "Beheer..."
+msgid "First Name:"
+msgstr "Naam:"
 
 #: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/zeroconf_information_window.ui.h:9
 #, fuzzy
-msgid "_Port: "
-msgstr "_Poort:"
+msgid "Last Name:"
+msgstr "Naam:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
 
-#: ../data/gui/add_new_contact_window.ui.h:1
+#: ../data/gui/accounts_window.ui.h:68
 #, fuzzy
-msgid "A_ccount:"
-msgstr "Account"
+msgid "Mer_ge accounts"
+msgstr "Accounts _samenvoegen"
+
+#: ../data/gui/add_new_contact_window.ui.h:1
+msgid "Add New Contact"
+msgstr "Nieuwe Contact Toevoegen"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
 #, fuzzy
-msgid "A_llow this contact to view my status"
-msgstr "Sta hem/haar toe mijn status te zien"
+msgid "A_ccount:"
+msgstr "Account"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Nieuwe Contact Toevoegen"
+#, fuzzy
+msgid "_Protocol:"
+msgstr "Protocol:"
 
-#: ../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 "Ik wil je graag toevoegen aan mijn contactlijst"
+#: ../data/gui/add_new_contact_window.ui.h:4
+#, fuzzy
+msgid "_User ID:"
+msgstr "Gebruikers ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
-msgid ""
-"You have to register with this transport\n"
-"to be able to add a contact from this\n"
-"protocol. Click on register button to\n"
-"proceed."
-msgstr ""
-
-#: ../data/gui/add_new_contact_window.ui.h:9
-msgid ""
-"You must be connected to the transport to be able\n"
-"to add a contact from this protocol."
-msgstr ""
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+#, fuzzy
+msgid "_Nickname:"
+msgstr "Bijnaam:"
 
-#: ../data/gui/add_new_contact_window.ui.h:11
+#: ../data/gui/add_new_contact_window.ui.h:6
 #, fuzzy
 msgid "_Group:"
 msgstr "Groep:"
 
-#: ../data/gui/add_new_contact_window.ui.h:12
+#: ../data/gui/add_new_contact_window.ui.h:7
 #, fuzzy
-msgid "_Nickname:"
-msgstr "Bijnaam:"
+msgid "A_llow this contact to view my status"
+msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/gui/add_new_contact_window.ui.h:13
+#: ../data/gui/add_new_contact_window.ui.h:8
 #, fuzzy
-msgid "_Protocol:"
-msgstr "Protocol:"
+msgid "_Save subscription message"
+msgstr "_Abonnement"
 
-#: ../data/gui/add_new_contact_window.ui.h:14
+#: ../data/gui/add_new_contact_window.ui.h:9
+msgid ""
+"You have to register with this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/gui/add_new_contact_window.ui.h:13
 #, fuzzy
 msgid "_Register"
 msgstr "Re_gistreer"
 
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Abonnement"
+#: ../data/gui/add_new_contact_window.ui.h:14
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:16
-#, fuzzy
-msgid "_User ID:"
-msgstr "Gebruikers ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-#, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "Een protocolfout is opgetreden:"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr ""
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
@@ -602,362 +615,173 @@ msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
-msgid "Error description..."
-msgstr "Beschrijving"
+msgid "Please wait while the command is being sent..."
+msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Afronden"
+msgid "Please wait..."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-#, fuzzy
-msgid "Please wait while retrieving command list..."
-msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
+msgid "This jabber entity does not expose any commands."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
 #, fuzzy
-msgid "Please wait while the command is sending..."
-msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
+msgid "<b>An error has occurred:</b>"
+msgstr "Een protocolfout is opgetreden:"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr ""
+#, fuzzy
+msgid "Error description..."
+msgstr "Beschrijving"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr ""
+#, fuzzy
+msgid "F_inish"
+msgstr "_Afronden"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Beschrijving</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Geavanceerde Configuratie Wijzigen"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr ""
+msgid "Filter:"
+msgstr "Filter:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Geavanceerde Configuratie Wijzigen"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Beschrijving</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Herstel naar Standaard Kleuren"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Wis MOTD"
+msgid "Show _XML Console"
+msgstr "_XML Console Weergeven"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Start Gesprek"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "Ver_stuur Server Bericht"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Stel MOTD in"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Stelt het Bericht van de Dag in"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "_XML Console Weergeven"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Stel MOTD in"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Werkt Bericht van de Dag bij"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "MOTD Bijwerken"
 
-#: ../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:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Wis MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "Ver_stuur Server Bericht"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-#, fuzzy
-msgid "<b>Actions</b>"
-msgstr "<b>Toepassingen</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-#, fuzzy
-msgid "<b>Conditions</b>"
-msgstr "<b>Geluiden</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Geluiden</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-#, fuzzy
-msgid "Advanced Actions"
-msgstr "Gea_vanceerde Acties"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-#, fuzzy
-msgid "Advanced Notifications Control"
-msgstr "Geavanceerde Configuratie Wijzigen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-#, fuzzy
-msgid "All statuses"
-msgstr "Status: "
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Afwezig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-#, fuzzy
-msgid "Busy "
-msgstr "Bezig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Contact is Uitgelogd"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contact is Ingelogd"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Bestandsoverdrachten"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Bestandsoverdracht Verzoek"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Bestandsoverdracht Gestopt"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Nieuw Bericht"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Onzichtbaar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-#, fuzzy
-msgid "Launch a command"
-msgstr "commando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Niet Beschikbaar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-#, fuzzy
-msgid "Online / Free For Chat"
-msgstr "Open voor Gesprek"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-#, fuzzy
-msgid "Play a sound"
-msgstr "Speel _geluiden af"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nieuw Privé Bericht"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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 ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-#, fuzzy
-msgid "_Disable auto opening chat window"
-msgstr ""
-"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-#, fuzzy
-msgid "_Open chat window with user"
-msgstr "Gebruik enkel gespreksvenster met _tabs"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Alleen in _rooster weergeven"
+msgid "Deletes Message of the Day"
+msgstr "Zal het Bericht van de Dag wissen"
 
-#: ../data/gui/advanced_notifications_window.ui.h:36
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "_Show event in roster"
-msgstr "Alleen in _rooster weergeven"
+msgid "No"
+msgstr "Geen"
 
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:38
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "contact(s)"
-msgstr "_Inhoud"
+msgid "Prefer"
+msgstr "Voorkeuren"
 
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-#, fuzzy
-msgid "for "
-msgstr "Poort: "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Groep"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:2
+#: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Local</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:4
+#: ../data/gui/archiving_preferences_window.ui.h:9
 #, fuzzy
 msgid "Auto"
 msgstr "Automatisch binnengaan"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
-msgstr ""
+#: ../data/gui/atom_entry_window.ui.h:1
+#, fuzzy
+msgid "New entry received"
+msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Geen"
-
-#: ../data/gui/archiving_preferences_window.ui.h:8
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
-msgid "Prefer"
-msgstr "Voorkeuren"
-
-#: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+msgid "Feed name:"
+msgstr "thema naam"
 
-#: ../data/gui/atom_entry_window.ui.h:1
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "Entry:"
 msgstr "Land:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
-#, fuzzy
-msgid "Feed name:"
-msgstr "thema naam"
-
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:5
 #, fuzzy
 msgid "Last modified:"
 msgstr "Naam:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-#, fuzzy
-msgid "New entry received"
-msgstr "Als een nieuwe gebeurtenis ontvangen is"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
 msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
@@ -966,28 +790,23 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
@@ -995,32 +814,37 @@ msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 msgid "<b>Mood:</b>"
 msgstr "<b>Geluiden</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Verander Wachtwoord"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Geef opnieuw op ter bevestiging:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Geef nieuw wachtwoord op:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Geef opnieuw op ter bevestiging:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
 #, fuzzy
-msgid "<b>Type your new status message</b>"
-msgstr "Typ je nieuwr statusbericht:"
+msgid "Save as Preset..."
+msgstr "Sla Bestand op als..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Actief"
+msgid "Mood:"
+msgstr "Ruimte:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Ruimte:"
+msgid "Activity:"
+msgstr "Actief"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 #, fuzzy
@@ -1029,296 +853,284 @@ msgstr "statusbericht"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
 #, fuzzy
-msgid "Save as Preset..."
-msgstr "Sla Bestand op als..."
+msgid "<b>Type your new status message</b>"
+msgstr "Typ je nieuwr statusbericht:"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Neem deel aan _Groepsgesprek"
+msgid "_Copy Link Location"
+msgstr "_Kopieer Link Lokatie"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Toevoegen aan Roster"
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopieer JID/Email Adres"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopieer Link Lokatie"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Open Email Samensteller"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr ""
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Neem deel aan _Groepsgesprek"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Toevoegen aan Roster"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, 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:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Voegt contact toe aan rooster"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "let op deze conversatie"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "let op deze conversatie"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Bericht verzenden"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "Ver_stuur"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Onzichtbaar"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Server"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-
-#: ../data/gui/contact_context_menu.ui.h:1
 #, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
+msgid "MUC server"
+msgstr "Server"
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "<b>Visuele Meldingen</b>"
+msgid "In_vite"
+msgstr "Onzichtbaar"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Wijs Open_PGP Sleutel toe"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Start _Gesprek"
 
-#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
 #, fuzzy
-msgid "E_xecute Command..."
-msgstr "commando"
+msgid "Send Single _Message..."
+msgstr "Enkel _Bericht Verzenden"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Wijzig _Groepen"
+msgid "Send _File..."
+msgstr "_Bestand Verzenden"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "_Inhoud"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Schakel Open_PGP Codering om"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Verwijder"
+msgid "Toggle End to End Encryption"
+msgstr "Schakel Open_PGP Codering om"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "commando"
+
 #: ../data/gui/contact_context_menu.ui.h:10
 #, fuzzy
-msgid "Send Single _Message..."
-msgstr "Enkel _Bericht Verzenden"
+msgid "M_anage Contact"
+msgstr "_Inhoud"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "_Bestand Verzenden"
+msgid "_Rename..."
+msgstr "_Hernoem"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Wijzig _Groepen"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Start _Gesprek"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Wijs Open_PGP Sleutel toe"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Schakel Open_PGP Codering om"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Schakel Open_PGP Codering om"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "<b>Visuele Meldingen</b>"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Abonnement"
 
 #: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
-msgid "_Allow him/her to see my status"
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
 #: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
-msgid "_Forbid him/her to see my status"
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Geschiedenis"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "_Inhoud"
+msgid "_Unignore"
+msgstr "_Verder"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Hernoem"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Abonnement"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Verwijder"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "_Verder"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Geschiedenis"
 
 #: ../data/gui/data_form_window.ui.h:1
+msgid "Room Configuration"
+msgstr "Ruimte Configuratie"
+
+#: ../data/gui/data_form_window.ui.h:2
 #, fuzzy
 msgid "Fill in the form."
 msgstr "In de groep"
 
-#: ../data/gui/data_form_window.ui.h:2
-msgid "Room Configuration"
-msgstr "Ruimte Configuratie"
-
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Wijzig Groepen"
@@ -1332,62 +1144,52 @@ msgstr "<b>Beschrijving</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Server Mogelijkheden"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
+msgid "File Transfers"
+msgstr "Bestandsoverdrachten"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Bestandsoverdracht annuleren"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr "Laat een lijst met bestandsoverdrachten zien tussen jou en ander"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Annuleert de geselecteerde bestandsoverdracht"
+msgid "file transfers list"
+msgstr "bestandsoverdrachtlijst"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Annuleert de geselecteerde bestandsoverdracht en verwijdert het onvolledige "
-"bestand"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Ruim _op"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Bestandsoverdrachten"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Verbergt het venster"
-
-#: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Verwijder bestandsoverdracht van de lijst."
-
-#: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Verwijdert afgeronde, geannuleerde en mislukte bestandsoverdrachten van de "
 "lijst"
 
-#: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr "Laat een lijst met bestandsoverdrachten zien tussen jou en ander"
+#: ../data/gui/filetransfers.ui.h:8
+msgid "Remove file transfer from the list."
+msgstr "Verwijder bestandsoverdracht van de lijst."
 
-#: ../data/gui/filetransfers.ui.h:11
+#: ../data/gui/filetransfers.ui.h:9
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1395,112 +1197,124 @@ msgstr ""
 "Deze actie verwijdert een enkele bestandsoverdracht van de lijst. Als de "
 "overdracht actief is, wordt hij eerst gestopt en dan verwijdert"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Ruim _op"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pauze"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr ""
+"Annuleert de geselecteerde bestandsoverdracht en verwijdert het onvolledige "
+"bestand"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Verder"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Bestandsoverdracht annuleren"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
+msgid "Cancels the selected file transfer"
+msgstr "Annuleert de geselecteerde bestandsoverdracht"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Open Bovenliggende Map"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Verbergt het venster"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pauze"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Verder"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "bestandsoverdrachtlijst"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Open Bovenliggende Map"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr ""
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Account"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Vetgedrukt"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Groep"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "_Inhoud"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr ""
+msgid "Gajim Themes Customization"
+msgstr "Gajim Themas Aanpassen"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "_Inhoud"
+msgid "Text _color:"
+msgstr "Tekst_kleur"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Letterstijl:"
+msgid "_Background:"
+msgstr "_Achtergrond:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim Themas Aanpassen"
+msgid "Text _font:"
+msgstr "Letter_type"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-#, fuzzy
-msgid "Gone"
-msgstr "Geen"
+msgid "Font style:"
+msgstr "Letterstijl:"
 
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Groep"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Vetgedrukt"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
+msgid "Italic"
+msgstr "Schuingedrukt"
+
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Gepauzeerd"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
 #, fuzzy
 msgid "Inactive"
 msgstr "Actief"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
-msgid "Italic"
-msgstr "Schuingedrukt"
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
 
-#: ../data/gui/gajim_themes_window.ui.h:13
+#: ../data/gui/gajim_themes_window.ui.h:16
+#, fuzzy
+msgid "Gone"
+msgstr "Geen"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "_Bericht"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Gepauzeerd"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Tekst_kleur"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Letter_type"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Achtergrond:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1508,91 +1322,101 @@ msgstr "Verander Bij_naam"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Beheer Bladwijzers"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Verander _Onderwerp"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Configureer _Ruimte"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Maak _Bladwijzer Voor Deze Ruimte"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Beschrijving: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Beheer Bladwijzers"
+msgid "_Request Voice"
+msgstr "_Stem"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "_Beheerder"
+msgid "_Send Private Message"
+msgstr "Ver_stuur Privé Bericht"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "_Bestand Verzenden"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Gebruiker Acties"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "_Bestand Verzenden"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Toevoegen aan Roster"
+msgid "_Voice"
+msgstr "_Stem"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "_Beheerder"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Lid"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "Ver_bannen"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Eigenaar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Lid"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Eigenaar"
+msgid "_Ban"
+msgstr "Ver_bannen"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "Ver_stuur Privé Bericht"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Stem"
+msgid "_Add to Roster"
+msgstr "_Toevoegen aan Roster"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+msgid "Show a list of formattings"
+msgstr "Klik om een emoticon in te voegen (Alt+E)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Verander Bij_naam"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Verander Bij_naam"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1604,37 +1428,19 @@ msgid "From:"
 msgstr "Van:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Onderwerp:"
 
 #: ../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."
+msgid "Gajim History Logs Manager"
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-#, fuzzy
-msgid "Delete"
-msgstr "Wis MOTD"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1643,177 +1449,198 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:8
 #, fuzzy
 msgid "_Search Database"
 msgstr "_Zoek"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Status: "
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Gespreksgeschiedenis"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr ""
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Contactnaam"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Groupsgesprek"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Status: "
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Gespreksgeschiedenis"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "_Zoek"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "Houdt status veranderingen van contacten bij in het logboek"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
+#: ../src/gajim-remote.py:230
+msgid "jid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Host:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Ruimte:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Recent:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recent:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Ruimte:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+msgid "Bro_wse Rooms"
+msgstr "_Bladeren"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Binnengaan"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automatisch binnengaan"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
-"tijdens het opstarten"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Beheer Bladwijzers"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titel:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
 #, fuzzy
-msgid "Print status:"
+msgid "Pr_int status:"
 msgstr "Print tijd:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatisch binnengaan"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
+"tijdens het opstarten"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titel:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1826,103 +1653,105 @@ msgid "_Configure"
 msgstr "_Verder"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Eigenschappen</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "HTTP Verbinden"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Instellingen</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "HTTP Verbinden"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Wachtwoord:"
+#, fuzzy
+msgid "_Name:"
+msgstr "_Naam: "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Eigenschappen</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Poort:"
+msgid "Use HTTP prox_y"
+msgstr "_Gebruik proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
+msgid "_BOSH URL:"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Gebruik proxy"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Gebruik aanmelding"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Gebruikersnaam:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr ""
+msgid "Pass_word:"
+msgstr "_Wachtwoord:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
 #, fuzzy
-msgid "_Name:"
-msgstr "_Naam: "
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Type:"
+msgid "Proxy _Port:"
+msgstr "_Poort:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Gebruikersnaam:"
+msgid "<b>Settings</b>"
+msgstr "<b>Instellingen</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Beheer Accounts"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Toestemmen"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
-msgid "Available"
-msgstr "Niet Beschikbaar"
+msgid "Version:"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Verder"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Beschrijving: %s"
+msgid "Authors:"
+msgstr "_Toestemmen"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1930,38 +1759,32 @@ msgid "Homepage:"
 msgstr "Homepage:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Vastgelopen"
+msgid "Description:"
+msgstr "Beschrijving: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Verder"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
+#, fuzzy
+msgid "Installed"
+msgstr "Vastgelopen"
 
 #: ../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"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1975,517 +1798,506 @@ msgid "Event desc"
 msgstr "Gebeurtenissen"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Geavanceerde Instellingen Wijzigen</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Toepassingen</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Aangepast</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Toepassingen</b>"
+msgid "All chat states"
+msgstr "Status: "
 
 #: ../data/gui/preferences_window.ui.h:4
-#, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Toepassingen</b>"
+msgid "Composing only"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Formatteer een gespreksregel</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Formatteer een gespreksregel</b>"
+msgid "Never"
+msgstr "_Nooit"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Visuele Meldingen</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Geluiden</b>"
+msgid "Always"
+msgstr "Afwezig"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Opduiken"
 
-#. 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>Aangepast</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Stel mij ervan op de hoogte"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Geluiden</b>"
+msgid "Show only in roster"
+msgstr "Alleen in _rooster weergeven"
 
 #: ../data/gui/preferences_window.ui.h:12
-#, fuzzy
-msgid "<b>GMail Options</b>"
-msgstr "<b>Toepassingen</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<b>Eigenschappen</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
+msgid "Last state"
+msgstr "Standaard _status iconenset:"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Voorkeuren"
 
 #: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Eigenschappen</b>"
+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:20
 #, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Formatteer een gespreksregel</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
+"zien"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visuele Meldingen</b>"
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
+msgstr "Statusberichten van contacten weergeven in het rooster"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Indien aangevinkt zal Gajim statusberichten van contacten onder de "
+"contactnaam in het roostervenster laten zien."
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Geavanceerd"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Geavanceerd"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
+"zien"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Status: "
+msgid "Sort contacts by status"
+msgstr "Sorteer contacten op status"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Sta toe informatie over _besturingssysteem te verzenden"
+#, fuzzy
+msgid "in _roster"
+msgstr "niet in het rooster"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Sta toe informatie over _besturingssysteem te verzenden"
+msgid "in _group chats"
+msgstr "Neem deel aan _Groepsgesprek"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Laat popups/mededelingen zien als ik _afwezig/niet beschikbaar/bezig/"
-"onzichtbaar ben"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
 #, fuzzy
-msgid "Always"
-msgstr "Afwezig"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
+"bijpassende grafische emoticons"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Vraag om status bericht als ik:"
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Beheer Emoticons"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Bericht verzenden en venster sluiten"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
+#, 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:34
-msgid "Audio output device"
+msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "Status bericht:"
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
+msgid "_Highlight misspelled words"
+msgstr "Verkeerd gespelde woorden _markeren"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
+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:38
-msgid "Configure color and font of the interface"
-msgstr ""
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "_Rooster Weergeven"
 
 #: ../data/gui/preferences_window.ui.h:39
-#, fuzzy
-msgid "Contact's message:"
-msgstr "Status bericht:"
+msgid "Show icon when your messages are received"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Contactnaam"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Aangepast</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Geef mij bericht over contacten die: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Geef mij bericht over contacten die: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
+"in beeld"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
+"Laat popups/mededelingen zien als ik _afwezig/niet beschikbaar/bezig/"
+"onzichtbaar ben"
 
 #: ../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"
+msgid "Notify on new _GMail email"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
 
 #: ../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"
+msgid "Display _extra email details"
+msgstr ""
 
 #: ../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"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
+"zien"
 
 #: ../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"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Toepassingen</b>"
 
 #: ../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"
+msgid "Show notification area icon:"
+msgstr "_Icoon in mededelingsgebied"
 
 #: ../data/gui/preferences_window.ui.h:53
-#, fuzzy
-msgid "Display status _messages of contacts in roster"
-msgstr "Statusberichten van contacten weergeven in het rooster"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Visuele Meldingen</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-#, fuzzy
-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 kan de gesprekstoestanden versturen en ontvangen"
+msgid "Play _sounds"
+msgstr "Speel _geluiden af"
 
 #: ../data/gui/preferences_window.ui.h:55
 #, fuzzy
-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 kan de gesprekstoestanden versturen en ontvangen"
+msgid "Ma_nage..."
+msgstr "Beheer..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 msgstr ""
-"Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
-"in beeld"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Geluiden</b>"
 
 #: ../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."
+msgid "Notifications"
+msgstr "Account Wijziging"
 
 #: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
-"tijdens het opstarten"
+"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 kan de gesprekstoestanden versturen en ontvangen"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Gesprekstoestands _mededelingen:"
 
 #: ../data/gui/preferences_window.ui.h:61
 #, fuzzy
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
-"Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
-"weergeven"
+"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 kan de gesprekstoestanden versturen en ontvangen"
 
 #: ../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 ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Gesprekstoestands _mededelingen:"
 
 #: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
-"zien"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Visuele Meldingen</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
 #, fuzzy
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"Indien aangevinkt zal Gajim statusberichten van contacten onder de "
-"contactnaam in het roostervenster laten zien."
+msgid "Personal Events"
+msgstr "Persoonlijke Informatie"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
-"zien"
+msgid "_Away after:"
+msgstr "Automatisch _afwezig na:"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
-"zien"
+"Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
+"weergeven"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
-"zien"
+msgid "_Not available after:"
+msgstr "Automatisch _niet beschikbaar na:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
-"zien"
 
 #: ../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 ""
+msgid "minutes"
+msgstr "minuten"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Vink deze optie alleen aan als iemand niet op je rooster je spamt of "
-"lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
-"contacten niet op je rooster geblokkeerd"
-
-#: ../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:72
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Indien aangevinkt zal Gajim iconen gebruiken die bij het protocol horen. "
-"(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
-"status online, afwezig, bezig, enz...)"
-
-#: ../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:75
-#, fuzzy
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
-"bijpassende grafische emoticons"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Toepassingen</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Bericht verzenden en venster sluiten"
+msgid "Ask status message when I:"
+msgstr "Vraag om status bericht als ik:"
 
 #: ../data/gui/preferences_window.ui.h:78
-#, fuzzy
-msgid "Ma_nage..."
-msgstr "Beheer..."
+msgid "Sign _in"
+msgstr "_Inloggen"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Nooit"
+msgid "Sign _out"
+msgstr "_Uitloggen"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Account Wijziging"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Geef mij bericht over contacten die: "
+msgid "<b>Status Messages</b>"
+msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Geef mij bericht over contacten die: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../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:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
+msgid "Use system _default"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Status bericht:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Persoonlijke Informatie"
+msgid "<b>Font</b>"
+msgstr "<b>Geluiden</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Speel _geluiden af"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Gebruik _transport iconensets"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Opduiken"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Indien aangevinkt zal Gajim iconen gebruiken die bij het protocol horen. "
+"(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
+"status online, afwezig, bezig, enz...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Voorkeuren"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Standaard _status iconenset:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
+msgid "Configure color and font of the interface"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:91
+#, fuzzy
+msgid "T_heme:"
+msgstr "Thema:"
+
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Eigenschappen</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "_Icoon in mededelingsgebied"
+msgid "Contact's nickname:"
+msgstr "Contactnaam"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Alleen in _rooster weergeven"
+msgid "Your nickname:"
+msgstr "Voor bijnaam:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Inloggen"
+#, fuzzy
+msgid "_Status message:"
+msgstr "Status bericht:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Uitloggen"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Herstel naar Standaard Kleuren"
 
 #: ../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 ""
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Status bericht:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "Sorteer contacten op status"
+msgid "Your message:"
+msgstr "Fout bij lezen bestand:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Groupsgesprek"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Standaard _status iconenset:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2493,574 +2305,588 @@ msgid "Style"
 msgstr "Vastgelopen"
 
 #: ../data/gui/preferences_window.ui.h:103
-#, fuzzy
-msgid "T_heme:"
-msgstr "Thema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Toepassingen</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Gebruik _transport iconensets"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr ""
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Als een nieuwe gebeurtenis ontvangen is"
+msgid "<b>Connection</b>"
+msgstr "<b>Geluiden</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
-msgid "Your message:"
-msgstr "Fout bij lezen bestand:"
+msgid "_File manager:"
+msgstr "Bestandsbeheerder:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Voor bijnaam:"
+msgid "_Mail client:"
+msgstr "_Mail client:"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Automatisch _afwezig na:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Gesprekstoestands _mededelingen:"
+msgid "<b>Custom</b>"
+msgstr "<b>Aangepast</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Beheer Emoticons"
+msgid "<b>Applications</b>"
+msgstr "<b>Toepassingen</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-#, fuzzy
-msgid "_File manager:"
-msgstr "Bestandsbeheerder:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "Verkeerd gespelde woorden _markeren"
+#, fuzzy
+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 ""
+"Vink deze optie alleen aan als iemand niet op je rooster je spamt of "
+"lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
+"contacten niet op je rooster geblokkeerd"
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Sta toe informatie over _besturingssysteem te verzenden"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
+#, fuzzy
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
 msgstr ""
+"Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
+"tijdens het opstarten"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "Houdt status veranderingen van contacten bij in het logboek"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Sta toe informatie over _besturingssysteem te verzenden"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Mail client:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
+"tijdens het opstarten"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Automatisch _niet beschikbaar na:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-#, fuzzy
-msgid "_Open..."
-msgstr "Open..."
+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:132
 #, fuzzy
-msgid "_Reset to Default Colors"
-msgstr "Herstel naar Standaard Kleuren"
+msgid "Allow my _idle time to be sent"
+msgstr "Sta toe informatie over _besturingssysteem te verzenden"
 
 #: ../data/gui/preferences_window.ui.h:133
-#, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Gesprekstoestands _mededelingen:"
-
-#: ../data/gui/preferences_window.ui.h:134
-#, fuzzy
-msgid "_Status message:"
-msgstr "Status bericht:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<b>Eigenschappen</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "in _group chats"
-msgstr "Neem deel aan _Groepsgesprek"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
-msgid "in _roster"
-msgstr "niet in het rooster"
+msgid "_Open..."
+msgstr "Open..."
 
-#: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minuten"
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Geavanceerde Instellingen Wijzigen</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Geavanceerd"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Start Gesprek"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
 msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:2
-#, fuzzy
-msgid "<b>List of rules</b>"
-msgstr "<b>Formatteer een gespreksregel</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 #, fuzzy
 msgid "Active on each startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+#, fuzzy
+msgid "<b>List of rules</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
+msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "_Abonnement"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Weigeren"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+#, fuzzy
+msgid "all in the group"
+msgstr "In de groep"
+
 #: ../data/gui/privacy_list_window.ui.h:11
 #, fuzzy
-msgid "Order:"
-msgstr "Server:"
+msgid "all by subscription"
+msgstr "_Abonnement"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
 msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:13
 #, fuzzy
-msgid "all by subscription"
-msgstr "_Abonnement"
+msgid "to send me messages"
+msgstr "Bericht verzenden"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-#, fuzzy
-msgid "all in the group"
-msgstr "In de groep"
+msgid "to send me queries"
+msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:15
 #, fuzzy
-msgid "both"
-msgstr "Beide"
+msgid "to view my status"
+msgstr "Sta hem/haar toe mijn status te zien"
 
 #: ../data/gui/privacy_list_window.ui.h:16
 #, fuzzy
-msgid "from"
-msgstr "Van"
+msgid "to send me status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "Geen"
+msgid "All (including subscription)"
+msgstr "_Abonnement"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr ""
+#, fuzzy
+msgid "Order:"
+msgstr "Server:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
-msgid "to send me messages"
-msgstr "Bericht verzenden"
+msgid "none"
+msgstr "Geen"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr ""
+#, fuzzy
+msgid "both"
+msgstr "Beide"
 
 #: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
-msgid "to send me status"
-msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
+msgid "from"
+msgstr "Van"
 
 #: ../data/gui/privacy_list_window.ui.h:22
+msgid "to"
+msgstr ""
+
+#. Family Name
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "to view my status"
-msgstr "Sta hem/haar toe mijn status te zien"
+msgid "<b>Family:</b>"
+msgstr "Familie:"
 
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
+#. Middle Name
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Address</b>"
+msgid "<b>Middle:</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../data/gui/profile_window.ui.h:2
+#. Prefix in Name
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Stel Contact_afbeelding in"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Eigenschappen</b>"
 
-#: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
+#. Given Name
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Verjaardag:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#. Suffix in Name
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Aangepast</b>"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Geluiden</b>"
 
-#: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
-msgid "<b>Company:</b>"
+msgid "<b>Full Name</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Geluiden</b>"
+msgid "<b>Street:</b>"
+msgstr "<b>Instellingen</b>"
 
-#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Afdeling:"
+msgid "<b>City:</b>"
+msgstr "<b>Aangepast</b>"
 
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "E-Mail:"
+msgid "<b>State:</b>"
+msgstr "<b>Instellingen</b>"
 
-#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Extra Adres:"
 
-#. Family Name
-#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familie:"
+msgid "<b>Postal Code:</b>"
+msgstr "Postcode:"
 
-#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Full Name</b>"
-msgstr "<b>Aangepast</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Geluiden</b>"
 
-#. Given Name
-#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>Address</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Homepage:"
 
-#. Middle Name
-#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-#, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Formatteer een gespreksregel</b>"
-
-#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Bijnaam:"
 
-#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefoonnummer:"
 
-#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-#, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Geluiden</b>"
-
-#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-#, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Postcode:"
-
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-#, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Eigenschappen</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formaat: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Geluiden</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Verjaardag:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Instellingen</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "E-Mail:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Instellingen</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Stel Contact_afbeelding in"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr ""
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Geluiden</b>"
+msgid "Personal Info"
+msgstr "Persoonlijke Informatie"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Aangepast</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Info"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Geluiden</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr ""
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Afdeling:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formaat: YYYY-MM-DD"
-
-#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
 #, fuzzy
-msgid "Personal Info"
-msgstr "Persoonlijke Informatie"
+msgid "<b>Role:</b>"
+msgstr "<b>Geluiden</b>"
 
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Werk"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Wat wil je doen?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Info"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Verwijder account alleen van Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Verwijder account van Gajim en van de server"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Wat wil je doen?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Verwijder"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Contact Toevoegen..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Acties"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Server Mogelijkheden"
+msgid "Add _Contact..."
+msgstr "_Contact Toevoegen..."
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Bestands_overdrachten"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "Be_werken"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Veel Gestelde Vragen (online)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Accounts"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Hulp online"
+#: ../data/gui/roster_window.ui.h:11
+#, fuzzy
+msgid "Profile, A_vatar"
+msgstr "Profiel, Contactafbeelding"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:13
 #, fuzzy
-msgid "Profile, A_vatar"
-msgstr "Profiel, Contactafbeelding"
+msgid "_View"
+msgstr "_Stem"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "_Offline Contacten Weergeven"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:16
 #, fuzzy
-msgid "Show Trans_ports"
+msgid "Show T_ransports"
 msgstr "Transporten"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "_Offline Contacten Weergeven"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "_Rooster Weergeven"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Accounts"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Bestands_overdrachten"
 
-#. 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 "_Acties"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Hulp"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "Be_werken"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Hulp online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Hulp"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Enkel _Bericht Verzenden"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Veel Gestelde Vragen (online)"
 
 #: ../data/gui/roster_window.ui.h:25
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "_View"
-msgstr "_Stem"
+msgid "Fea_tures"
+msgstr "Server Mogelijkheden"
 
 #: ../data/gui/search_window.ui.h:1
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
+msgid "Search"
+msgstr "_Zoek"
 
 #: ../data/gui/search_window.ui.h:2
 #, fuzzy
-msgid "Search"
-msgstr "_Zoek"
+msgid "Please wait while retrieving search form..."
+msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
@@ -3068,12 +2894,12 @@ msgid "_Add contact"
 msgstr "_Contact Toevoegen"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Contact Informatie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Zoek"
 
@@ -3093,45 +2919,37 @@ msgstr "Registreer naar"
 msgid "_Cancel"
 msgstr "_Annulerem"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Beantwoord dit bericht"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Aan:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Verzen_d"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Bericht verzenden"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Bericht verzenden en venster sluiten"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "Be_antwoord"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Aan:"
+msgid "Reply to this message"
+msgstr "Beantwoord dit bericht"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "Be_antwoord"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Ver_stuur & Sluit"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Bericht verzenden en venster sluiten"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-#, fuzzy
-msgid "Au_thorize"
-msgstr "_Toestemmen"
+msgid "Subscription Request"
+msgstr "Abonneringsverzoek"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-#, fuzzy
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
-"Geef contact toestemming mijn status op te halen, zodat hij weet wanneer ik "
-"online ben"
+msgid "_Deny"
+msgstr "_Weigeren"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
@@ -3140,283 +2958,298 @@ msgid ""
 "connected"
 msgstr "Geef contact geen toestemming om te zien of je online bent"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Abonneringsverzoek"
+#: ../data/gui/subscription_request_window.ui.h:6
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Toestemmen"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Weigeren"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+"Geef contact toestemming mijn status op te halen, zodat hij weet wanneer ik "
+"online ben"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "_Offline Contacten Weergeven"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-#, fuzzy
-msgid "Select the contacts you want to synchronise"
-msgstr "JID van de contact waar je me in gesprek wilt gaan"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/gui/systray_context_menu.ui.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
-msgid "Mute Sounds"
-msgstr "Wav Geluiden"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Enkel _Bericht Verzenden"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
+msgid "Select the contacts you want to synchronise"
+msgstr "JID van de contact waar je me in gesprek wilt gaan"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Groupsgesprek"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Toepassingen</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Enkel _Bericht Verzenden"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Aangepast</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
 
-#: ../data/gui/vcard_information_window.ui.h:8
+#: ../data/gui/systray_context_menu.ui.h:6
 #, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Instellingen</b>"
+msgid "Mute Sounds"
+msgstr "Wav Geluiden"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Contact Informatie"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Bron:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Instellingen</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Beschrijving</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Aangepast</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
-msgid "Comments"
-msgstr "Commentaar: %s"
+msgid "<b>Contact time:</b>"
+msgstr "<b>Instellingen</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "Stel Contact_afbeelding in"
+
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>Configured avatar:</b>"
 msgstr "Configureer _Ruimte"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
-msgid "Contact"
-msgstr "_Inhoud"
+msgid "<b>Subscription:</b>"
+msgstr "<b>Beschrijving</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Contact Informatie"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Toepassingen</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Meer"
 
-#: ../data/gui/vcard_information_window.ui.h:48
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
 #, fuzzy
-msgid "User avatar:"
-msgstr "Kies een Contactafbeelding"
+msgid "Contact"
+msgstr "_Inhoud"
 
-#: ../data/gui/xml_console_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:49
 #, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Geluiden</b>"
+msgid "Comments"
+msgstr "Commentaar: %s"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Verkeer</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Invoer</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Vraag (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Geluiden</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Vraag (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Aanwezigheid"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Bericht"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Aanwezigheid"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Invoer</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "Account Be_werken..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr ""
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-#, fuzzy
-msgid "Personal"
-msgstr "Persoonlijke Informatie"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Bron:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
+#: ../data/gui/zeroconf_information_window.ui.h:11
+#, fuzzy
+msgid "Personal"
+msgstr "Persoonlijke Informatie"
+
+#: ../data/gajim.desktop.in.in.h:2
+msgid "Jabber IM Client"
+msgstr "Jabber IM Client"
+
 # TODO: Loop alles na, zet zinnen in de goede vorm, volg GNOME NL richtlijnen,
 #       ruim mnemonics op. Zie ook: http://nl.gnome.org/
-#: ../data/gajim.desktop.in.in.h:1
+#: ../data/gajim.desktop.in.in.h:3
 msgid "A GTK+ Jabber client"
 msgstr "Een GTK+ Jabber client"
 
-#: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
 msgstr ""
 
-#: ../data/gajim.desktop.in.in.h:3
-msgid "Jabber IM Client"
-msgstr "Jabber IM Client"
-
-#: ../src/adhoc_commands.py:323
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Contact Informatie"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Ongeldige invoer"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr ""
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Activated"
 msgstr "Actief"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Deactivated"
 msgstr "Actief"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 #, fuzzy
 msgid "Integer"
 msgstr "In de groep"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Voorkeur Naam"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Waarde"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Niets)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Verborgen"
 
@@ -3427,246 +3260,179 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] ""
 msgstr[1] ""
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "German"
-msgstr "Algemeen"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Greek"
-msgstr "groen"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Croatian"
-msgstr "Locatie"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Italian"
-msgstr "Schuingedrukt"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Polish"
-msgstr "_Publiceren"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Serbian"
-msgstr "Algemeen"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
+#: ../src/chat_control.py:209
+msgid "Ping?"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
+#: ../src/chat_control.py:219
+msgid "Error."
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "Onderstreept"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Uit_schoppen"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "Lettertype:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Contact Informatie"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Het statusbericht voor automatisch niet beschikbaar"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Bestand Verzenden"
+
+#: ../src/chat_control.py:1785
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Gebruik aanmelding"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Gebruik aanmelding"
@@ -3674,66 +3440,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, 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:2566
+#: ../src/chat_control.py:2797
 #, 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:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3741,355 +3507,739 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Bestandsoverdrachten"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Grootte: "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Accepteer"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Bestandsoverdracht afgerond"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Group Chat Contact Role:Geen"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Verwijdert contact van rooster"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fout bij lezen bestand:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Bestandsoverdracht Gestopt"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Bestandsoverdracht geannuleerd"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Kon geen verbinding maken met gebruiker."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s niet gevonden"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Afwezig"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Niet Beschikbaar"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Schakel Open_PGP Codering om"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Klik om de gespreksgeschiedenis van deze contact te bekijken"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Er is geen verbinding beschikbaar"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Verbinding niet beschikbaar"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Verander Bij_naam"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
+"gebruiker."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Bijnaam niet gevonden: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
+"gebruiker."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Stuur %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Je bent uit deze ruimte verbannen."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Ongeldige gebruikersnaam"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Aansluiting: "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr ""
+"Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
+"onderwerp bij naar de opgegeven tekst."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Argument \"contact_jid\" ontbreekt"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Contact Informatie"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "_Verder"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Beschrijving"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Groupsgesprek"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr ""
 "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "In de groep"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 #, fuzzy
 msgid "Groupchats"
 msgstr "Groupsgesprek"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - één ongelezen bericht"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Gajim - één ongelezen bericht"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Afwezig vanwege inactiviteit"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Niet beschikbaar vanwege inactiviteit"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "statusbericht"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Alleen in _rooster weergeven"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Alleen in _rooster weergeven"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Gesprekstoestands _mededelingen:"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Bestandsoverdracht Verzoek"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Bestandsoverdracht geannuleerd"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "?Group Chat Contact Role:Geen"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Bijnaam Veranderen"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "statusbericht"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 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:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Wis MOTD"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Indien Aan, verwijder niet */_ . Zodat *abc* vetgedrukt wordt, maar zonder "
 "dat * * verwijdert wordt."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 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
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Voeg * en [n] toe aan roster titel?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
 "venster heropend wordt."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hoeveel minuten zouden regels van het vorige gesprek onthouden moeten worden."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4097,11 +4247,11 @@ msgstr ""
 "Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
 "(Standaard gedrag van Mirabilis ICQ)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4110,11 +4260,11 @@ msgstr ""
 "Óf een aangepaste url met %s erin verwerkt, waar %s is een woord/zin, óf "
 "'WIKTIONARY' wat betekent dat wiktionary gebruikt zal worden."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4122,51 +4272,51 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4175,28 +4325,34 @@ msgstr ""
 "Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
 "van een NAT of port forwarding."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Laat tab rand zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4204,12 +4360,12 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
@@ -4217,7 +4373,7 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4226,13 +4382,13 @@ msgstr ""
 "Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
 "alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4240,7 +4396,7 @@ msgstr ""
 "Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
 "berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -4249,11 +4405,11 @@ msgstr ""
 "Indien Aan zal Gajim het statusbericht van contacten weergeven onder hun "
 "naam in het roostervenster, indien deze niet leeg is"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4261,7 +4417,7 @@ msgstr ""
 "Indien Aan zal Gajim contactafbeeldingen ophalen voor elk contact waarvan "
 "geen bekend is, of de laatste afbeelding te oud is."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4270,44 +4426,48 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4315,7 +4475,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4323,56 +4483,64 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4381,371 +4549,447 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 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
+#: ../src/common/config.py:287
 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
+#: ../src/common/config.py:288
 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
+#: ../src/common/config.py:289
 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
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
+"tijdens het opstarten"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s wil je een bestand sturen."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Gebruik aanmelding"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Gebruik aanmelding"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr ""
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../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 ''"
+#: ../src/common/config.py:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 #, fuzzy
 msgid "I'm available."
 msgstr "Aanwezig"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Open voor Gesprek"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 #, fuzzy
 msgid "I'm not available."
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4754,27 +4998,185 @@ 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Aan"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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 ""
+"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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "afmelding verzocht van %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Machtiging is verwijdert"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Ongeldige Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fout tijdens versturen"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Onbekende D-Bus versie: %s"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nieuw Enkel Bericht"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nieuw Enkel Bericht"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nieuw Privé Bericht"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nieuw Privé Bericht"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nieuw Enkel Bericht"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nieuw Bericht"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2375
+#, fuzzy, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s is nu %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is nu %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+#, fuzzy
+msgid "Contact Changed Status"
+msgstr "Contact is Uitgelogd"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contact is Ingelogd"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contact is Ingelogd"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contact is Uitgelogd"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contact is Uitgelogd"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
@@ -4785,214 +5187,192 @@ msgstr "Niet in staat de ruimte binnen te gaan"
 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:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard publicatie is met succes afgerond"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Ongeldige 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: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 ""
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5001,180 +5381,190 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../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:884
+#: ../src/common/connection.py:1001
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Kon geen verbinding maken met \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Verbinding"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fout tijdens versturen"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Inhoud"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 #, 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporten"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 #, fuzzy
 msgid "Not in roster"
 msgstr "niet in het rooster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python koppeling ontbreekt op deze computer"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
@@ -5189,7 +5579,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Service niet beschikbaar: Gajim is niet open of remote_control staat uit"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
 
@@ -5380,271 +5770,297 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Ongeldig character in gebruikersnaam."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Ongeldig character in hostnaam."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Niet Beschikbaar"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Print tijd:"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Onzichtbaar"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Van"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 #, fuzzy
 msgid "Owner"
 msgstr "_Eigenaar"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 #, fuzzy
 msgid "Member"
 msgstr "_Lid"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bericht verzenden"
 msgstr[1] "Bericht verzenden"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr ""
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Afbeelding is te groot"
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Fout bij lezen bestand:"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Ruimte Configuratie"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5656,111 +6072,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Statusbericht"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Grootte: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Bestand: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "groen"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "fout: kan %s niet voor lezen openen"
+msgid "Error: cannot open %s for reading"
+msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyaan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "logboek database wordt aangemaakt"
@@ -6459,94 +6889,177 @@ msgstr ""
 msgid "Writing"
 msgstr "Werken"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Wis MOTD"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "%s uit de ruimte schoppen"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Land:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Account"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Beschrijving"
+
+#: ../src/common/pep.py:204
+msgid "error"
+msgstr ""
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "Geen"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+#, fuzzy
+msgid "room"
+msgstr "Van"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr ""
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Niet in staat de ruimte binnen te gaan"
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, 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:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6557,298 +7070,298 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fout tijdens versturen"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Statusbericht"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Inschakelen"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "statusbericht"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Beheer Accounts"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, 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:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, 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:2377
+#: ../src/config.py:2456
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+msgid "Your server doesn't support vCard"
 msgstr ""
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 #, 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:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, 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:2517
+#: ../src/config.py:2604
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6858,118 +7371,114 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Verbinding"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Verwijder account alleen van Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Print tijd:"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Zorg ervoor dat de server- en ruimtevelden ingevuld zijn, of verwijder deze "
 "bladwijzer."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Ongeldige gebruikersnaam"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6979,34 +7488,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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, 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:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7016,7 +7525,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7024,86 +7533,103 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Verder"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Nieuw Bericht"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7112,249 +7638,252 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "A_fsluiten"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Gisteren"
 msgstr[1] "Gisteren"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber IM Client"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Stel MOTD in"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra Adres:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Een GTK+ jabber client"
+# TODO: Loop alles na, zet zinnen in de goede vorm, volg GNOME NL richtlijnen,
+#       ruim mnemonics op. Zie ook: http://nl.gnome.org/
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Een GTK+ Jabber client"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7363,43 +7892,97 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "Insecure connection"
+msgstr "Verbinding"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
+"contacten."
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Vraag mij dit niet nogmaals"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Wachtwoord"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr ""
+"Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ongeldige account naam"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -7407,70 +7990,70 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, 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:2388
+#: ../src/dialogs.py:2663
 #, 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:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7480,171 +8063,139 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contact is Ingelogd"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nieuw Bericht"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nieuw Privé Bericht"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../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:2651 ../src/notify.py:239 ../src/notify.py:491
-#, fuzzy
-msgid "Contact Changed Status"
-msgstr "Contact is Uitgelogd"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Vastgelopen"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Verwijder"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7652,199 +8203,193 @@ msgid ""
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Groep"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Contact Toevoegen"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Contact Toevoegen"
+msgstr[1] "_Contact Toevoegen"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Verwijdert contact van rooster"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Verwijdert contact van rooster"
+msgstr[1] "Verwijdert contact van rooster"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 #, 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:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, 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:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4602
-#, fuzzy
-msgid "Condition"
-msgstr "Verbinding"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr ""
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7852,38 +8397,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7893,78 +8438,116 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "voor account %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Overigen"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7972,478 +8555,493 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "via account %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "commando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Beschrijving"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonneren"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Geen"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Abonneer"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Commando's: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Binnenkomend bericht:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "_Geschiedenis"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "_Bericht"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Account Wijziging"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Binnenkomend bericht:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Algemeen"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Aanwezig"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Server Mogelijkheden"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Bestand"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tijd"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Grootte: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Jij"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Bestandsoverdracht afgerond"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Bestandsoverdracht geannuleerd"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Kon geen verbinding maken met gebruiker."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Bestandsoverdracht Gestopt"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Kies het Bestand om te Sturen"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim heeft geen toegang tot dit bestand"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Bestand: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Beschrijving: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s wil je een bestand sturen:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 #, 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Sla Bestand op als..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Bestand: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Beschrijving: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s wil je een bestand sturen:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "_Bestand Verzenden"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Bestandsoverdracht Fout"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8451,112 +9049,148 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Ongeldig Bestand"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Bestand: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "bericht"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Beheer Emoticons"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Alleen in _rooster weergeven"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Geavanceerde Configuratie Wijzigen"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Ruimte Configuratie"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 msgstr ""
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "laat hulp zien voor een specifiek commando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "commando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "laat hulp zien op commando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Laat een venster opduiken met het volgende ongelezen bericht"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8565,51 +9199,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "account"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Verander de status van de account of accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "bericht"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusbericht"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8618,24 +9256,52 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Verander de status van de account of accounts"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_teit"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Ik wil een nieuwe account _registreren"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8646,35 +9312,30 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8685,197 +9346,242 @@ 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:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "subject"
 msgstr "Onderwerp:"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "message subject"
 msgstr "_Bericht"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Voegt contact toe aan rooster"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 #, 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 #, 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 ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 #, fuzzy
 msgid "XML to send"
 msgstr "XML Console"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Contact is Uitgelogd"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Bijnaam niet gevonden: %s"
+
+#: ../src/gajim-remote.py:272
+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:278
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "inhoud bericht"
+
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "Nieuwe Ruimte _Binnengaan"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "room"
+msgid "?CLI:room"
 msgstr "Van"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "Room JID"
+msgstr "Ruimte:"
+
+#: ../src/gajim-remote.py:290
 #, fuzzy
-msgid "nick"
+msgid "?CLI:nick"
 msgstr "Uit_schoppen"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:290
 #, fuzzy
-msgid "password"
+msgid "Nickname to use"
+msgstr "Bijnaam niet gevonden: %s"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "Wachtwoord:"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Wachtwoord komt niet overeen"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 #, 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8884,164 +9590,42 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:433
+#, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Gebruik: %s %s %s \n"
-"\t"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../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-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \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-plugin.py:518 ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Wachtwoord"
-
-#: ../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 "een van: offline, online, chat, away, xa, dnd, invisible"
-
-#: ../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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:242
-#, 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.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Contact is Uitgelogd"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Bijnaam niet gevonden: %s"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "inhoud bericht"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Ruimte:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Bijnaam niet gevonden: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "Wachtwoord komt niet overeen"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9050,7 +9634,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9059,10 +9643,15 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Wachtwoord"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Thema"
@@ -9086,206 +9675,240 @@ msgid "You cannot delete your current theme"
 msgstr "Je kunt je huidige thema niet verwijderen"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s is nu bekend als %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Verbinding"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aansluiting: "
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 #, 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -9310,67 +9933,61 @@ msgstr "_Rapporteer Fout"
 msgid "Details"
 msgstr "Details"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Wil je het overschrijven?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:873
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9381,196 +9998,182 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbinding"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Abonneer"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Wachtwoord Vereist"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9580,104 +10183,89 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../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:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Error opening file"
-msgstr "Fout bij lezen bestand:"
+msgid "File Transfer Failed"
+msgstr "Bestandsoverdrachten"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 #, 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:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Bron: "
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9685,15 +10273,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr ""
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9704,34 +10297,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
-"contacten."
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9741,114 +10313,115 @@ msgstr ""
 "contacten."
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 #, 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "OpenPGP Versleuteling"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
 #, fuzzy
-msgid "Cannot find history logs database"
-msgstr "logboek database wordt aangemaakt"
+msgid "Set logs directory"
+msgstr "map %s wordt aangemaakt"
 
-#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:126
 #, fuzzy
-msgid "Contacts"
-msgstr "_Inhoud"
+msgid "Cannot find history logs database"
+msgstr "logboek database wordt aangemaakt"
 
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Datum:"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 #, fuzzy
 msgid "Nickname"
 msgstr "Bijnaam:"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "_Bericht"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 #, fuzzy
 msgid "Subject"
 msgstr "Onderwerp:"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9857,99 +10430,113 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../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] ""
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Contact Informatie"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr ""
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Verbinding"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Afbeelding is te groot"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
@@ -9962,105 +10549,116 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, fuzzy, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s is nu %(status)s"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "_Verder"
 
-#: ../src/notify.py:242
-#, fuzzy, python-format
-msgid "%(nickname)s Signed In"
-msgstr "Contact is Ingelogd"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
+#: ../src/plugins/gui.py:151
 #, fuzzy, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "Contact is Uitgelogd"
+msgid "Warning: %s"
+msgstr "%s verbannen"
 
-#: ../src/notify.py:261
-#, fuzzy, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nieuw Enkel Bericht"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "vCard publicatie is mislukt"
 
-#: ../src/notify.py:268
-#, fuzzy, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nieuw Privé Bericht"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
 msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nieuw Enkel Bericht"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Dit bestands bestaat al"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
 msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "_Verder"
+msgid "Configuration"
+msgstr "Ruimte Configuratie"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Bestandspad"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Bestandspad"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Die ruimte bestaat niet."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Contact Informatie"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formaat: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 #, fuzzy
 msgid "Information received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10068,51 +10666,52 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10121,39 +10720,39 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, 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:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Bestandsoverdracht annuleren"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10162,16 +10761,16 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -10180,12 +10779,12 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10194,74 +10793,74 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Inhoud"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, 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:2901
+#: ../src/roster_window.py:3092
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, 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:2947
+#: ../src/roster_window.py:3138
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Verwijder"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -10271,12 +10870,12 @@ msgstr ""
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10284,17 +10883,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10303,42 +10902,42 @@ 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:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. 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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -10346,31 +10945,36 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4552
 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:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ongeldig Bestand"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Stuur %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Stuurt een bestand aan contact"
+
+#: ../src/roster_window.py:4834
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
@@ -10380,143 +10984,143 @@ msgstr "Stuurt een bestand aan contact"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "To all online users"
 msgstr "_Online Gebruikers"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Inhoud"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transporten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transporten"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contact is Ingelogd"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contact is Ingelogd"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
@@ -10533,31 +11137,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Onderwerp: %s\n"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10567,150 +11161,155 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "OpenPGP is niet bruikbaar op deze computer"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "niet in het rooster"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Verbinding"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contact is Ingelogd"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Ruimte:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Actief"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Type:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Account Wijziging"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Afgerond"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10718,34 +11317,34 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10753,7 +11352,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10761,32 +11360,260 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
 #, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Kies het Bestand om te Sturen"
+
+#, fuzzy
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Toepassingen</b>"
+
+#, fuzzy
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Geluiden</b>"
+
+#, fuzzy
+#~ msgid "Advanced Actions"
+#~ msgstr "Gea_vanceerde Acties"
+
+#, fuzzy
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Geavanceerde Configuratie Wijzigen"
+
+#, fuzzy
+#~ msgid "All statuses"
+#~ msgstr "Status: "
+
+#, fuzzy
+#~ msgid "Busy "
+#~ msgstr "Bezig"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Contact is Uitgelogd"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contact is Ingelogd"
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Bestandsoverdracht Gestopt"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Nieuw Bericht"
+
+#, fuzzy
+#~ msgid "Launch a command"
+#~ msgstr "commando"
+
+#, fuzzy
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Open voor Gesprek"
+
+#, fuzzy
+#~ msgid "Play a sound"
+#~ msgstr "Speel _geluiden af"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nieuw Privé Bericht"
+
+#, fuzzy
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr ""
+#~ "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
+
+#, fuzzy
+#~ msgid "_Open chat window with user"
+#~ msgstr "Gebruik enkel gespreksvenster met _tabs"
+
+#, fuzzy
+#~ msgid "_Show event in roster"
+#~ msgstr "Alleen in _rooster weergeven"
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "_Inhoud"
+
+#, fuzzy
+#~ msgid "for "
+#~ msgstr "Poort: "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Groep"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Voegt contact toe aan rooster"
+
+#, fuzzy
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Sta hem/haar toe mijn status te zien"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Beschrijving: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Geavanceerd"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster "
+#~ "laten zien"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster "
+#~ "laten zien"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Enkel _Bericht Verzenden"
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Kies een Contactafbeelding"
+
+#, fuzzy
+#~ msgid "German"
+#~ msgstr "Algemeen"
+
+#, fuzzy
+#~ msgid "Greek"
+#~ msgstr "groen"
+
+#, fuzzy
+#~ msgid "Croatian"
+#~ msgstr "Locatie"
+
+#, fuzzy
+#~ msgid "Italian"
+#~ msgstr "Schuingedrukt"
+
+#, fuzzy
+#~ msgid "Polish"
+#~ msgstr "_Publiceren"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Algemeen"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Controleer je verbinding of probeer later nogmaals"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "fout: kan %s niet voor lezen openen"
+
+#, fuzzy
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Niet in staat de ruimte binnen te gaan"
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Een GTK+ jabber client"
+
+#, fuzzy
+#~ msgid "Condition"
+#~ msgstr "Verbinding"
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
+
+#, 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)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Gebruik: %s %s %s \n"
+#~ "\t"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Argument \"%s\" is niet gespecificeerd. \n"
+#~ "Type \"%s help %s\" voor meer info"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "_Inhoud"
+
+#, fuzzy
+#~ msgid "Subject: %s"
+#~ msgstr "Onderwerp: %s\n"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Ruimte:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Actief"
+
+#, fuzzy
 #~ msgid "_Show event in systray"
 #~ msgstr "Alleen in _rooster weergeven"
 
@@ -10802,31 +11629,12 @@ msgstr " bron met prioriteit"
 #~ 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"
 
@@ -10881,9 +11689,6 @@ msgstr " bron met prioriteit"
 #~ "Contact\n"
 #~ "Vaandel"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Beheer Accounts"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Wis MOTD"
@@ -10961,9 +11766,6 @@ msgstr " bron met prioriteit"
 #~ "Om verdere berichten te versturen en ontvangen, moet je de verbinding "
 #~ "opnieuw in stand brengen."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Dit bericht is versleuteld]"
-
 #~ msgid "%i days ago"
 #~ msgstr "%i dagen geleden"
 
@@ -10977,13 +11779,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Commands: %s"
 #~ msgstr "Commando's: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Gebruik: /%s, leegt het tekst venster."
-
-#, fuzzy
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Gebruik: /%s, leegt het tekst venster."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10992,14 +11787,6 @@ msgstr " bron met prioriteit"
 #~ "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 #~ "gebruiken. (bijv. /%s loopt...)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
-
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Gebruik: /%s, leegt het tekst venster."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Geen hulp beschikbaar voor /%s"
 
@@ -11014,10 +11801,6 @@ msgstr " bron met prioriteit"
 #~ msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Bijnaam niet gevonden: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -11028,14 +11811,6 @@ msgstr " bron met prioriteit"
 #~ "deze een \"@\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal "
 #~ "hij eruit geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
-#~ "gebruiker."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
@@ -11080,12 +11855,6 @@ msgstr " bron met prioriteit"
 #~ msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
 
 #, fuzzy
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr ""
-#~ "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
-#~ "onderwerp bij naar de opgegeven tekst."
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11122,10 +11891,6 @@ msgstr " bron met prioriteit"
 #~ msgstr "_Host:"
 
 #, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "_Rooster Weergeven"
-
-#, fuzzy
 #~ msgid "Modify Account"
 #~ msgstr "Account Be_werken..."
 
@@ -11192,9 +11957,6 @@ msgstr " bron met prioriteit"
 #~ "Indien aangevinkt en je twee of meer accounts hebt, zal Gajim de "
 #~ "contacten van alle accounts samenvoegen alsof ze een grote account zijn."
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Klik om de gespreksgeschiedenis van deze contact te bekijken"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Compacte Weergave    Alt+C"
 
@@ -11207,9 +11969,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Query Builder..."
 #~ msgstr "Query Bouwer..."
 
-#~ msgid "Accept"
-#~ msgstr "Accepteer"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Uitnodiging Ontvangen"
 
@@ -11280,9 +12039,6 @@ msgstr " bron met prioriteit"
 #~ msgid "The auto away status message"
 #~ msgstr "Het statusbericht voor automatische afwezigheid"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "Het statusbericht voor automatisch niet beschikbaar"
-
 #, fuzzy
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
@@ -11319,9 +12075,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Company:"
 #~ msgstr "Bedrijf:"
 
-#~ msgid "Country:"
-#~ msgstr "Land:"
-
 #~ msgid "Given:"
 #~ msgstr "Voornaam:"
 
@@ -11541,9 +12294,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisch contacten toestemming geven"
 
-#~ msgid "Send File"
-#~ msgstr "Bestand Verzenden"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "Nieuwe Ruimte Binnengaan..."
 
@@ -11592,9 +12342,6 @@ msgstr " bron met prioriteit"
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alle contacten in deze groep zijn offline of hebben fouten"
 
-#~ msgid "Size: "
-#~ msgstr "Grootte: "
-
 #~ msgid "Sound"
 #~ msgstr "Geluid"
 
diff --git a/po/no.po b/po/no.po
index 63f062025..ccd8a325b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,15 +2,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -21,306 +17,298 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Personlige Hendelser"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Start Samtale..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Bli med i _Gruppe Samtale..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Kjør Kommando"
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Rediger Konto"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Åpne Gmail Innboks"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Personlige Hendelser"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Start Samtale..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "_Rediger Konto"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Konto Opprettings Veiviser"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Kobler til server</b>\n"
-"\n"
-"Vennligst vent..."
+"Du trenger en konto før du kan koble\n"
+"til Jabber nettverket."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Jeg ønsker å _registrere en ny konto"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vennligst velg ett av valgene under:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Vennligst fyll in data for din eksisterende konto</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Vennligst velg en server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Passord:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Lagre pass_ord"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_ym autentisering"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Koble til når jeg klikker Ferdig"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Konto Opprettings Veiviser"
+msgid "Anon_ymous authentication"
+msgstr "Anon_ym autentisering"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Vennligst velg en server</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Behandle..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Bruk egendefinert maskinnavn/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "_Maskinnavn:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Lagre pass_ord"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avansert"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Du trenger en konto før du kan koble\n"
-"til Jabber nettverket."
+"Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
+"SHA1 fingeravtrykk til sertifikatet:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Avslutt"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Maskinnavn:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Kobler til server</b>\n"
+"\n"
+"Vennligst vent..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Koble til når jeg klikker Ferdig"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Passord:"
+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:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Avslutt"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Diverse</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ingen"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Kontoer"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Personlig Informasjon</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Legg til"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Slett"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "J_ustér etter status"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Gi _nytt navn"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Konto"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Slå på"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Kontoer"
+msgid "Anonymous authentication"
+msgstr "Anonym autentisering"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administrators oppgaver"
+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 ""
+"Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to "
+"eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren "
+"(samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs "
+"navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
+"hendelsene. (se under)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonym autentisering"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Koble til automatisk når kontakten mistes"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "_Synkroniser kontakter"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Utforsk"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Klikk for å be om attestering fra alle kontakter av en annen konto"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "K_oble til når Gajim starter"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klikk for å forandre kontoens passord"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Velg denne slik at Gajim vil spør deg før sending av passordet over en "
-"usikker tilkobling"
+msgid "Administration operations"
+msgstr "Administrators oppgaver"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Velg Fil for Sending..."
+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 ""
+"Prioritet brukes av Jabber for å finne ut hvem som skal få hendelser fra "
+"jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
+"Klienten med den høyeste prioriteten vil få hendelsen"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Velg _Nøkkel..."
+msgid "A_djust to status"
+msgstr "J_ustér etter status"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klikk for å forandre kontoens passord"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet vil endres automatisk etter din status."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Klikk for å be om attestering fra alle kontakter av en annen konto"
+msgid "Priori_ty:"
+msgstr "Priorit_et:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Selvsignert sertifikat"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Ko_ble til når Gajim starter"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Tilkobling"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Post:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Fornavn:"
+msgid "Resour_ce:"
+msgstr "Ressur_s:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Utforsk"
 
 #: ../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 ""
-"Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din "
-"egen, så filoverføringen har større mulighet for å fungere. "
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Sertifikatet avvist"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Dersom valgt vil Gajim få passordet fra en GPG agent slik som seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Selvsignert sertifikat"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Konto"
 
 #: ../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 ""
-"Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får et "
-"tidsavbrudd som resulterer i frakobling"
+msgid "C_onnect on Gajim startup"
+msgstr "K_oble til når Gajim starter"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -331,6 +319,18 @@ msgstr ""
 "ved oppstart"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Koble til automatisk når kontakten mistes"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Lagre samtale _logger for alle kontakter"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synk_roniser konto status med global status"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -339,176 +339,204 @@ msgstr ""
 "Dersom valgt vil endringer til global status (håndtert av kombomenyen "
 "nederst i kontaktvinduet) endre status på denne kontoen. "
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Dersom standard porten som brukes til inngående meldinger ikke passer for "
-"ditt oppsett kan du velge en annen her.\n"
-"Du kan også vurdere å endre mulige brannmur innstillinger."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Bruk filoverførings proxier"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Etternavn:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din "
+"egen, så filoverføringen har større mulighet for å fungere. "
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Sammenslåin_g av kontoer"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Generelle"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Ingen nøkkel valgt"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_bruk HTTP_PROXY system variabel"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Personlig Informasjon"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Behandle..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priorit_et:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Advar før benyttelse av en usikker tilkobling"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritet brukes av Jabber for å finne ut hvem som skal få hendelser fra "
-"jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
-"Klienten med den høyeste prioriteten vil få hendelsen"
+"Velg denne slik at Gajim vil spør deg før sending av passordet over en "
+"usikker tilkobling"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritet vil endres automatisk etter din status."
+msgid "Send _keep-alive packets"
+msgstr "Send _hold-i-live pakker"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Gi _nytt navn"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får et "
+"tidsavbrudd som resulterer i frakobling"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Ressur_s:"
+msgid "Use cust_om hostname/port"
+msgstr "Bruk egen_definert maskinnavn/port"
 
 #: ../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 ""
-"Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to "
-"eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren "
-"(samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs "
-"navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
-"hendelsene. (se under)"
+msgid "_Hostname: "
+msgstr "_Maskinnavn:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Lagre samtale _logger for alle kontakter"
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diverse</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Send _hold-i-live pakker"
+msgid "Connection"
+msgstr "Tilkobling"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synk_roniser konto status med global status"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Ingen nøkkel valgt"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synkroni_ser konto status med global status"
+msgid "Choose _Key..."
+msgstr "Velg _Nøkkel..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "_Synkroniser kontakter"
+msgid "Use G_PG Agent"
+msgstr "Bruk G_PG Agent"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Dersom valgt vil Gajim få passordet fra en GPG agent slik som seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Bruk G_PG Agent"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Bruk egen_definert maskinnavn/port"
+msgid "_Edit Personal Information..."
+msgstr "_Rediger Personlig Informasjon..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Bruk egen_definert port:"
+msgid "Information about you, as stored in the server"
+msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Bruk filoverførings proxier"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Personlig Informasjon</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Personlig Informasjon"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Rediger Personlig Informasjon..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Ko_ble til når Gajim starter"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Slå på"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Synkroni_ser konto status med global status"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Maskinnavn:"
+msgid "Use cust_om port:"
+msgstr "Bruk egen_definert port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Behandle..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Dersom standard porten som brukes til inngående meldinger ikke passer for "
+"ditt oppsett kan du velge en annen her.\n"
+"Du kan også vurdere å endre mulige brannmur innstillinger."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Fornavn:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Etternavn:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Advar før benyttelse av en usikker tilkobling"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Post:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_bruk HTTP_PROXY system variabel"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Sammenslåin_g av kontoer"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Konto"
+msgid "Add New Contact"
+msgstr "Legg til ny Kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Ti_llat denne kontakten å se min status"
+msgid "A_ccount:"
+msgstr "_Konto"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Legg til ny Kontakt"
+msgid "_Protocol:"
+msgstr "_Protokoll:"
 
-#: ../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 "Jeg vil legge deg til min kontaktliste."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Bruker ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Kallenavn:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Gruppe:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Ti_llat denne kontakten å se min status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Abonnement"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -520,7 +548,11 @@ msgstr ""
 "protokollen. Klikk på registrer knappen for\n"
 "å fortsette."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registrer"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -528,593 +560,372 @@ msgstr ""
 "Du må være koblet til transporten for å kunne\n"
 "legge til en kontakt fra denne protokollen."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Gruppe:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Kallenavn:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokoll:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registrer"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Abonnement"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Bruker ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>En feil har skjedd:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc kommandoer - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Velg kommando som skal kjøres:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Vennligst vent, henter liste over kommandoer..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc kommandoer - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Velg kommando som skal kjøres:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Sjekk en gang til"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Feil beskrivelse..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Vennligst vent, sender kommandoer..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Avslutt"
+msgid "Please wait..."
+msgstr "Vennligst vent..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Vennligst vent, henter liste over kommandoer..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Denne jabber enheten eksponerer ikke noen kommandoer."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Vennligst vent, sender kommandoer..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>En feil har skjedd:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Vennligst vent..."
+msgid "Error description..."
+msgstr "Feil beskrivelse..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Denne jabber enheten eksponerer ikke noen kommandoer."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Avslutt"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Avansert Konfigurasjons Editor"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>MERK:</b> Du bør starte gajim på nytt for å aktivere noen instillinger"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Avansert Konfigurasjons Editor"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Tilbakestill til Standard Farger"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Slett MFD (MOTD)"
+msgid "Show _XML Console"
+msgstr "Vis _XML Konsoll"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Private Lister..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Send Server Melding..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Sett MOTD..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Vis _XML Konsoll"
+msgid "Set MOTD..."
+msgstr "Sett MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Oppdater MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Oppdater MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Slett MFD (MOTD)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Send Server Melding..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "et vindu/fane åpent med den kontakten"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Handlinger</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Betingelser</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Lyder</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Avanserte Handlinger"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Instilinger for Hendelsesmeldinger"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Alle statuser"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Borte"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Opptatt "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt Endret Status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt Frakoblet"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Har ikke"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Fil Overføringer"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Fil Overførings Forespørsel"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Fil Overføring Stoppet"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Gruppe Samtale Melding Utheving"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Gruppe Samtale Melding Motatt"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Har"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Usynlig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Kjør en kommando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Ikke tilgjengelig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "En eller flere spesielle statuser..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Pålogget / Ledig for Prat"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Spill av en lyd"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Ny Privat Melding"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Når"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktiver vindu behandlerens HasterHint for å få samtalevinduet i "
-"oppgavelinjen til å blinke"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Deaktiver automatisk åpning av samtale vindu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Deaktiver eksisterende oppsprett vindu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Deaktiver eksisterende lyd for denne hendelsen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Deaktiver visning av hendelser i kontaktlisten"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informer meg med et oppspretts vindu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Åpne samtale vindu med bruker"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Vis hendelse i kontaktliste"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Vis hendelse i kontaktliste"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "og jeg"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontakter"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "for "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupper"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "når jeg er i"
+msgid "Deletes Message of the Day"
+msgstr "Sletter Meling for Dagen"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Tilstedeværelse"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Auto bli med"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ingen"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Tilstedeværelse"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Auto bli med"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entry:"
+msgid "New entry received"
+msgstr "Ny hendelse motatt"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Du har mottatt en ny inntreden:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed navn:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Sist endret:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Ny hendelse motatt"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Du har mottatt en ny inntreden:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Frigi"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Melding:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Sett Aktivitet"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Sett en aktivitet"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Melding:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Stemning:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Melding:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Endre Passord"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Skriv inn en gang til for verifisering:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Skriv inn en gang til for verifisering:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Skriv inn din nye status melding:</b>"
+msgid "Save as Preset..."
+msgstr "Lagre som Forvalg..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivitet:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Humør:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivitet:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Forvalgte meldinger:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Lagre som Forvalg..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Skriv inn din nye status melding:</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Bli med i _Gruppe Samtale"
+msgid "_Copy Link Location"
+msgstr "_Kopier Link PLassering"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Legg til Kontaktliste..."
+msgid "_Open Link in Browser"
+msgstr "_Åpne Link i Nettleser"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopier Link PLassering"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Åpne ny Epost"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Åpne Link i Nettleser"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Bli med i _Gruppe Samtale"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Legg til Kontaktliste..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Vis en liste over uttrykksikon (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Søk gjennom samtale historikken (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Send melding"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Send"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "In_viter"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Inviter Venner!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC server"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Vennligst velg en MUC server."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1122,119 +933,136 @@ msgstr ""
 "Du kommer nå til å starte en Fler-Bruker Samtale.\n"
 "Velg kontaktene du ønsker å invitere"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "F_orespør å se hans/hennes status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Vennligst velg en MUC server."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Legg til Spesielt _Varsel"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC server"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Tilegn Open_PGP Nøkkel..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "In_viter"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "K_jør Kommando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Start _Samtale"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Rediger _Grupper..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Send Enkel _Melding..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Send _Fil..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Inviter _Kontakter"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "_Fjern"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Endre Open_PGP Kryptering"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Endre Ende til Ende Kryptering"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "K_jør Kommando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Send Enkel _Melding..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Behandle Kontakt"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Send _Fil..."
+msgid "_Rename..."
+msgstr "_Gi nytt navn..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Velg Egendefinert _Avatar..."
+msgid "Edit _Groups..."
+msgstr "Rediger _Grupper..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Start _Samtale"
+msgid "Assign Open_PGP Key..."
+msgstr "Tilegn Open_PGP Nøkkel..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Endre Ende til Ende Kryptering"
+msgid "Set Custom _Avatar..."
+msgstr "Velg Egendefinert _Avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Endre Open_PGP Kryptering"
+msgid "Add Special _Notification..."
+msgstr "Legg til Spesielt _Varsel"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Abonnement"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Tillat han/henne å se min status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Ti_llat denne kontakten å se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "F_orespør å se hans/hennes status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historie"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorer"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blokker"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Behandle Kontakt"
+msgid "_Unignore"
+msgstr "_Ikke ignorer"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Gi nytt navn..."
+msgid "_Ignore"
+msgstr "_Ignorer"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Abonnement"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "_Fjern"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Ikke ignorer"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historie"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Fyll inn skjemaet."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Fyll inn skjemaet."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
@@ -1247,55 +1075,47 @@ msgstr "(<b>ESesjon</b> informasjon)"
 msgid "_Verify"
 msgstr "_Verifiser"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Funksjonalitet"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Liste over muligheter i Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Funksjonalitet"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "En liste over aktive, komplette og stoppede fil overføringer"
+msgid "File Transfers"
+msgstr "Fil Overføringer"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Avbryt filoverføring"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Viser en liste over overføringer mellom deg og andre"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Avbryter valgte filoverføring"
+msgid "file transfers list"
+msgstr "fil overførings liste"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Avbryter valgte filoverføring og fjerner den uferdige filen"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "En liste over aktive, komplette og stoppede fil overføringer"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Rydd _opp"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Gi meg beskjed når filoverføring er komplett"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Fil Overføringer"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Lukker vinduet"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Fjerner komplette, avbrutte og feilede filoverføringer fra listen"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Fjerner komplette, avbrutte og feilede filoverføringer fra listen"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Viser en liste over overføringer mellom deg og andre"
-
-#: ../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"
@@ -1303,82 +1123,108 @@ msgstr ""
 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
 "den først bli stoppet og så fjernet."
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Rydd _opp"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pause"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Avbryter valgte filoverføring og fjerner den uferdige filen"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Fortsett"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Avbryt filoverføring"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Gi meg beskjed når filoverføring er komplett"
+msgid "Cancels the selected file transfer"
+msgstr "Avbryter valgte filoverføring"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Åpne Foreldre Katalog"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Lukker vinduet"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pause"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Fortsett"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "fil overførings liste"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Åpne Foreldre Katalog"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Samtalestatus Fane Farger</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Fet"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppe"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Skriver"
+msgid "Gajim Themes Customization"
+msgstr "Gajim Tema Valg"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "Tekst _farge:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Font stil:"
+msgid "_Background:"
+msgstr "_Bakgrunn:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim Tema Valg"
+msgid "Text _font:"
+msgstr "Tekst _font:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Borte"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Gruppe"
+msgid "Font style:"
+msgstr "Font stil:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inaktiv"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Fet"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kursiv"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pauset"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Skriver"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inaktiv"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Samtalestatus Fane Farger</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Borte"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1386,7 +1232,7 @@ msgstr ""
 "MUC\n"
 "Meldinger"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1394,105 +1240,98 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pauset"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Tekst _farge:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Tekst _font:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Bakgrunn:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Endre _Kallenavn..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Behandle Rom"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Endre _Tittel..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Konfigurer _Rom..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Bokmerke"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Ødelegg Rom"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Behandle Rom"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimer ved lukking"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Stemme"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Bokmerke"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "M_odererer"
+msgid "_Send Private Message"
+msgstr "_Send Privat Melding"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Beboer Handlinger"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Send _Fil"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Beboer Handlinger"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Legg til Kontaktliste"
+msgid "_Voice"
+msgstr "_Stemme"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "M_odererer"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Medlem"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Utvis"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Eier"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Kast ut"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Medlem"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Eier"
+msgid "_Ban"
+msgstr "_Utvis"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Send Privat Melding"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Stemme"
+msgid "_Add to Roster"
+msgstr "_Legg til Kontaktliste"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Vis en liste over formatteringer"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Bokmerke dette rommet (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1504,39 +1343,19 @@ msgid "From:"
 msgstr "Fra:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../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."
-msgstr ""
-"<b>ADVARSEL:</b>\n"
-"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke "
-"kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim Historske Logg Behandler"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Slett"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Eksport"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim Historske Logg Behandler"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1550,172 +1369,198 @@ msgstr ""
 "Bruk dette programmet til å slette eller eksportere logger. Du kan velge "
 "logger fra venstre og/eller søke databasen under."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>ADVARSEL:</b>\n"
+"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke "
+"kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Gamle historier"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Samtale Historikk"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Eksport"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Kontakt navn"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Gruppesamtaler"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Gamle historier"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Samtale Historikk"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Søk:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Logg status endringer til kontakter"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Varm"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Varm"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Gå inn i dette rommet automatisk ved tilkobling"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Rom:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Nylig:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Nylig:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Gå inn i dette rommet automatisk ved tilkobling"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Rom:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bokmerke dette rommet"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Bokmerke dette rommet"
+msgid "Bro_wse Rooms"
+msgstr "_Utforsk"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Bli med"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Auto bli med"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimer ved Automatisk Deltakelse"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Tittel:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Skriv status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Auto bli med"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Tittel:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimer ved Automatisk Deltakelse"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1726,100 +1571,103 @@ msgid "_Configure"
 msgstr "_Konfigurer"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Egenskaper</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Instillinger</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Skriv:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pass_ord:"
+msgid "_Name:"
+msgstr "_Navn:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxy _Host:"
+msgid "<b>Properties</b>"
+msgstr "<b>Egenskaper</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgid "Use HTTP prox_y"
+msgstr "Bruk HTTP prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Bruk HTTP prox_y"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Bruk proxy aut_entisering"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Brukernavn:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "Pass_ord:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Navn:"
+msgid "Proxy _Host:"
+msgstr "Proxy _Host:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Skriv:"
+msgid "Proxy _Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Brukernavn:"
+msgid "<b>Settings</b>"
+msgstr "<b>Instillinger</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Behandle Kontoer"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passord setning"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Go_dkjenn"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Tilgjengelig"
+msgid "Version:"
+msgstr "GTK+ Versjon:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurer"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Beskrivelse:"
+msgid "Authors:"
+msgstr "Go_dkjenn"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1827,39 +1675,32 @@ msgid "Homepage:"
 msgstr "<b>Hjemmeside:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Henger"
+msgid "Description:"
+msgstr "Beskrivelse:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigurer"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Henger"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1873,219 +1714,287 @@ msgid "Event desc"
 msgstr "Hendelser"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editering av Avanserte Instillinger</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Applikasjoner</b>"
+msgid "Custom"
+msgstr "Egendefinert"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Handlinger</b>"
+msgid "All chat states"
+msgstr "Alle statuser"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatisk Status</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Skriver"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Samtale Utseende</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Deaktivert"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Samtale Linje Farger</b>"
+#, fuzzy
+msgid "Never"
+msgstr "_Aldri"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Samtale status alarmer</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Aldri\n"
+"Bare når hendelser venter\n"
+"Alltid"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Betingelser</b>"
+msgid "Always"
+msgstr "Borte"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Sprett opp"
 
-#. 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>Egendefinert</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Gi meg beskjed om det"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Vis bare i _kontaktliste"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Valg</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Forvalgt Status Melding</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<i>Privatliv</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Siste status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Status Meldinger</b>"
+msgid "Preferences"
+msgstr "Tilstedeværelse"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Temaer</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Mellomnavn:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visuelle Alarmer</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Avansert"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Vis h_umør til kontakter i kontaktlisten"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Avansert..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Alle statuser"
+msgid "Sort contacts by status"
+msgstr "Sorter kontakter etter status"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Tillat _OS informasjon å bli sendt"
+msgid "in _roster"
+msgstr "i _kontaktliste"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Tillat _OS informasjon å bli sendt"
+msgid "in _group chats"
+msgstr "i _gruppe samtale"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Tillat lys når jeg er _opptatt"
+msgid "_Window behavior:"
+msgstr "_Vindusoppførsel:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Borte"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
+"eller statiske grafiske uttrykksikoner"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Spør etter status melding når jeg:"
+msgid "_Emoticons:"
+msgstr "_Uttrykksikoner:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Gj_ør meldings vinduet kompakt"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Gjem alle knapper i samtale vinduer"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Samtale melding:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
+msgid "_Highlight misspelled words"
+msgstr "_Uthev feilstavede ord"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Skriver"
+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 ""
+"Dersom valgt vil Gajim utheve skrivefeil i skrivefeltet i samtale vinduer. "
+"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:38
-msgid "Configure color and font of the interface"
-msgstr "Konfigurer farge og font for grensesnittet"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Vis _kontaktliste"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Samtale melding:"
+msgid "Show icon when your messages are received"
+msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Kontakt navn"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Egendefinert"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Samtale Utseende</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Når en ny hendelse blir motatt:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Varsle meg om kontakter som logger _inn"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Varsle meg om kontakter som logger _ut"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Deaktivert"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Vis _aktivitet til kontakter i kontaktlisten"
+msgid "Notify on new _GMail email"
+msgstr "Alarmér om nye _Gmail e-post"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Vis _ekstra e-post detaljer"
+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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Vis h_umør til kontakter i kontaktlisten"
+msgid "Display _extra email details"
+msgstr "Vis _ekstra e-post detaljer"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Vis _sanger til kontakter i kontaktlisten"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Valg</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Vis h_umør til kontakter i kontaktlisten"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Viser status _meldinger for kontakter i kontaktlisten"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Visuelle Alarmer</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Spill av _lyder"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Be_handle..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Tillat lys når jeg er _opptatt"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Lyder</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Kunngjøringer"
+
+#: ../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 "
@@ -2095,7 +2004,11 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Vis samtale status opplysninger:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2105,685 +2018,629 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../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 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:58
-msgid "Hide all buttons in chat windows"
-msgstr "Gjem alle knapper i samtale vinduer"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
-"bruker"
-
-#: ../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: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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
-"har vert i bruk enda lenger"
+msgid "_Send chat state notifications:"
+msgstr "_Send Samtale status opplysninger:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
-"og i gruppesamtaler"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Samtale status alarmer</b>"
 
 #: ../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 ""
-"Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
-"i kontaktliste vinduet og i gruppesamtaler"
+msgid "Personal Events"
+msgstr "Personlige Hendelser"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Borte etter:"
 
 #: ../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"
+"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: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"
+msgid "_Not available after:"
+msgstr "_Ikke tilgjengelig etter:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Dersom valgt vil Gajim vise sanger som kontakter spiller i kontaktliste "
-"vinduet"
+"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: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 ""
-"Dersom valgt vil Gajim utheve skrivefeil i skrivefeltet i samtale vinduer. "
-"Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
-"språkvalg brukes for denne kontakten eller gruppesamtale."
+msgid "minutes"
+msgstr "minutter"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Dersom valgt vil Gajim ignorere inkommende hendelser fra uautoriserte "
-"kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
-"kontakter som ikke er i kontaktlisten"
-
-#: ../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 ""
-"Dersom valgt vil Gajim ta vare på logger for krypterte meldinger. Vennligst "
-"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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
+"Automatisk borte status melding. Dersom tom vil Gajim ikke endre gjeldende "
+"status melding\n"
+"$S byttes ut av tidligere status melding\n"
+"$T byttest ut av automatisk-borte tidsavbrudd"
 
 #: ../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, "
-"etc...)"
-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:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
-"eller statiske grafiske uttrykksikoner"
+"Automatisk ikke tilgjengelig meldingen. Dersom tom vil Gajim ikke endre "
+"gjeldende status melding\n"
+"$S vil byttes ut av forrige status melding\n"
+"$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Logg _krypterte samtale sesjoner"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatisk Status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Gj_ør meldings vinduet kompakt"
+msgid "Ask status message when I:"
+msgstr "Spør etter status melding når jeg:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Be_handle..."
+msgid "Sign _in"
+msgstr "Logger _inn"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Aldri"
+msgid "Sign _out"
+msgstr "Logger _ut"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Kunngjøringer"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Varsle meg om kontakter som logger _inn"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Status Meldinger</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Varsle meg om kontakter som logger _ut"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../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:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Alarmér om nye _Gmail e-post"
+msgid "Use system _default"
+msgstr "Bruk systemets _standardinstillinger"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Aldri\n"
-"Bare når hendelser venter\n"
-"Alltid"
+msgid "Chat message:"
+msgstr "Samtale melding:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Personlige Hendelser"
+msgid "<b>Font</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Spill av _lyder"
+msgid "Use _transports icons"
+msgstr "Bruk _transport ikoner"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Sprett opp"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+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:89
-msgid "Preferences"
-msgstr "Tilstedeværelse"
+msgid "Status _iconset:"
+msgstr "Standard _ikonsamling:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Konfigurer farge og font for grensesnittet"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Temaer</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
+msgid "Contact's nickname:"
+msgstr "Kontakt navn"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Vis bare i _kontaktliste"
+msgid "Your nickname:"
+msgstr "F_ør kallenavn:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Logger _inn"
+msgid "_Status message:"
+msgstr "_Status melding:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Logger _ut"
+msgid "_URL highlight:"
+msgstr "_URL utheving:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Tilbakestill til Standard Farger"
 
 #: ../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 ""
-"Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
-"valgt vil Gajim kun vise rå meldings tekst."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Samtale melding:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sorter kontakter etter status"
+#, fuzzy
+msgid "Your message:"
+msgstr "Feil melding: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Gruppe Samtale Melding Utheving"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Standard _ikonsamling:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Samtale Linje Farger</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Handlinger</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"Automatisk borte status melding. Dersom tom vil Gajim ikke endre gjeldende "
-"status melding\n"
-"$S byttes ut av tidligere status melding\n"
-"$T byttest ut av automatisk-borte tidsavbrudd"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"Automatisk ikke tilgjengelig meldingen. Dersom tom vil Gajim ikke endre "
-"gjeldende status melding\n"
-"$S vil byttes ut av forrige status melding\n"
-"$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Bruk _transport ikoner"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
+msgid "<b>Video</b>"
+msgstr "<b>Mellomnavn:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Bruk systemets _standardinstillinger"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Betingelser</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Feil melding: %s"
+msgid "_File manager:"
+msgstr "_Fil behandler:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "F_ør kallenavn:"
+msgid "_Mail client:"
+msgstr "_Post klient:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Borte etter:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Vis samtale status opplysninger:"
+msgid "<b>Custom</b>"
+msgstr "<b>Egendefinert</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Uttrykksikoner:"
+msgid "<b>Applications</b>"
+msgstr "<b>Applikasjoner</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Fil behandler:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Uthev feilstavede ord"
+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 ""
+"Dersom valgt vil Gajim ignorere inkommende hendelser fra uautoriserte "
+"kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
+"kontakter som ikke er i kontaktlisten"
 
 #: ../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"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Tillat _OS informasjon å bli sendt"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
+"bruker"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Logg status endringer til kontakter"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Tillat _OS informasjon å bli sendt"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Post klient:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
+"bruker"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Ikke tilgjengelig etter:"
+msgid "Log _encrypted chat session"
+msgstr "Logg _krypterte samtale sesjoner"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Åpne..."
+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 ""
+"Dersom valgt vil Gajim ta vare på logger for krypterte meldinger. Vennligst "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "_Tilbakestill til Standard Farger"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Tillat _OS informasjon å bli sendt"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "_Send Samtale status opplysninger:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Status melding:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "_URL utheving:"
+msgid "<b>Privacy</b>"
+msgstr "<i>Privatliv</i>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Vindusoppførsel:"
+msgid "_Log status changes of contacts"
+msgstr "_Logg status endringer til kontakter"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "i _gruppe samtale"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "i _kontaktliste"
+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:139
-msgid "minutes"
-msgstr "minutter"
+msgid "_Open..."
+msgstr "_Åpne..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editering av Avanserte Instillinger</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avansert"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste over Uønskede:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Legg til / Endre regel</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Liste over Utestengte"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Regelliste</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Liste over Uønskede</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktiv for denne sesjonen"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktiv på hver oppstart"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Regelliste</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Alle"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Legg til / Endre regel</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Alle (inkludert abonnement)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Tillate"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "alle i gruppen"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Rekkefølge:"
+msgid "all by subscription"
+msgstr "alle etter abonnement"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Liste over Utestengte"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Alle"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "alle etter abonnement"
+msgid "to send me messages"
+msgstr "å sende meg meldinger"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "alle i gruppen"
+msgid "to send me queries"
+msgstr "å sende meg forespørsler"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Begge"
+msgid "to view my status"
+msgstr "å se min status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Fra"
+msgid "to send me status"
+msgstr "å sende meg status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "en"
+msgid "All (including subscription)"
+msgstr "Alle (inkludert abonnement)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "to"
+msgid "Order:"
+msgstr "Rekkefølge:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "å sende meg meldinger"
+#, fuzzy
+msgid "none"
+msgstr "en"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "å sende meg forespørsler"
+#, fuzzy
+msgid "both"
+msgstr "Begge"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "å sende meg status"
+#, fuzzy
+msgid "from"
+msgstr "Fra"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "å se min status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresse</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "to"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Fødselsdag:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>By:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Etternavn:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Firma:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Land:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Mellomnavn:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Avdeling:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Post:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefiks:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Ekstra Adresse:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Fornavn:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Etternavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suffiks:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Fullt Navn</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Gate:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Fornavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>By:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Hjemmeside:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Stat:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Ekstra Adresse:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Mellomnavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Post Kode:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Navn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Land:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Kallenavn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresse</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefonnummer:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Hjemmeside:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Stilling:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Navn:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Post Kode:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Kallenavn:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefonnummer:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Rolle:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Fødselsdag:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Stat:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Post:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Gate:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Klikk for å sette ditt kontaktbilde"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Suffiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Personlig Info"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Firma:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Om"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Stilling:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Klikk for å sette ditt kontaktbilde"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Avdeling:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Rolle:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Personlig Info"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Jobb"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Hva ønsker du å gjøre?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Om"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Hva ønsker du å gjøre?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Fjern"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Kontaktliste Element Utveksling"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2791,115 +2648,112 @@ msgstr ""
 "<b>noen@etsted.no</b> ønsker at du skal <b>legge til</b> noen kontakter i "
 "kontaktlisten din."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Meldings Kropp <brukes ikke, derfor gjemt som standard>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Kontaktliste Element Utveksling"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Legg til _Kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Meldings Kropp <brukes ikke, derfor gjemt som standard>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "Fun_ksjoner"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Handlinger"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Fil _Overføringer"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Legg til _Kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Ofte Stilte Spørsmål (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Rediger"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Hjelp online"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Kontoer"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, B_ilde"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Vis"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Vis _Frakoblede Kontakter"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Vis Bare _Aktive Kontakter"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Vis Trans_porter"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Vis _Frakoblede Kontakter"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Kontoer"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Fil _Overføringer"
 
-#. 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 "_Handlinger"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Hjelp"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Rediger"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Hjelp online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "_Send Enkeltmelding..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Ofte Stilte Spørsmål (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Vis"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Vennligst vent, henter søke skjemaet..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fun_ksjoner"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Søk"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Vennligst vent, henter søke skjemaet..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2919,41 +2773,37 @@ msgstr "Registrer til:"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Svar på denne meldingen"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Til:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Send melding"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Send melding og lukk vinduet"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Svar"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Til:"
+msgid "Reply to this message"
+msgstr "Svar på denne meldingen"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Svar"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Send melding og lukk vinduet"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Go_dkjenn"
+msgid "Subscription Request"
+msgstr "Abonnerings Forespørsel"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Godkjenn kontakt så han eller hun kan vite når du er tilkoblet"
+msgid "_Deny"
+msgstr "_Nekt"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2963,262 +2813,274 @@ msgstr ""
 "Avslå godkjenning fra kontakt så han eller henne ikke kan se når du er "
 "tilkoblet"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Abonnerings Forespørsel"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Go_dkjenn"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Nekt"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Godkjenn kontakt så han eller hun kan vite når du er tilkoblet"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "_Synkroniser kontakter"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Velg hvilken konto du du ønsker å synkronisere med"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Velg kontaktene du ønsker å synkronsiere"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synkroniser : velg kontakter"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Slå av Lyder"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Send _Melding"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Vis Alle _Handlinger som Venter"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Velg kontaktene du ønsker å synkronsiere"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Spør:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Send _Melding"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klient:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Kontakt tid:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Slå av Lyder"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontaktinformasjon"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressurs:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Abbonement:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klient:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Kommentarer"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Kontakt tid:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Konfigurert avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Abbonement:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kontaktinformasjon"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Spør:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Mer"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Bruker avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Font</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Kommentarer"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikk</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Input</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Informasjon/Spørring"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Informasjon/Spørring"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Tilstedeværelse"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Tilstedeværelse"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Input</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokal jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Personlige"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+ Jabber klient"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Personlige"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klient"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+ Jabber klient"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Ugyldig rom"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Tjenesten endret sesjons identifikasjon. "
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc kommandoer - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktivert"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Deaktivert"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Nummer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Farge"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Gjemt"
 
@@ -3229,241 +3091,184 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 msgstr[1] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Engelsk"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Bulgarsk"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgarsk"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretagner"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Tsjekkisk"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Tysk"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Gresk"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Brtisk"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Spansk"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Baskisk"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Fransk"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Kroatisk"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiensk"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norsk (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Nederlansk"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polsk"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brasiliansk Portugisisk"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Russisk"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Serbisk"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovakisk"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Svensk"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Kinesisk (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Stavekontroll språk"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Feil."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Understrek"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Streik"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG kryptering påslått"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Denne kontakten støtter ikke filoverføring."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Ikke i kontaktliste"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Funksjon ikke tilgjengelig i Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Send Fil"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3472,32 +3277,32 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesjonen VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3505,25 +3310,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3531,13 +3336,14 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3546,231 +3352,594 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ikke mulig å dekryptere melding fra %s\n"
+"Den kan ha blitt endret."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Fil Overføringer"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Størrelse: "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Godkjenn"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Fil overføring komplett"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Gruppesamtale invitasjon"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Kontakten stoppet overføring"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Feil under åpning av fil"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Fil overføring stoppet"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Fil overføring avbrutt"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Tilkoblingen kan ikke opprettes."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Bruk: /%s, gjemmer samtale knappene."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Bruk: /%s, sender meldingen til kontakten"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s ikke funnet"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Borte"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Tilgjengelig"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Endre Open_PGP Kryptering"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Bruk: /%s, sender en ping til kontakten"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Kommando ikke støttet for zeroconf konto."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Klikk for å se tidligere samtaler med denne kontakten"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s er ikke et gyldig loggnivå"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Ugyldig kallenavn"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
+"spesifiserte brukeren."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Kallenavn ikke funnet: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
+"spesifiserte brukeren."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Spør før lukking av gruppesamtale fane/vindu."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Send %s til %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Du er invitert til en gruppesamtale"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Ugyldig server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "tilhørighet endret"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Mangler argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "lager logg database"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Endre statusinformasjon"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Endre status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Sett fraværstype og beskrivelse"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Ledig for samtale"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Frakoblet - ikke kontakt"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Statusen har blitt endret."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Gå ut av Gruppesamtale"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s fra %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Du har ikke blitt med i en gruppesamtale."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Du gikk ut av følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Videresend uleste meldinger"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Videresend uleste meldinger"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Lag lyd når bruker er opptatt"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Vis bare tilkoblede og ledig for samtale kontakter i kontaktlisten. "
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Borte på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S vil bli byttet ut med gjeldende status melding, $T av automatisk borte "
 "tid. "
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Ikke tilgjengelig på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, 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'. "
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Innkommende kallenavns farge."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Utgående kallenavn farge."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Innkommende tekst farge."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Utgående tekst farge."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Status meldings tekst farge."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Vis hendelse i kontaktliste"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Vis hendelse i kontaktliste"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Forhåndsvik nye meldinger i popup vindu?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Fil Overførings Forespørsel"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Fil overføring avbrutt"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Gruppesamtale invitasjon"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Innkommende kallenavns font."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Utgående kallenavns font."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Innkommende tekst font."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Utgående tekst font."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Status meldings tekst font."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Språk som brukes av ordlisten"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3780,7 +3949,7 @@ msgstr ""
 "'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
 "'never' - aldri vis klokkeslett."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3790,18 +3959,18 @@ msgstr ""
 "4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
 "den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings symboler."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3812,7 +3981,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
 "installere docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3820,7 +3989,7 @@ msgstr ""
 "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
 "gruppesamtaler."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3828,7 +3997,13 @@ msgstr ""
 "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
 "opptatt av noen andre i samtalegruppen."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3839,48 +4014,55 @@ msgstr ""
 "strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Legg til * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Hvor mange minutter med logg skal man be om når man går inn i en "
 "gruppesamtale. "
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3889,7 +4071,12 @@ msgstr ""
 "tilkobling til en samtale som du har blitt frakoblet. Sett til 0 for "
 "deaktiver automatisk re-tilkobling"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3897,11 +4084,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3910,11 +4097,11 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3926,12 +4113,12 @@ msgstr ""
 "at de synkroniserer med global status) basert på statusen til nettverks "
 "tilkoblingen."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3939,7 +4126,7 @@ msgstr ""
 "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
 "avslått."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3947,35 +4134,38 @@ msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Spør før lukking av fanet samtalevindu dersom det er kontrol som kan miste "
 "data (samtale, privat samtale, gruppesamtaler vil ikke bli minimert)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3984,28 +4174,34 @@ msgstr ""
 "grensesnitt, for Fil Overføring i tilfelle adresse oversetting/port "
 "videresending."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis notatblokk faner i samtalevinduer?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4016,16 +4212,16 @@ msgstr ""
 "separert med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. Høyere "
 "nummer er mer sikre men tar lenger å kalkulere når du starter en sesjon. "
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvik nye meldinger i popup vindu?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4034,14 +4230,14 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
 "oppstart."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4049,7 +4245,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4057,12 +4253,12 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definer posisjo for avatar i kontaktlisten. Kan være venste eller høyre"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4070,7 +4266,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4078,9 +4274,10 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4091,29 +4288,33 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget ut."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4123,7 +4324,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4134,7 +4335,8 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4142,7 +4344,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
@@ -4155,31 +4357,39 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4187,15 +4397,15 @@ msgstr ""
 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
 "samme person som snakker som i den forrige meldingen."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4203,11 +4413,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4215,7 +4425,7 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4223,7 +4433,7 @@ msgstr ""
 "Skal vi vise bekrefte blokk kontakt dialog eller ikke? Tomt tekststreng "
 "betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4231,7 +4441,7 @@ msgstr ""
 "Skal vi vise bekrefte egendefinert status dialog eller ikke? Tomt "
 "tekststreng betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4241,7 +4451,7 @@ msgstr ""
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din server."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4249,7 +4459,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4257,7 +4467,7 @@ msgstr ""
 "Dersom True vil Gajim bruke KDE Wallet (dersom kwalletcli er tilgjengelig) "
 "til å lagre konto passord."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4265,7 +4475,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4273,7 +4483,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4281,26 +4491,18 @@ msgstr ""
 "Dersom True vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../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 ""
-"Dersom True vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
-"konvertere før innsetting i et samtale vindu."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4309,19 +4511,11 @@ msgstr ""
 "Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Endre verdien for å endre størrelsen på lateks formlene som vises. Høyrere "
-"er større."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4329,22 +4523,23 @@ msgstr ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
 "\"ekte\" uri. (mailto og xmpp håndteres separat)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Spør om frakoblet status melding til alle frakoblede kontakter når en "
 "tilkobling til en konto etableres. ADVARSEL: Dette forårsaker mange "
 "forespørsler!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Dersom True, vil komplettering i samtalerom gjøres slik som shell basert "
 "komplettering."
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4352,31 +4547,60 @@ msgstr ""
 "Når skal selv kontakt raden vises. Kan være \"always\",\"when_other_resource"
 "\" eller \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
+"beskjed vil benyttes isteden."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4384,7 +4608,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4393,39 +4617,39 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Dersom True, vil kontakter som ber om godkjenning bli automatisk akseptert."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Dersom False vil bildeikoner bli slått av og ikke vises i kontaktliste "
 "vinduet."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Dersom deaktivert, ikke signer tilstedeværelser med GPG nøkkel, selv om GPG "
 "er konfigurert."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4433,49 +4657,64 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarsels dialog før bruk av standard SSL bibliotek."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Mellomrom sendt etter inaktivitet"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt etter inaktivitet"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Hvor mange sekunder skal man vente på svar fra ping alive pakker før vi "
 "prøver å koble til på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4483,15 +4722,34 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
+"bruker"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s ønsker å sende deg en fil."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4499,20 +4757,52 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonym autentisering"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_ym autentisering"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4520,108 +4810,111 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "alle eller mellomroms separert status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', eller 'both'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Hvor mange minutter med logg skal man be om når man går inn i en "
+"gruppesamtale. "
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4630,27 +4923,185 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Til"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "frakoblings ønske fra %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Disk Skrive Feil"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"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)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Rommet har blitt ødelagt"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Du kan bli med i dette rommet isteden: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Ugyldig Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+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."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "feil ved sending %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Ukjent SSL feil: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Ny Melding"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ny Enkeltmelding fra %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Ny Privat Melding"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Ny Privat Melding fra gruppesamtalerom %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Melding fra %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Ny Melding"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Ny Melding fra %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Endret Status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nå %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt Endret Status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Logget På"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt Logget På"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Logget Av"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt Logget Av"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
@@ -4660,20 +5111,20 @@ msgstr "Klarer ikke å uvirksom modulen"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4681,193 +5132,169 @@ msgstr ""
 "Registrering med agenten %(agent)s feilet med melding %(error)s: "
 "%(error_msg)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 "Disk Skrive Feil"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../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: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: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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til å få utsteders sertifikat"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til å skaffe sertifikatets CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til å dekryptere sertifikatets signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til å dekryptere CRLens signatur"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Klarer ikke å dekode usteders offentlige nøkkel"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Sertifikat signatur feil"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "CRL signatur feil"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Sertifikatet er ikke gylig enda"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Sertifikatet har utløpt"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL er ikke gyldig enda"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL har utgått"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Formaterings feil i sertifkatets notBefore felt"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Formaterings feil i sertifikatets notAfter felt"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formaterings feil i CRLens lastUpdate felt"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formaterings feil i CRLens nextUpdate felt"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Selvsignert sertifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsignert sertifikat i sertifikats kjeden"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Ute av stand til å få tak i lokal utsteders sertifikat"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Ute av stand til å verifisere det første sertifikatet"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Sertifikats kjeden er for lang"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Sertifikat tilbakekallt"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA sertifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Stilengde begrensning overskredet"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Ikke støttet sertifkats hensikt"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Sertifikatet er ikke tiltrodd"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Sertifikatet avvist"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Tittel utsteder passer ikke"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og tittel nøkkel identifikator passer ikke"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og utsteder seriernummer passer ikke"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) passer ikke sammen med nøkkelen tildelt i Gajim."
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4876,77 +5303,78 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Ukjent SSL feil: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Kunne ikke koble til \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, 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:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4955,7 +5383,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4964,24 +5392,33 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4990,66 +5427,66 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne maskinen"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus fungerer ikke riktig på denne maskinen"
@@ -5064,7 +5501,7 @@ msgstr ""
 "Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
 "til False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
 
@@ -5247,267 +5684,294 @@ msgstr "Slutten av uken"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Ikke tilgjengelig"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pauset"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pauset"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Usynlig"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Tidsavbrudd ved lasting av bilde"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Bilde er for stort"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL er ikke gyldig enda"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Tidsavbrudd ved lasting av bilde"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rom Instillinger"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5519,111 +5983,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldig loggnivå"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Standard Melding"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Størrelse: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Fil: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "grønn"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "feil: kan ikke åpne %s for lesing"
+msgid "Error: cannot open %s for reading"
+msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -6260,19 +6738,115 @@ msgstr "Studerer"
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "standard"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Gjemmer seg"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Land:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Konto"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Beskrivelse"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Feil"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "en"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "rom"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Ukjent Artist"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6281,22 +6855,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
 "fra  <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Klarer ikke å lytte til port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli "
-"avbrutt."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6304,11 +6864,11 @@ msgstr ""
 "[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
 "noe galt.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6317,44 +6877,43 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6367,24 +6926,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6393,69 +6952,69 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kan ikke brukes på denne maskinen"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6463,143 +7022,144 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6607,11 +7167,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6619,11 +7179,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6631,11 +7191,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6643,7 +7203,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6659,109 +7219,106 @@ msgstr ""
 "4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 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:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Ugyldig kallenavn"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Ugyldig rom"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6771,33 +7328,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6812,7 +7369,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6823,72 +7380,89 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Konfigurer"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Første Melding Motatt"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6898,7 +7472,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:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6906,238 +7480,239 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7150,101 +7725,156 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Usikker tilkobling"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
+"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
+"ønsker å fortsette?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jeg ønsker å koble til usikkert"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Feil uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Dette er ikke en samtalegruppe"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7253,168 +7883,138 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt Logget På"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Ny Melding"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Ny Melding"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Ny Privat Melding"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Gruppesamtale invitasjon"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt Endret Status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Lei seg"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7422,190 +8022,186 @@ 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:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Legg til"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Legg til kontakt"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Legg til kontakt"
+msgstr[1] "_Legg til kontakt"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Fjerner kontakt fra kontaktlisten"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Fjerner kontakt fra kontaktlisten"
+msgstr[1] "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Tjenesten returnerte en feil."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Betingelse"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "nå jeg er"
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7616,19 +8212,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7638,19 +8234,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7665,85 +8261,126 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG nøkkel er tildelt denne kontaken, men du <b>stoler ikke på denne "
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "for kontoen %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Selvsignert sertifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7751,232 +8388,247 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "SSL sertifikats validering"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek som brukes til å verifisere server sertifikater for å sikre en "
 "sikker tilkobling."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Krever python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk oppdagede klienter på et lokalt nettverk."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Krever python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Krever pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Kommandolinje"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Et script for å kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Krever python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Funksjon ikke tilgjengelig i Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP meldingskryptering"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Krypterer samtalemeldinger med gpg nøkler."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Krever gpg og python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Autodeteksjon av nettverksstatus."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Krever gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Sesjons Behandling"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesjon er lagret på utlogging og gjenopprettes ved pålogging."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Krever python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Passord kryptering"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passord kan lagres sikkert og ikke bare i klartekst."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Krever gnome-keyring og python-gnome2-desktop, eller kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evne til å koble til servere som bruker SRV records."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Krever dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Krever nslookup for å bruke SRV records."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontroll av komponerte meldinger."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Krever libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Krever libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Varslinger"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Passiv påminnelse for nye hendelser."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7984,65 +8636,39 @@ msgstr ""
 "Krever python-notify eller alternativt python-dbus i samarbeid med "
 "notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatisk status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til å måle inaktiv tid for å kunne sette auto status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Krever libxss biblioteket."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Krever python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Transformer LaTeX uttrykk mellom $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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 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."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Ende til Ende meldingskryptering"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Kryptering av samtalemeldinger."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Krever python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8050,140 +8676,137 @@ msgstr ""
 "Generer XHTML ut fra RST kode (see http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Krever python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Krever python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Krever python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Krever python-dbus."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Tilgjengelig"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Funksjonalitet"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Fil overføring komplett"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Fil overføring avbrutt"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Tilkoblingen kan ikke opprettes."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Fil overføring stoppet"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Fil: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Beskrivelse: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s ønsker å sende deg en fil:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8191,33 +8814,64 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Fil: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Beskrivelse: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s ønsker å sende deg en fil:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Sender profil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Fil Overføring Feilet"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8225,69 +8879,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "melding"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Uttrykksikoner:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Vis bare i _kontaktliste"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Avansert Konfigurasjons Editor"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Rom Instillinger"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importering av PyGTK feilet: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim trenger PyGTK 2.12 eller høyere"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim trenger GTK 2.12 eller høyere"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8296,12 +8987,11 @@ msgstr ""
 "Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den "
 "på %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8309,28 +8999,28 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8338,53 +9028,57 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "konto"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "melding"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8392,20 +9086,44 @@ 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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Endrer prioritet på konto eller kontoer"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "prioritet du ønsker å gi til kontoen"
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8415,35 +9133,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8453,136 +9166,133 @@ 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-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8590,44 +9300,93 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Endre status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Kallenavn å bruke"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
+"til alle kontoer"
+
+#: ../src/gajim-remote.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI til håndgrep"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Konto som du ønsker å benytte for å håndtere det"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Meldings innhold"
+
+#: ../src/gajim-remote.py:287
 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"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "rom"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Rom JID"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Kallenavn å bruke"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "passord"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Passord for å komme inn i rommet"
+
+#: ../src/gajim-remote.py:292
+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:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8636,160 +9395,44 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Bruk: %s %s %s \n"
-"\t %s"
+"Bruk: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\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 hjelp %(command)s\" for mer informasjon"
-
-#: ../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\" er ikke spesifisert. \n"
-"Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Feil 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 av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
-"usynlig"
-
-#: ../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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Returnerer gjeldende status melding (den globale om ikke en konto er "
-"spesifisert)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Endre status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Kallenavn å bruke"
-
-#: ../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 ""
-"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
-"til alle kontoer"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI til håndgrep"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Konto som du ønsker å benytte for å håndtere det"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Meldings innhold"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Rom JID"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Kallenavn å bruke"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Passord for å komme inn i rommet"
-
-#: ../src/gajim-remote.py:291
-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:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Bruk: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8798,7 +9441,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8807,10 +9450,14 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Feil uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8833,181 +9480,217 @@ msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s har satt tittel til %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Rommet viser nå utilgjengelig medlem"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "rommet viser nå ikke utilgjengelige medlemmer"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Rom logging er nå påslått"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Rom logging er nå avslått"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Rommet er nå ikke-anonymisert"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Rommet er nå semi-anonymisert"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Romet er nå full-anonymisert"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9015,22 +9698,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -9055,63 +9738,57 @@ msgstr "_Rapporter Feil"
 msgid "Details"
 msgstr "Detaljer"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9122,92 +9799,86 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 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:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> 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."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Abonnerings forespørsel"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9215,107 +9886,103 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Fjern Abonnement"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Rommet viser nå utilgjengelig medlem"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "rommet viser nå ikke utilgjengelige medlemmer"
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr "Rom logging er nå påslått"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Rom logging er nå avslått"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Rommet er nå ikke-anonymisert"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Rommet er nå semi-anonymisert"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Romet er nå full-anonymisert"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG Passordord er ikke riktig"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Sertifikatet har utløpt"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG nøkkel ikke tiltrodd"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
 "virkelig å kryptere denne meldingen?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9330,80 +9997,65 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "Kontakten stoppet overføring"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Feil under åpning av fil"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Fil Overføringer"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ikke mulig å dekryptere melding fra %s\n"
-"Den kan ha blitt endret."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Feil."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9412,21 +10064,21 @@ msgstr ""
 "et annet"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9437,15 +10089,20 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL sertifikats feil"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9462,28 +10119,7 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
-"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
-"ønsker å fortsette?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9492,7 +10128,7 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9502,11 +10138,11 @@ msgstr ""
 "at du ønsker å gjøre det?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9514,7 +10150,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9524,89 +10160,92 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG nøkkel utgått"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "lager %s mappe"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakter"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Melding"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Ønsker du å rengjøre databasen? (STERKT FRARÅDET MENS GAJIM KJØRER)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9620,93 +10259,108 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Database feil"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Ønsker du virkelig å slette loggene til den valgte kontakten?"
-msgstr[1] "Ønsker du virkelig å slette loggene fra de valgte kontaktene?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Ønsker du virkelig å slette den valgte meldingen?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Ønsker du virkelig å slette loggene til den valgte kontakten?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Avbryt bekreftelse"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Tidsavbrudd ved lasting av bilde"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Koder"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Bilde er for stort"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Du kommer til å lukke flere tabber"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å lukke alle?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -9718,100 +10372,112 @@ msgstr "- meldinger vil bli logget"
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Endret Status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignorer"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Logget På"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Logget Av"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Utvise %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Ny Enkeltmelding fra %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registrering feilet"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Ny Privat Melding fra gruppesamtalerom %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Melding fra %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Denne filen finnes fra før"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Ny Melding fra %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorer"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Rom Instillinger"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Filen er tom"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformasjon"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9819,53 +10485,54 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9873,38 +10540,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filoverføring"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9912,16 +10579,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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9929,11 +10596,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9942,12 +10609,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 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:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9956,57 +10623,57 @@ msgstr ""
 "sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10015,11 +10682,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10027,16 +10694,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10046,15 +10713,15 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
 "fortsette?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10063,33 +10730,34 @@ 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10099,23 +10767,28 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Gjør %s og %s metakontakter"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -10125,130 +10798,130 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -10265,24 +10938,14 @@ msgstr "Feil i motatt dataskjema"
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Disk SkriveFeil"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Tittel: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10294,7 +10957,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10309,147 +10972,152 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktliste"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne samtalegruppen"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Humør:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivitet:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Sang:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Varslinger"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10457,32 +11125,32 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10490,7 +11158,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10498,13 +11166,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10512,18 +11180,402 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Velg Fil for Sending..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "et vindu/fane åpent med den kontakten"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Handlinger</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Betingelser</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Avanserte Handlinger"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Instilinger for Hendelsesmeldinger"
+
+#~ msgid "All statuses"
+#~ msgstr "Alle statuser"
+
+#~ msgid "Busy "
+#~ msgstr "Opptatt "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt Endret Status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt Frakoblet"
+
+#~ msgid "Don't have "
+#~ msgstr "Har ikke"
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Fil Overføring Stoppet"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Gruppe Samtale Melding Utheving"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Gruppe Samtale Melding Motatt"
+
+#~ msgid "Have "
+#~ msgstr "Har"
+
+#~ msgid "Launch a command"
+#~ msgstr "Kjør en kommando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "En eller flere spesielle statuser..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Pålogget / Ledig for Prat"
+
+#~ msgid "Play a sound"
+#~ msgstr "Spill av en lyd"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Ny Privat Melding"
+
+#~ msgid "When "
+#~ msgstr "Når"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktiver vindu behandlerens HasterHint for å få samtalevinduet i "
+#~ "oppgavelinjen til å blinke"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Deaktiver automatisk åpning av samtale vindu"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Deaktiver eksisterende oppsprett vindu"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Deaktiver eksisterende lyd for denne hendelsen"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Deaktiver visning av hendelser i kontaktlisten"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Deaktiver visning av hendelser i kontaktlisten"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informer meg med et oppspretts vindu"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Åpne samtale vindu med bruker"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Vis hendelse i kontaktliste"
+
+#~ msgid "and I "
+#~ msgstr "og jeg"
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontakter"
+
+#~ msgid "for "
+#~ msgstr "for "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupper"
+
+#~ msgid "when I'm in"
+#~ msgstr "når jeg er i"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Tillat han/henne å se min status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Beskrivelse:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Avansert..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Vis _aktivitet til kontakter i kontaktlisten"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Vis _sanger til kontakter i kontaktlisten"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Vis h_umør til kontakter i kontaktlisten"
+
+#~ 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"
+
+#, 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"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Send Enkeltmelding..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Bruker avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "Engelsk"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bulgarsk"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarsk"
+
+#~ msgid "Breton"
+#~ msgstr "Bretagner"
+
+#~ msgid "Czech"
+#~ msgstr "Tsjekkisk"
+
+#~ msgid "German"
+#~ msgstr "Tysk"
+
+#~ msgid "Greek"
+#~ msgstr "Gresk"
+
+#~ msgid "British"
+#~ msgstr "Brtisk"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spansk"
+
+#~ msgid "Basque"
+#~ msgstr "Baskisk"
+
+#~ msgid "French"
+#~ msgstr "Fransk"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroatisk"
+
+#~ msgid "Italian"
+#~ msgstr "Italiensk"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norsk (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederlansk"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norsk"
+
+#~ msgid "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugisisk"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brasiliansk Portugisisk"
+
+#~ msgid "Russian"
+#~ msgstr "Russisk"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbisk"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovakisk"
+
+#~ msgid "Swedish"
+#~ msgstr "Svensk"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kinesisk (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Stavekontroll språk"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Dersom True vil Gajim konvertere mellom $$ og $$ til et bilde med dvips "
+#~ "og konvertere før innsetting i et samtale vindu."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Endre verdien for å endre størrelsen på lateks formlene som vises. "
+#~ "Høyrere er større."
+
+#~ msgid "all or space separated status"
+#~ msgstr "alle eller mellomroms separert status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', eller 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' eller ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "feil: kan ikke åpne %s for lesing"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Klarer ikke å lytte til port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli "
+#~ "avbrutt."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "En GTK+ Jabber klient"
+
+#~ msgid "Condition"
+#~ msgstr "Betingelse"
+
+#~ msgid "when I am "
+#~ msgstr "nå jeg er"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Krever pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Krever gpg og python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transformer LaTeX uttrykk mellom $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Krever texlive-latex-base og dvipng (Alt er i MikTeX). Du må sette "
+#~ "'use_latex' til True i Avansert Konfigurasjons Editoren."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Krever python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
+#~ "usynlig"
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Bruk: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
+#~ "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakter"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Disk SkriveFeil"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Tittel: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Humør:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivitet:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10551,32 +11603,12 @@ msgstr " ressurs med prioritet"
 #~ 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"
 
@@ -10679,9 +11711,6 @@ msgstr " ressurs med prioritet"
 #~ "Gruppesamtale Historikk\n"
 #~ "All Samtale Historikk"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Behandle Kontoer"
-
 #~ msgid "gtk-delete"
 #~ msgstr "delete"
 
@@ -10850,18 +11879,9 @@ msgstr " ressurs med prioritet"
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Tilegn Open_PGP Nøkkel"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Kommando ikke støttet for zeroconf konto."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Kommandoer: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Bruk: /%s, gjemmer samtale knappene."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10869,12 +11889,6 @@ msgstr " ressurs med prioritet"
 #~ "Bruk: /%(command)s <action>, sender handling til gjeldende rom. Bruk "
 #~ "tredje person. (f.eks.  /%(command)s eksploderer.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Bruk: /%s, sender en ping til kontakten"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Bruk: /%s, sender meldingen til kontakten"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Ingen hjelpe informasjon for /%s"
 
@@ -10891,10 +11905,6 @@ msgstr " ressurs med prioritet"
 #~ msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Kallenavn ikke funnet: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10907,13 +11917,6 @@ msgstr " ressurs med prioritet"
 #~ "kallenavnet."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
-#~ "spesifiserte brukeren."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10955,9 +11958,6 @@ msgstr " ressurs med prioritet"
 #~ "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
 #~ "samtalerom."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -10993,9 +11993,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "_Host:"
 #~ msgstr "_Maskin:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Vis _kontaktliste"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Velg hvilken konto du skal synkronisere med"
 
@@ -11118,9 +12115,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Soliloquy"
 #~ msgstr "Enetale"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Klikk for å se tidligere samtaler med denne kontakten"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Kompakt Utseende    Alt+C"
 
@@ -11133,9 +12127,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Query Builder..."
 #~ msgstr "Spørrings Bygger..."
 
-#~ msgid "Accept"
-#~ msgstr "Godkjenn"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Invitasjon motatt"
 
@@ -11269,9 +12260,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Company:"
 #~ msgstr "Bedrift:"
 
-#~ msgid "Country:"
-#~ msgstr "Land:"
-
 #~ msgid "Given:"
 #~ msgstr "Fornavn:"
 
@@ -11498,9 +12486,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
 
-#~ msgid "Send File"
-#~ msgstr "Send Fil"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "_Bli med i Nytt Rom"
 
@@ -11549,9 +12534,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
 
-#~ msgid "Size: "
-#~ msgstr "Størrelse: "
-
 #~ msgid "Sound"
 #~ msgstr "Lyd"
 
diff --git a/po/pl.po b/po/pl.po
index e1675e051..858dd6a87 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,15 +5,11 @@
 # 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-12-01 23:26+0100\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2010-01-01 20:42+0100\n"
 "Last-Translator: Jacek Sowiński <mruwek@mruwek.pl>\n"
 "Language-Team: Polish <dominik@kozaczko.info, translation-team-pl@lists."
@@ -27,306 +23,297 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Zdarzenia"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Rozpocznij rozmowę"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Dołącz do _pokoju"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Wyszukuj usługi"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Wykonaj komendę"
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Modyfikuj konto"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Otwórz skrzynkę Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Zdarzenia"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Rozpocznij rozmowę"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "_Modyfikuj konto"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Kreator Konta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Łączenie z serwerem</b>\n"
-"\n"
-"proszę czekać..."
+"Musisz posiadać konto aby połączyć się\n"
+" z siecią Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Chcę za_rejestrować nowe konto Jabbera"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Wybierz jedną z poniższych opcji:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Uzupełnij proszę dane swojego konta</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Wybierz serwer</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Hasło:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Dodaj ten certyfikat do listy zaufanych.\n"
-"Odcisk klucza SHA1 tego certyfikatu:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Zapisz _hasło"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anonimowa autentykacja"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Połącz po wciśnięciu przycisku Zakończ"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Kreator Konta"
+msgid "Anon_ymous authentication"
+msgstr "Anonimowa autentykacja"
 
 #: ../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ć"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Wybierz serwer</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Serwer:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Zarządzaj..."
 
 #: ../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:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3614 ../src/config.py:3689
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:517
-#: ../src/dialogs.py:530 ../src/roster_window.py:3006
-#: ../src/roster_window.py:3012 ../src/roster_window.py:3017
-msgid "None"
-msgstr "Żaden"
+msgid "Use custom hostname/port"
+msgstr "Użyj własnej nazwy hosta/portu"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "_Nazwa hosta: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Zapisz _hasło"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Ustaw profil po połączeniu"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Zaawansowane"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Musisz posiadać konto aby połączyć się\n"
-" z siecią Jabber."
+"Dodaj ten certyfikat do listy zaufanych.\n"
+"Odcisk klucza SHA1 tego certyfikatu:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Zakończ"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Nazwa hosta: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Łączenie z serwerem</b>\n"
+"\n"
+"proszę czekać..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Połącz po wciśnięciu przycisku Zakończ"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Hasło:"
+msgid "Set my profile when I connect"
+msgstr "Ustaw profil po połączeniu"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Zakończ"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Serwer:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Różne</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Żaden"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Konta"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Informacje o sobie</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Usuń"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "D_ostosuj do statusu"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "_Zmień nazwę"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Konto"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Włącz"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Konta"
+msgid "Anonymous authentication"
+msgstr "Używaj autoryzacji serwera proxy"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Operacje administracyjne"
+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 ""
+"Informację wysłano do serwera w celu rozdzielenia tego samego JID na dwie "
+"lub więcej części, w zależności od liczby klientów połączonych z serwerem z "
+"tego samego konta. Możesz być połączony z z tym samym kontem z informacjami "
+"'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał "
+"wiadomości (patrz niżej)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Używaj autoryzacji serwera proxy"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatyczne połącz po zerwaniu połączenia"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Synchronizuj kontakty"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "Prze_glądaj..."
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "P_ołącz przy starcie programu"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Z_mień hasło"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Kliknij, aby zmienić hasło dla konta"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Po uaktywnieniu tej opcji Gajim zapyta przed wysłaniem hasła przez "
-"nieszyfrowane połączenie."
+msgid "Administration operations"
+msgstr "Operacje administracyjne"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Wybierz plik do wysłania..."
+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 ""
+"Priorytet służy do określenia, który program ma odbierać wiadomości z "
+"serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten "
+"który ma wyższy priorytet, będzie odbierał wiadomości"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Wybierz _klucz..."
+msgid "A_djust to status"
+msgstr "D_ostosuj do statusu"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Kliknij, aby zmienić hasło dla konta"
+msgid "Priority will change automatically according to your status."
+msgstr "Priorytet ulegnie zmianie automatycznie, stosownie do twojego statusu."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
+msgid "Priori_ty:"
+msgstr "Priory_tet:"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "Certyfikat klienta"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "P_ołącz przy starcie programu"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Połączenie"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Adres e-mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Imię:"
+msgid "Resour_ce:"
+msgstr "Za_sób: "
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1160 ../src/common/helpers.py:1172
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr "Plik _certyfikatu klienta"
 
-#. 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:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2948 ../src/roster_window.py:5483
-msgid "General"
-msgstr "Ogólne"
+#: ../data/gui/accounts_window.ui.h:25
+msgid "Browse..."
+msgstr "Prze_glądaj..."
 
 #: ../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 ""
-"Jeżeli opcja jest aktywna, Gajim roześle kilka dodatkowych adresów IP poza "
-"Twoim, tak aby przesyłanie plików przebiegało sprawniej."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certyfikat odrzucony"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. Seahorse"
+msgid "Client certificate"
+msgstr "Certyfikat klienta"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Konto"
 
 #: ../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 ""
-"Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących "
-"połączenie, co zapobiega rozłączaniu"
+msgid "C_onnect on Gajim startup"
+msgstr "P_ołącz przy starcie programu"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -337,6 +324,18 @@ msgstr ""
 "wykorzystaniem tego konta"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatyczne połącz po zerwaniu połączenia"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synch_ronizuj status konta z globalnym statusem"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -345,176 +344,205 @@ msgstr ""
 "Jeśli jest zaznaczone, to każda zmiana statusu globalnego (ustawianego z "
 "menu na dole okna listy kontaktów) wpłynie odpowiednio na status tego konta"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Jeżeli domyślny port, na którym przyjmowane są nadchodzące wiadomości nie "
-"odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
-"Konieczna stać się może ponowna konfiguracja firewalla."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:835
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Używaj serwerów proxy do przesyłania plików"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Nazwisko:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Jeżeli opcja jest aktywna, Gajim roześle kilka dodatkowych adresów IP poza "
+"Twoim, tak aby przesyłanie plików przebiegało sprawniej."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Połącz konta"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Ogólne"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Nie wybrano żadnego klucza"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_używaj zmiennej środowiskowej HTTP__PROXY"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Informacje osobiste"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "Zarządzaj..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priory_tet:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Ostrzegaj przed użyciem niezaszyfrowanego połączenia"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Priorytet służy do określenia, który program ma odbierać wiadomości z "
-"serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten "
-"który ma wyższy priorytet, będzie odbierał wiadomości"
+"Po uaktywnieniu tej opcji Gajim zapyta przed wysłaniem hasła przez "
+"nieszyfrowane połączenie."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Priorytet ulegnie zmianie automatycznie, stosownie do twojego statusu."
+msgid "Send _keep-alive packets"
+msgstr "Wysyłaj pakiety _podtrzymujące"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5433
-msgid "Re_name"
-msgstr "_Zmień nazwę"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących "
+"połączenie, co zapobiega rozłączaniu"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Za_sób: "
+msgid "Use cust_om hostname/port"
+msgstr "Użyj wła_snej nazwy hosta/portu"
 
 #: ../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 ""
-"Informację wysłano do serwera w celu rozdzielenia tego samego JID na dwie "
-"lub więcej części, w zależności od liczby klientów połączonych z serwerem z "
-"tego samego konta. Możesz być połączony z z tym samym kontem z informacjami "
-"'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał "
-"wiadomości (patrz niżej)"
+msgid "_Hostname: "
+msgstr "_Nazwa hosta: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Różne</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Wysyłaj pakiety _podtrzymujące"
+msgid "Connection"
+msgstr "Połączenie"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synch_ronizuj status konta z globalnym statusem"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Nie wybrano żadnego klucza"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synch_ronizuj status konta z globalnym statusem"
+msgid "Choose _Key..."
+msgstr "Wybierz _klucz..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronizuj kontakty"
+msgid "Use G_PG Agent"
+msgstr "Użyj Agenta G_PG"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
+"Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. Seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Użyj Agenta G_PG"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Użyj wła_snej nazwy hosta/portu"
+msgid "_Edit Personal Information..."
+msgstr "_Zmień informacje o sobie..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Użyj inn_ego portu:"
+msgid "Information about you, as stored in the server"
+msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Używaj serwerów proxy do przesyłania plików"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Informacje o sobie</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr "Plik _certyfikatu klienta"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Informacje osobiste"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Zmień informacje o sobie..."
+msgid "Co_nnect on Gajim startup"
+msgstr "P_ołącz przy starcie programu"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Włącz"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Synch_ronizuj status konta z globalnym statusem"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Nazwa hosta: "
+msgid "Use cust_om port:"
+msgstr "Użyj inn_ego portu:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "Zarządzaj..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Jeżeli domyślny port, na którym przyjmowane są nadchodzące wiadomości nie "
+"odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
+"Konieczna stać się może ponowna konfiguracja firewalla."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Imię:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Nazwisko:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Ostrzegaj przed użyciem niezaszyfrowanego połączenia"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Adres e-mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_używaj zmiennej środowiskowej HTTP__PROXY"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Połącz konta"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Konto:"
+msgid "Add New Contact"
+msgstr "Dodaj nowy kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Pozwól mu/jej widzieć Twój status"
+msgid "A_ccount:"
+msgstr "_Konto:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Dodaj nowy kontakt"
+msgid "_Protocol:"
+msgstr "P_rotokół:"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1340
-msgid "I would like to add you to my contact list."
-msgstr "Chciałbym dodać Cię do listy kontaktów."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Identyfikator użytkownika:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Pseudonim:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupa:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Pozwól mu/jej widzieć Twój status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Autoryzacja"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -525,7 +553,11 @@ msgstr ""
 "aby móc dodać kontakt posługujący się tym\n"
 "protokołem."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "Za_rejestruj"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -534,587 +566,373 @@ msgstr ""
 "aby dodać kontakt posługujący się\n"
 "tym protokołem."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupa:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Pseudonim:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "P_rotokół:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "Za_rejestruj"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Autoryzacja"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Identyfikator użytkownika:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Wystąpił błąd:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Komendy ad-hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Wybierz komendę do wykonania:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Proszę czekać, trwa pobieranie listy komend..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Komendy ad-hoc - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Wybierz komendę do wykonania:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Sprawdź ponownie"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Opis błędu..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Proszę czekać, trwa wysyłanie komendy..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Zakończ"
+msgid "Please wait..."
+msgstr "Proszę czekać..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Proszę czekać, trwa pobieranie listy komend..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Ten obiekt Jabbera nie udostępnia żadnych komend."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Proszę czekać, trwa wysyłanie komendy..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Wystąpił błąd:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Proszę czekać..."
+msgid "Error description..."
+msgstr "Opis błędu..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Ten obiekt Jabbera nie udostępnia żadnych komend."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Zakończ"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Edytor zaawansowanych ustawień"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtr:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>UWAGA:</b> powienieneś ponownie uruchomić program by zastosować ostatnie "
 "ustawienia"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Edytor zaawansowanych ustawień"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtr:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Wróć do kolorów _domyślnych"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Usuń MOTD"
+msgid "Show _XML Console"
+msgstr "Konsola _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "_Edytuj listy prywatności"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Wyślij wiadomość do serwera..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Ustaw MOTD"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Ustawia Wiadomość Dnia"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Konsola _XML"
+msgid "Set MOTD..."
+msgstr "Ustaw MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Uaktualnij MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Uaktualnij MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Usuń MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Wyślij wiadomość do serwera..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "z tym kontaktem "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Akcje</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Warunki</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Dźwięki</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Opcje zaawansowane"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Edytor ustawień zaawansowanych"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Dowolny status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Zaraz wracam"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Zajęty "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt zmienił status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt rozłączył się"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "nie rozmawiam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Przesyłane pliki"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Pytanie o przysłanie pliku"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Przesyłanie pliku zatrzymane"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Podświetlenie wiadomości z czatu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Otrzymano wiadomość na czacie"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "rozmawiam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Niewidoczny"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Wykonaj komendę"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nieobecny"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Jeden bądź więcej określonych statusów..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Dostępny / Chętny do rozmowy"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Odtwórz dźwięk"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "Odbierz wiadomość"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Jeżeli "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Migaj obramowaniem zminimalizowanego okna rozmowy"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "Wyłącz _automatyczne otwieranie okna czatu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Wyłącz wyskakujące okienka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Wyłącz dźwięki dla tego zdarzenia"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 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"
-msgstr "_Powiadom mnie wyskakującym okienkiem"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-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 notification area"
-msgstr "_Pokaż zdarzenie w obszarze powiadomienia"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Pokaż zdarzenie na liście kontaktów"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "podczas, gdy "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "kontakt(y)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "dla "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "grupa/y"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "kiedy jestem obecny"
+msgid "Deletes Message of the Day"
+msgstr "Usuwa Wiadomość Dnia"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Żaden"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Ustawienia"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Połącz automatycznie"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Żaden"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Ustawienia"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Połącz automatycznie"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Wpis:"
+msgid "New entry received"
+msgstr "Odebrano nowy wpis"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Otrzymałeś nowy artykuł:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Nazwa kanału:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Wpis:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Ostatnio zmodyfikowany:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Odebrano nowy wpis"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Otrzymałeś nowy artykuł:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5452
-#: ../src/roster_window.py:5579 ../src/roster_window.py:5712
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Wiadomość:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Ustaw Aktywność"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Ustaw Aktywność"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Wiadomość:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Nastrój</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Wiadomość:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Zmień hasło"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Wpisz ponownie nowe hasło:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Wpisz nowe hasło:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Wpisz ponownie nowe hasło:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Wpisz nowy opis statusu:</b>"
+msgid "Save as Preset..."
+msgstr "Zapisz jako szablon..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktywność:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Nastrój:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktywność:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Szablony opisów:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Zapisz jako szablon..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Wpisz nowy opis statusu:</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Dołącz do _pokoju"
+msgid "_Copy Link Location"
+msgstr "_Kopiuj adres odnośnika"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "Dod_aj do listy kontaktów..."
+msgid "_Open Link in Browser"
+msgstr "_Otwórz Link w przeglądarce"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiuj JID/Adres e-mail"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiuj adres odnośnika"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Otwórz Klienta Poczty"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otwórz Link w przeglądarce"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowę"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4675
-msgid "#"
-msgstr "Nr"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Dołącz do _pokoju"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "Dod_aj do listy kontaktów..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaje kontakt do listy kontaktów (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Zaproś kontakt do rozmowy (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Zaproś kontakt do rozmowy (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Historia wiadomości (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Pokaż menu zaawansowanych funkcji (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "Nr"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Wyślij wiadomość"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Wyślij"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr "9"
 
-#: ../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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
+msgid "*"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "_Zaproś"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
-#: ../data/gui/chat_to_muc_window.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "Invite Friends!"
 msgstr "Zaproś przyjaciół!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Serwer MUC"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Proszę wybrać serwer MUC."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1122,119 +940,136 @@ msgstr ""
 "Zamierzasz rozpocząć czat.\n"
 "Wybierz kontakty, które chcesz do niego zaprosić"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "P_oproś o to, żeby móc widzieć jego/jej status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Proszę wybrać serwer MUC."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Dodaj powiadomienia _specjalne..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Serwer MUC"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Przypisz klucz Open_PGP..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "_Zaproś"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "Wykonaj komendę..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Rozpocznij _rozmowę"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Modyfikuj _grupy..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Wyślij _wiadomość..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Wyślij _plik..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5388
-#: ../src/roster_window.py:5547
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Za_proś do"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Zaproś kontakty"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Us_uń"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5398
-#: ../src/roster_window.py:5636
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Włącz/wyłącz _szyfrowanie połączenia"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "Wykonaj komendę..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Wyślij _wiadomość..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Modyfikuj dane kontaktu"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Wyślij _plik..."
+msgid "_Rename..."
+msgstr "_Zmień nazwę..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Ustaw własny _avatar..."
+msgid "Edit _Groups..."
+msgstr "Modyfikuj _grupy..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Rozpocznij _rozmowę"
+msgid "Assign Open_PGP Key..."
+msgstr "Przypisz klucz Open_PGP..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Włącz/wyłącz _szyfrowanie połączenia"
+msgid "Set Custom _Avatar..."
+msgstr "Ustaw własny _avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
+msgid "Add Special _Notification..."
+msgstr "Dodaj powiadomienia _specjalne..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Autoryzacja"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Pozwól mu/jej widzieć swój status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Pozwól mu/jej widzieć Twój status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5460
-#: ../src/roster_window.py:5585 ../src/roster_window.py:5715
-msgid "_Block"
-msgstr "_Zablokuj"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "P_oproś o to, żeby móc widzieć jego/jej status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5786
-msgid "_History"
-msgstr "_Historia"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "Ignoruj"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Zablokuj"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Modyfikuj dane kontaktu"
+msgid "_Unignore"
+msgstr "_Cofnij ignorowanie"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Zmień nazwę..."
+msgid "_Ignore"
+msgstr "Ignoruj"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Autoryzacja"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Us_uń"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Cofnij ignorowanie"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historia"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Wypełnij formularz."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracja pokoju"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Wypełnij formularz."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Edytuj Grupy"
@@ -1247,55 +1082,47 @@ msgstr "<b>Opis</b>"
 msgid "_Verify"
 msgstr "_Weryfikuj"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Możliwości programu"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Lista możliwych funkcjonalności Gajima:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Możliwości programu"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Lista aktywnych, ukończonych i zatrzymanych transferów plików"
+msgid "File Transfers"
+msgstr "Przesyłane pliki"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Usuwa transfer pliku"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Wyświetla listę przesłanych plików"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Usuwa wybrany transfer pliku"
+msgid "file transfers list"
+msgstr "lista przesyłanych plików"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Usuwa wybrany transfer pliku i usuwa niedokończony plik"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Lista aktywnych, ukończonych i zatrzymanych transferów plików"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Wyczy_ść"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Przesyłane pliki"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Ukrywa okno"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Usuwa zakończone, przerwane i nieudane transfery plików z listy"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Usuń przesyłanie tego pliku z listy."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Usuwa zakończone, przerwane i nieudane transfery plików z listy"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Wyświetla listę przesłanych plików"
-
-#: ../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"
@@ -1303,82 +1130,108 @@ msgstr ""
 "To działanie spowoduje usunięcie przesyłu pliku z listy. Jeśli jest on "
 "aktywnyto najpierw zostanie zatrzymany a dopiero potem usunięty"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Wyczy_ść"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Zatrzymaj"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Usuwa wybrany transfer pliku i usuwa niedokończony plik"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Kontynuuj"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Usuwa transfer pliku"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
+msgid "Cancels the selected file transfer"
+msgstr "Usuwa wybrany transfer pliku"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Otwórz katalog zawierający ten plik"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Ukrywa okno"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Zatrzymaj"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Kontynuuj"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista przesyłanych plików"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Otwórz katalog zawierający ten plik"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Kolory kart w oknie czatu</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:996
-msgid "Bold"
-msgstr "Wytłuszczone"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Tworzenie wiadomości"
+msgid "Gajim Themes Customization"
+msgstr "Wybieranie motywów dla Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "_Kolor tekstu:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Styl czcionki:"
+msgid "_Background:"
+msgstr "_Tło:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Wybieranie motywów dla Gajim"
+msgid "Text _font:"
+msgstr "_Czcionka tekstu:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Zniknął"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupa"
+msgid "Font style:"
+msgstr "Styl czcionki:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Nieaktywny"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Wytłuszczone"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:997
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kursywa"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Zatrzymany"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Tworzenie wiadomości"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Nieaktywny"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Kolory kart w oknie czatu</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Zniknął"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1386,7 +1239,7 @@ msgstr ""
 "MUC\n"
 "Wiadomości"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1394,105 +1247,98 @@ msgstr ""
 "Czat\n"
 "Wiadomości"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Zatrzymany"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Kolor tekstu:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Czcionka tekstu:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Tło:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Zmień pseudo_nim..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Zarządzaj pokojem"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Zmień _temat..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Konfiguruj _pokój..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1799
-msgid "_Bookmark"
-msgstr "Dodaj _zakładkę dla tego pokoju"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Zlikwiduj pokój"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Zarządzaj pokojem"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimalizuj przy zamknięciu"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Głos"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "Dodaj _zakładkę dla tego pokoju"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "_Send Private Message"
+msgstr "_Wyślij prywatną wiadomość"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Działania użytk_ownika"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Wyślij _plik"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Działania użytk_ownika"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "Dod_aj do listy kontaktów"
+msgid "_Voice"
+msgstr "_Głos"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Uczestnik"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "Za_banuj"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Właściciel"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Uczestnik"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Właściciel"
+msgid "_Ban"
+msgstr "Za_banuj"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Wyślij prywatną wiadomość"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Głos"
+msgid "_Add to Roster"
+msgstr "Dod_aj do listy kontaktów"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Pokaż formatowanie tekstu"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Zmień swoją nazwę (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Dodaj pokój do zakładek (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1504,34 +1350,19 @@ msgid "From:"
 msgstr "Od:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Temat:"
 
 #: ../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."
-msgstr ""
-"<b>UWAGA:</b>\n"
-"Jeżeli chcesz usuwać wiele danych, upewnij się najpierw że Gajim nie jest "
-"uruchomiony. Unikaj też usuwania historii rozmów kontaktów, z którymi "
-"właśnie rozmawiasz."
+msgid "Gajim History Logs Manager"
+msgstr "Historia rozmów"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Witaj w menedżerze historii rozmów Gajima</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "Eksport"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Historia rozmów"
-
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1546,168 +1377,195 @@ msgstr ""
 "wskazać logi po lewej stronie okna lub przeszukać ich bazę używając "
 "poniższego pola."
 
-#: ../data/gui/history_manager.ui.h:9
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>UWAGA:</b>\n"
+"Jeżeli chcesz usuwać wiele danych, upewnij się najpierw że Gajim nie jest "
+"uruchomiony. Unikaj też usuwania historii rozmów kontaktów, z którymi "
+"właśnie rozmawiasz."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Szukaj w bazie"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Stare historie"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Historia rozmowy"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Eksport"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "Wpisz JID lub nazwę kontaktu"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Pokoje"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Stare historie"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Historia rozmowy"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Szukaj"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Zapisuj w logach zmiany statusów kontaktów"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Inne czynności"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Inne czynności"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Prze_glądaj pokoje"
-
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2206
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "_Automatycznie dołącz do tego pokoju po uzyskaniu połączenia"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Pokój:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Ostatnio:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Ostatnio:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "_Automatycznie dołącz do tego pokoju po uzyskaniu połączenia"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Pokój:"
+msgid "_Bookmark this room"
+msgstr "_Dodaj zakładkę do tego pokoju"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Serwer:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "_Dodaj zakładkę do tego pokoju"
+msgid "Bro_wse Rooms"
+msgstr "Prze_glądaj pokoje"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1803
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Dołącz"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Połącz automatycznie"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Zaznaczenie spowoduje łączenie z tym pokojem przy starcie programu"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimalizuj po automatycznym wejściu"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Tytuł:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Wyświetlaj status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Połącz automatycznie"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Zaznaczenie spowoduje łączenie z tym pokojem przy starcie programu"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Tytuł:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimalizuj po automatycznym wejściu"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1718,136 +1576,133 @@ msgid "_Configure"
 msgstr "_Konfiguruj"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Właściwości</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"Połączenie HTTP\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Ustawienia</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"Połączenie HTTP\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Zarządzaj Profilami Proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Typ:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Hasło:"
+msgid "_Name:"
+msgstr "_Nazwa: "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "_Serwer Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Właściwości</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "_Port Proxy"
+msgid "Use HTTP prox_y"
+msgstr "Korzystaj z pośrednik_a HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Korzystaj z pośrednik_a HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Używaj aut_oryzacji serwera proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Nazwa użytkownika:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "_Hasło:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Nazwa: "
+msgid "Proxy _Host:"
+msgstr "_Serwer Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Typ:"
+msgid "Proxy _Port:"
+msgstr "_Port Proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Nazwa użytkownika:"
+msgid "<b>Settings</b>"
+msgstr "<b>Ustawienia</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Zarządzaj kontami"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Hasło"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Autoryzuj"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
-msgid "Available"
-msgstr "Dostępny"
+msgid "Version:"
+msgstr "Wersja:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "Konfiguruj"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Descrition:"
-msgstr "Opis:"
+#, fuzzy
+msgid "Authors:"
+msgstr "_Autoryzuj"
 
 #: ../data/gui/plugins_window.ui.h:7
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
-msgid "Installed"
-msgstr "Zainstalowany"
+#, fuzzy
+msgid "Description:"
+msgstr "Opis: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "Konfiguruj"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
+msgid "Installed"
+msgstr "Zainstalowany"
 
 #: ../data/gui/plugins_window.ui.h:13
-msgid "Version:"
-msgstr "Wersja:"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1861,1023 +1716,1033 @@ msgid "Event desc"
 msgstr "Opis zdarzenia"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Edytor zaawansowanych konfiguracji</b>"
+msgid "Use default applications"
+msgstr "Zawsze używaj domyślnych apikacji"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikacje</b>"
+msgid "Custom"
+msgstr "Własne"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
+msgid "All chat states"
+msgstr "Wszystkie stany rozmowy"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatyczny status</b>"
+msgid "Composing only"
+msgstr "Tylko o pisaniu"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Tożsamość na czacie</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Wyłączone"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Kolory wierszy czatu</b>"
+msgid "Never"
+msgstr "_Nigdy"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Powiadomienia o stanie</b>"
+msgid "Only when pending events"
+msgstr "Tylko, kiedy wystąpią jakieś zdarzenia"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Połączenie</b>"
+msgid "Always"
+msgstr "Zawsze"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "Pokaż wyskakujące okno"
 
-#. 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>Własne</b>"
+msgid "Notify me about it"
+msgstr "Wyświetl powiadomienie"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Czcionka</b>"
+msgid "Show only in roster"
+msgstr "Pokaż tylko na liście kontaktów"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opcje konta Gmail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Zapisane opisy</b>"
+msgid "Single window for everything"
+msgstr "Jedno okno do wszystkiego"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Prywatność</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Tożsamość na rosterze</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Ostatni status %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Opisy statusu</b>"
+msgid "Preferences"
+msgstr "Ustawienia"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Tematy</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Wyświetlaj awatary kontaktów z listy"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
+"kontaktów (roster oraz okno czatu)"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Powiadomienia wizualne</b>"
+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:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(przykład: serwerstun.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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:23
-msgid "Advanced"
-msgstr "Zaawansowane"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Wyświetlaj nastroje kontaktów z listy"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Zaawansowane..."
+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:25
-msgid "All chat states"
-msgstr "Wszystkie stany rozmowy"
+msgid "Sort contacts by status"
+msgstr "Sortuj kontakty według statusu"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
+msgid "in _roster"
+msgstr "w _liście kontaktów"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "Zezwól na wysyłanie informacji o czasie mojej _bezczynności"
+msgid "in _group chats"
+msgstr "w _konferencji"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
-"niewidoczny"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Tożsamość na rosterze</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Włącz dźwięki, kiedy jestem _zajęty"
+msgid "_Window behavior:"
+msgstr "_Zachowanie okna:"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "Zawsze"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
+"emotikonami graficznymi"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Pytaj o opis przy zmianie statusu na:"
+msgid "_Emoticons:"
+msgstr "_Emotikony:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr "Audio / Video"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "_Spraw by okna rozmowy były zwarte"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "Wejście audio"
+msgid "Hide all buttons in chat windows"
+msgstr "Ukryj przyciski w oknie rozmowy"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "Wyjście audio"
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignoruj wzbogaconą treść w wiadomościach"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Wiadomość:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Niektóre wiadomości mogą zawierać dodatkowe atrybuty, jak kolory, czy "
+"formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te "
+"dodatki i wyświetlał czysty tekst."
 
 #: ../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"
+msgid "_Highlight misspelled words"
+msgstr "Podś_wietlaj błędy w pisowni"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
-msgstr "Tylko o pisaniu"
+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 ""
+"Zaznaczenie tej opcji spowoduje, że Gajim będzie podświetlał błędy w pisowni "
+"w oknach rozmów. Jeżeli nie wskazano konkrentego słownika, program użyje "
+"słownika domyślnego."
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Konfiguruj kolor i czcionkę interfejsu"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Pokaż _listę kontaktów"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "Wiadomość:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Dźwięk, jaki będzie odtwarzany, gdy nadejdzie wiadomość MUC."
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "Pseudonim kontaktu:"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Własne"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Tożsamość na czacie</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Powiadom mnie o kontaktach, które się _logują"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Wyłączone"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
+"niewidoczny"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Wyświetlaj aktywność kontaktów z listy"
+msgid "Notify on new _GMail email"
+msgstr "Powiadamiaj o nowej poczcie na koncie _Gmail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+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:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Wyświetlaj nastroje kontaktów z listy"
+msgid "Display _extra email details"
+msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Wyświetlaj muzyczne ikonki kontaktów z listy"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+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:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Wyświetlaj awatary kontaktów z listy"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opcje konta Gmail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Wyświetlaj nastroje kontaktów z listy"
+msgid "Show notification area icon:"
+msgstr "Pokaż ikonę w obszarze powiadomienia:"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Powiadomienia wizualne</b>"
 
 #: ../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 może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
-"W tym miejscu możesz zdecydować, które z tych danych chcesz wyświetlać w "
-"oknie rozmowy."
+msgid "Play _sounds"
+msgstr "Odtwórz _dźwięk"
 
 #: ../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 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."
+msgid "Ma_nage..."
+msgstr "Za_rządzaj..."
 
 #: ../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 powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
-"kontaktach które zmieniają status na Rozłączony"
+msgid "Allow sound when I'm _busy"
+msgstr "Włącz dźwięki, kiedy jestem _zajęty"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Dźwięki</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "Ukryj przyciski w oknie rozmowy"
+msgid "Notifications"
+msgstr "Powiadomienia"
 
 #: ../data/gui/preferences_window.ui.h:59
 msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
+"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 ""
-"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
-"używasz"
+"Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
+"W tym miejscu możesz zdecydować, które z tych danych chcesz wyświetlać w "
+"oknie rozmowy."
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
-"informacje o nadawcach nowej poczty w twojej skrzynce"
+msgid "_Display chat state notifications:"
+msgstr "Wyświetlaj informacje stanie kontaktu:"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"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 ""
-"Uaktywnienie tej opcji spowoduje, że Gajim będzie zmieniał status na Zaraz "
-"wracam gdy komputer nie będzie używany."
+"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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Użycie tej opcji oznacza, że Gajim zmieni status na Niedostępny po dłuższym "
-"okresie bezczynności"
+msgid "_Send chat state notifications:"
+msgstr "Rodzaje powiadomień wysyłanych podczas rozmowy:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
-"kontaktów (roster oraz okno czatu)"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Powiadomienia o stanie</b>"
 
 #: ../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 ""
-"Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
-"jego nazwą na liście kontaktów"
+msgid "Personal Events"
+msgstr "Zdarzenia"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "Automatyczny status '_Zaraz wracam' po:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy "
-"kontaktów (roster oraz okno czatu)"
+"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: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)"
+msgid "_Not available after:"
+msgstr "Automatyczny status '_Nieobecny' po:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy "
-"kontaktów (roster oraz okno czatu)"
+"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: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 ""
-"Zaznaczenie tej opcji spowoduje, że Gajim będzie podświetlał błędy w pisowni "
-"w oknach rozmów. Jeżeli nie wskazano konkrentego słownika, program użyje "
-"słownika domyślnego."
+msgid "minutes"
+msgstr "minutach"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Zaznacz tę opcję tylko jeśli ktoś spoza listy kontaktów nęka Cię "
-"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: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 ""
-"Po uaktywnieniu tej opcji, Gajim będzie logował wiadomości zaszyfrowane "
-"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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
-"informacje o nowej poczty w twojej skrzynce GMail"
+"Opis automatycznego opisu statusu \"Zaraz Wracam\". Jeśli pusty, Gajim nie "
+"zmieni obecnego opisu\n"
+"$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: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, "
-"etc...)"
-msgstr ""
-"Dzięki tej opcji Gajim będzie używał zestawów ikon charakterystycznych dla "
-"transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
-"dostępny, zaraz wracam, zajęty, itd"
-
-#: ../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 ""
-"Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
-"użyty opis domyślny."
-
-#: ../data/gui/preferences_window.ui.h:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
-"emotikonami graficznymi"
+"Opis automatycznego opisu statusu \"Nieobecny\". Jeśli pusty, Gajim nie "
+"zmieni obecnego opisu\n"
+"$S będzie zastąpione przez poprzedni opis statusu\n"
+"$T będzie zastąpione przez czas, po którym ma zostać ustawiono status "
+"\"Nieobecny\""
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Loguj _zaszyfrowane wiadomości"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatyczny status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "_Spraw by okna rozmowy były zwarte"
+msgid "Ask status message when I:"
+msgstr "Pytaj o opis przy zmianie statusu na:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Za_rządzaj..."
+msgid "Sign _in"
+msgstr "_Połączony"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Never"
-msgstr "_Nigdy"
+msgid "Sign _out"
+msgstr "R_ozłączony"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Powiadomienia"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Powiadom mnie o kontaktach, które się _logują"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Opisy statusu</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Zapisane opisy</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notify me about it"
-msgstr "Wyświetl powiadomienie"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Powiadamiaj o nowej poczcie na koncie _Gmail"
+msgid "Use system _default"
+msgstr "Użyj _domyślnej dla systemu"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr "Tylko, kiedy wystąpią jakieś zdarzenia"
+msgid "Chat message:"
+msgstr "Wiadomość:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Zdarzenia"
+msgid "<b>Font</b>"
+msgstr "<b>Czcionka</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Odtwórz _dźwięk"
+msgid "Use _transports icons"
+msgstr "Używaj zestawów ikon _transportów"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
-msgstr "Pokaż wyskakujące okno"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Dzięki tej opcji Gajim będzie używał zestawów ikon charakterystycznych dla "
+"transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
+"dostępny, zaraz wracam, zajęty, itd"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Ustawienia"
+msgid "Status _iconset:"
+msgstr "Zestaw ikon _statusu:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
-"Nazwa hosta serwera STUN. Jeśli nie podano żadnej,\n"
-"Gajim spróbuje odnaleźć ją na serwerze."
+msgid "Configure color and font of the interface"
+msgstr "Konfiguruj kolor i czcionkę interfejsu"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Motyw:"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "Serwer STUN:"
+msgid "<b>Themes</b>"
+msgstr "<b>Tematy</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr "Pokaż ikonę w obszarze powiadomienia:"
+msgid "Contact's nickname:"
+msgstr "Pseudonim kontaktu:"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid "Show only in roster"
-msgstr "Pokaż tylko na liście kontaktów"
+msgid "Your nickname:"
+msgstr "Twój pseudonim:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Połączony"
+msgid "_Status message:"
+msgstr "_Informacja o statusie:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "R_ozłączony"
+msgid "_URL highlight:"
+msgstr "_Podświetlanie URL:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr "Jedno okno do wszystkiego"
+msgid "_Reset to Default Colors"
+msgstr "Wróć do kolorów _domyślnych"
 
 #: ../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 ""
-"Niektóre wiadomości mogą zawierać dodatkowe atrybuty, jak kolory, czy "
-"formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te "
-"dodatki i wyświetlał czysty tekst."
+msgid "Contact's message:"
+msgstr "Wiadomość:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sortuj kontakty według statusu"
+msgid "Your message:"
+msgstr "Twoja wiadomość:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Podświetlenie wiadomości z czatu"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Zestaw ikon _statusu:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Kolory wierszy czatu</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Styl"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Motyw:"
+msgid "Audio input device"
+msgstr "Wejście audio"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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 ""
-"Opis automatycznego opisu statusu \"Zaraz Wracam\". Jeśli pusty, Gajim nie "
-"zmieni obecnego opisu\n"
-"$S będzie zastąpione przez poprzedni opis statusu\n"
-"$T będzie zastąpione przez czas, który jesteś nieaktywny"
+msgid "Audio output device"
+msgstr "Wyjście audio"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
+msgstr "Wejście video"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
-msgstr ""
-"Opis automatycznego opisu statusu \"Nieobecny\". Jeśli pusty, Gajim nie "
-"zmieni obecnego opisu\n"
-"$S będzie zastąpione przez poprzedni opis statusu\n"
-"$T będzie zastąpione przez czas, po którym ma zostać ustawiono status "
-"\"Nieobecny\""
+msgid "Video output device"
+msgstr "Wyjście video"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "Klatek na sekundę"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "Rozmiar obrazu"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Używaj zestawów ikon _transportów"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr "Zawsze używaj domyślnych apikacji"
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Użyj _domyślnej dla systemu"
+msgid "STUN server:"
+msgstr "Serwer STUN:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr "Klatek na sekundę"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(przykład: serwerstun.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr "Wejście video"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
-msgstr "Wyjście video"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+"Nazwa hosta serwera STUN. Jeśli nie podano żadnej,\n"
+"Gajim spróbuje odnaleźć ją na serwerze."
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr "Rozmiar obrazu"
+msgid "<b>Connection</b>"
+msgstr "<b>Połączenie</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Audio / Video"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "Twoja wiadomość:"
+msgid "_File manager:"
+msgstr "Menadżer _plików:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "Twój pseudonim:"
+msgid "_Mail client:"
+msgstr "Klient _poczty:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "Automatyczny status '_Zaraz wracam' po:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Wyświetlaj informacje stanie kontaktu:"
+msgid "<b>Custom</b>"
+msgstr "<b>Własne</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emotikony:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikacje</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "Menadżer _plików:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "Podś_wietlaj błędy w pisowni"
+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 ""
+"Zaznacz tę opcję tylko jeśli ktoś spoza listy kontaktów nęka Cię "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ignoruj wzbogaconą treść w wiadomościach"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
+"używasz"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Zapisuj w logach zmiany statusów kontaktów"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "Klient _poczty:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
+"używasz"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "Automatyczny status '_Nieobecny' po:"
+msgid "Log _encrypted chat session"
+msgstr "Loguj _zaszyfrowane wiadomości"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Otwórz..."
+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 ""
+"Po uaktywnieniu tej opcji, Gajim będzie logował wiadomości zaszyfrowane "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "Wróć do kolorów _domyślnych"
+msgid "Allow my _idle time to be sent"
+msgstr "Zezwól na wysyłanie informacji o czasie mojej _bezczynności"
 
 #: ../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:134
-msgid "_Status message:"
-msgstr "_Informacja o statusie:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "_Podświetlanie URL:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Prywatność</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Zachowanie okna:"
+msgid "_Log status changes of contacts"
+msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "w _konferencji"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "w _liście kontaktów"
+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:139
-msgid "minutes"
-msgstr "minutach"
+msgid "_Open..."
+msgstr "_Otwórz..."
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Dodaj / Edytuj regułę</b>"
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Edytor zaawansowanych konfiguracji</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista reguł</b>"
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Zaawansowane"
 
-#: ../data/gui/privacy_list_window.ui.h:3
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "Poufne listy:"
+
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Poufna Lista"
+
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<i>Privacy List</i>"
 msgstr "<p>Lista prywatności</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktywny w tej sesji"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "P_ołącz przy starcie programu"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista reguł</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "wszystkim"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Dodaj / Edytuj regułę</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Wszystko (łącznie z zubskrypcją)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Zezwól"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Odmów"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "według grupy"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Kolejność:"
+msgid "all by subscription"
+msgstr "według autoryzacji"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3844
-msgid "Privacy List"
-msgstr "Poufna Lista"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "wszystkim"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "według autoryzacji"
+msgid "to send me messages"
+msgstr "wysyłać mi wiadomości"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "według grupy"
+msgid "to send me queries"
+msgstr "wysyłać kwerendy"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Obustronna"
+msgid "to view my status"
+msgstr "widzieć mój status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Od"
+msgid "to send me status"
+msgstr "wysyłać mi status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "pierwsza"
+msgid "All (including subscription)"
+msgstr "Wszystko (łącznie z zubskrypcją)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "druga"
+msgid "Order:"
+msgstr "Kolejność:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "wysyłać mi wiadomości"
+#, fuzzy
+msgid "none"
+msgstr "pierwsza"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "wysyłać kwerendy"
+#, fuzzy
+msgid "both"
+msgstr "Obustronna"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "wysyłać mi status"
+#, fuzzy
+msgid "from"
+msgstr "Od"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "widzieć mój status"
-
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "Poufne listy:"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresy</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Awatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "druga"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Data urodzenia:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Miasto:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Nazwisko:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Firma:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Kraj:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Drugie imię:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Dział:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>Adres e-mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefiks:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Dodatkowy adres:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Imię:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Nazwisko:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sufiks:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Imię i nazwisko</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Ulica:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Imię:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Miasto:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Strona domowa:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Województwo:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Dodatkowy adres:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Drugie imię:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Kod pocztowy</b>:"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Imię:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Kraj:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Pseudonim:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresy</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefon:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Strona domowa:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Stanowisko:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Imię:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Kod pocztowy</b>:"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Pseudonim:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefon:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: RRRR-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Rola:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Data urodzenia:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Województwo:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>Adres e-mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Ulica:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Awatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Kliknij aby ustawić avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sufiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Informacje osobiste"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Firma:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Informacje"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Stanowisko:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Kliknij aby ustawić avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Dział:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: RRRR-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Rola:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Informacje osobiste"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Praca"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Co chcesz zrobić?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Informacje"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Usuń konto _tylko z Gajima"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Usuń konto z Gajima i z _serwera"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Co chcesz zrobić?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5470
-#: ../src/roster_window.py:5595 ../src/roster_window.py:5725
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Usuń"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Dodaj _kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "_Możliwości programu"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Działania"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Przesyłanie plików"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Dodaj _kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Najczęściej Zadawane Pytania (w sieci)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Edycja"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Pomoc w sieci"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Konta"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, _Awatar"
+
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr "_Wtyczki"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Profil, _Awatar"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Widok"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Pokaż kontakty _niepołączone"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Pokaż kontakty _połączone"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Pokaż trans_porty"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Pokaż kontakty _niepołączone"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Konta"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Przesyłanie plików"
 
-#. 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 "_Działania"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Pomoc"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1519
-msgid "_Edit"
-msgstr "_Edycja"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Pomoc w sieci"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Pomoc"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Wyślij _wiadomość..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Najczęściej Zadawane Pytania (w sieci)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Widok"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Proszę czekać, trwa pobieranie formularza wyszukiwania..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Możliwości programu"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Szukaj"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Proszę czekać, trwa pobieranie formularza wyszukiwania..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5737
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Szukaj"
 
@@ -2897,41 +2762,37 @@ msgstr "Zarejestruj w"
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Odpowiedz na tę wiadomość"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Do:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Wyślij"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Wyślij wiadomość"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Wyślij wiadomość i zamknij okno"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Odpowiedz"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Do:"
+msgid "Reply to this message"
+msgstr "Odpowiedz na tę wiadomość"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Odpowiedz"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Wyślij i zamknij"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Wyślij wiadomość i zamknij okno"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Autoryzuj"
+msgid "Subscription Request"
+msgstr "Prośba o autoryzację"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączony"
+msgid "_Deny"
+msgstr "O_dmów"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2941,262 +2802,274 @@ msgstr ""
 "Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś "
 "połączony"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Prośba o autoryzację"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Autoryzuj"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "O_dmów"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączony"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Synchronizuj kontakty"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Wybierz kontakty, które chcesz zsynchronizować"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronizacja: wybierz kontakty"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Wyłącz dźwięki"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Wyślij _wiadomość"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Pokaż wszystkie oczekujące _zdarzenia"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Wybierz kontakty, które chcesz zsynchronizować"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Pokój"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Pytaj:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Wyślij _wiadomość"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klient:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Czas u niego/niej:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Wyłącz dźwięki"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informacje o kontakcie"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Zasób:</b>:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Subskrybcja:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klient:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentarze"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Czas u niego/niej:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Awatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Ustawiony avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Subskrybcja:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informacje o kontakcie"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Pytaj:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Więcej"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Używany avatar"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Filtr</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentarze"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Wejście XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Informacje/Zapytanie"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Filtr</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Informacje/Zapytanie"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Obecność"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "Wiado_mość"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Obecność"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Wejście XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Modyfikuj konto..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokalny JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Informacje osobiste"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Zasoby:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Klient Jabbera w GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Informacje osobiste"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Komunikator Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Klient komunikatora Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Klient Jabbera w GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Cofnij potwierdzenie"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Niepoprawny pokój"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Usługa wysłała niepoprawne dane"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Klient na %s anulował negocjację sesji"
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Komendy ad-hoc - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Usługa zwróciła komunikat błędu."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktywny"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Nieaktywny"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Zmienna logiczna"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1016
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Kolor"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Nazwa opcji"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Wartość"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Brak)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Ukryte"
 
@@ -3208,258 +3081,183 @@ msgstr[0] "Otrzymano nowe wpisy (i %d nie wyświetlony):"
 msgstr[1] "Otrzymano nowe wpisy (i %d nie wyświetlone):"
 msgstr[2] "Otrzymano nowe wpisy (i %d nie wyświetlonych):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:77
-msgid "English"
-msgstr "angielski"
-
-#: ../src/chat_control.py:77
-msgid "Belarusian"
-msgstr "bułgarski"
-
-#: ../src/chat_control.py:77
-msgid "Bulgarian"
-msgstr "bułgarski"
-
-#: ../src/chat_control.py:77
-msgid "Breton"
-msgstr "bretoński"
-
-#: ../src/chat_control.py:77
-msgid "Czech"
-msgstr "czeski"
-
-#: ../src/chat_control.py:77
-msgid "German"
-msgstr "niemiecki"
-
-#: ../src/chat_control.py:77
-msgid "Greek"
-msgstr "grecki"
-
-#: ../src/chat_control.py:77
-msgid "British"
-msgstr "brytyjski"
-
-#: ../src/chat_control.py:77
-msgid "Esperanto"
-msgstr "esperanto"
-
-#: ../src/chat_control.py:77
-msgid "Spanish"
-msgstr "hiszpański"
-
-#: ../src/chat_control.py:77
-msgid "Basque"
-msgstr "baskijski"
-
-#: ../src/chat_control.py:77
-msgid "French"
-msgstr "francuski"
-
-#: ../src/chat_control.py:77
-msgid "Croatian"
-msgstr "chorwacki"
-
-#: ../src/chat_control.py:77
-msgid "Italian"
-msgstr "włoski"
-
-#: ../src/chat_control.py:77
-msgid "Norwegian (b)"
-msgstr "norweski (b)"
-
-#: ../src/chat_control.py:77
-msgid "Dutch"
-msgstr "holenderski"
-
-#: ../src/chat_control.py:77
-msgid "Norwegian"
-msgstr "norweski"
-
-#: ../src/chat_control.py:77
-msgid "Polish"
-msgstr "polski"
-
-#: ../src/chat_control.py:77
-msgid "Portuguese"
-msgstr "portugalski"
-
-#: ../src/chat_control.py:77
-msgid "Brazilian Portuguese"
-msgstr "portugalski (Brazylia)"
-
-#: ../src/chat_control.py:77
-msgid "Russian"
-msgstr "rosyjski"
-
-#: ../src/chat_control.py:77
-msgid "Serbian"
-msgstr "serbski"
-
-#: ../src/chat_control.py:77
-msgid "Slovak"
-msgstr "słowacki"
-
-#: ../src/chat_control.py:77
-msgid "Swedish"
-msgstr "szwedzki"
-
-#: ../src/chat_control.py:77
-msgid "Chinese (Ch)"
-msgstr "chiński (Ch)"
-
-#: ../src/chat_control.py:218
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/chat_control.py:223
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:228
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "Błąd."
 
-#: ../src/chat_control.py:550
-msgid "Spelling language"
-msgstr "Wybierz słownik"
-
 #. we are not connected
-#: ../src/chat_control.py:582 ../src/chat_control.py:791
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:583 ../src/chat_control.py:792
+#: ../src/chat_control.py:801
 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:998
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/chat_control.py:999
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Przekreślenie"
 
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Czcionka:"
 
-#: ../src/chat_control.py:1031
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Usuń formatowanie"
 
-#: ../src/chat_control.py:1109
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: ../src/chat_control.py:1110
+#: ../src/chat_control.py:1158
 #, 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:1574 ../src/chat_control.py:2094
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
-#: ../src/chat_control.py:1595 ../src/chat_control.py:1598
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "Wymaga python-farsight."
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
 #. Add to roster
-#: ../src/chat_control.py:1620 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1074 ../src/dialogs.py:2103
-#: ../src/dialogs.py:2132 ../src/gui_interface.py:500
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1608 ../src/roster_window.py:1610
-#: ../src/roster_window.py:1943 ../src/roster_window.py:3405
-#: ../src/roster_window.py:3432
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1650
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Przełącz sesję audio"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Przełącz sesję wideo"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Funkcjonalność niedostępna dla systemu Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Wyślij _plik"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1788
 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:1761
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1953
+#: ../src/chat_control.py:2098
 #, 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:2074 ../src/dialogs.py:5375
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Nie ma przypisanego klucza GPG"
 
-#: ../src/chat_control.py:2075
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 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:2084
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:2110
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:2112
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:2129
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:2129
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2131
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:2131
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2139
+#: ../src/chat_control.py:2294
 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:2146
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3468,32 +3266,32 @@ msgstr ""
 "%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
 "Twoja sesja %(logged)s będzie logowana."
 
-#: ../src/chat_control.py:2289
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:2299
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2301
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Ta sesja NIE BĘDZIE archiwizowana na serwerze"
 
-#: ../src/chat_control.py:2310
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:2313
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "i BĘDZIE logowana"
 
-#: ../src/chat_control.py:2315
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "i NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:2320
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3501,25 +3299,25 @@ msgstr ""
 "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
 "tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:2322
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:2366 ../src/chat_control.py:2379
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:2372
+#: ../src/chat_control.py:2526
 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:2657
+#: ../src/chat_control.py:2797
 #, 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:2658
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3527,16 +3325,14 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/chat_control.py:2812 ../src/common/connection.py:457
-#: ../src/common/connection_handlers.py:1362
-#: ../src/common/connection_handlers.py:1467
-#: ../src/common/connection_handlers.py:1640
-#: ../src/common/connection_handlers_events.py:810
-#: ../src/common/logger.py:1126 ../src/gajim.py:192 ../src/session.py:138
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: ../src/chat_control.py:2813
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3545,7 +3341,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:3047 ../src/gui_interface.py:1049
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3554,169 +3350,463 @@ msgstr ""
 "Nie można odszyfrować wiadomości od %s\n"
 "To mogło być sfałszowane."
 
-#: ../src/chat_control.py:3080
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Przesyłane pliki"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Rozmiar: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Akceptuj"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Zakończono przesyłanie pliku"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Zaproszenie na czat"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Druga strona przerwała transfer"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Błąd odczytu pliku"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Przesyłanie pliku zatrzymane"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Przesyłanie pliku anulowane"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Nie można ustanowić połączenia z drugą stroną."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Użycie: /%s ukrywa przyciski czatu."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "Nie znaleziono %s"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Zaraz wracam"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Dostępny"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Użycie: /%s czyście okno tekstowe."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Komenda nie jest wspierana dla konta zeroconf."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s nie jest prawidłowym poziomem logowania"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Połączenie jest niemożliwe"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Połączenie jest niedostępne"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Zmień swoją nazwę (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Niepoprawny pseudonim"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Pseudonim nie został odnaleziony: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Wyślij %s do %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Jestes zaproszony do rozmowy grupowej"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Niepoprawna nazwa serwera"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "afiliacja została zmieniona "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Brak argumentu \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Zmień informację o statusie"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Zmień status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Ustaw typ widoczności i status opisowy"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Dostępny"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Nieobecny"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Nieobecny - rozłączony"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Status opisowy"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Status został zmieniony."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Opuść pokoje"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pokoju %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Nie dołączyłeś do pokoju."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 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:795
-#: ../src/roster_window.py:1612 ../src/roster_window.py:1614
-#: ../src/roster_window.py:5355
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Pokoje"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Opuściłeś pokoje:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Prześlij dalej nieprzeczytane wiadomości"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Wszystkie nieprzeczytane wiadomości zostały przesłane dalej."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Prześlij dalej nieprzeczytane wiadomości"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Włącz dźwięki, kiedy użytkownik jest zajęty"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Pokaż tylko połączone i chętne do rozmowy kontakty."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Zaraz wracam z powodu braku aktywności przez $T min.)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Status Nieobecny z powodu bezczynności programu powyżej $T min.)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
@@ -3724,64 +3814,120 @@ msgstr ""
 "Kiedy pokazać ikonę w obszarze powiadomienia. Dostępne wartości to "
 "'never' (nigdy), 'on_event' (podczas zdarzenia), 'always' (zawsze)."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Kolor przychodzącego pseudonimu."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 #, fuzzy
 msgid "Outgoing nickname color."
 msgstr "Kolor wychodzącego pseudonimu."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Kolor tekstu opisu."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Pokaż zdarzenie w obszarze powiadomienia"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Pokaż zdarzenie w obszarze powiadomienia"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Pytanie o przysłanie pliku"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Przesyłanie pliku anulowane"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Zaproszenie na czat"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Czcionka pseudonimu przychodzącego."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Czcionka wychodzącego pseudonimu."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Czcionka opisu."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:2634
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "domyślny"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Język używany przez słownik"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3792,7 +3938,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3803,18 +3949,18 @@ msgstr ""
 "najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy "
 "opcja print_time ustawiona jest na 'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
 "pogrubiony ale bez usuniętych znaków * *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3824,7 +3970,7 @@ msgstr ""
 "zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
 "http://docutils.sourceforge.net/docs/ref/rst/"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3832,7 +3978,7 @@ msgstr ""
 "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
 "czat)"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3840,7 +3986,13 @@ msgstr ""
 "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
 "używany przez innego uzytkownika czatu"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3851,50 +4003,60 @@ msgstr ""
 "minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy przed nazwą użytkownika"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy za nazwą użytkownika"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Ile minut powinny być widoczne linie z poprzedniej rozmowy."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3902,11 +4064,11 @@ msgstr ""
 "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
 "zachowanie klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3915,13 +4077,13 @@ msgstr ""
 "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
 "co oznacza użycie wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
 "wykorzystaniem gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3934,14 +4096,14 @@ msgstr ""
 "synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego "
 "połączenia sieciowego."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3949,7 +4111,7 @@ msgstr ""
 "Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje "
 "wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3958,38 +4120,41 @@ msgstr ""
 "(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
 "czas nadejścia nowej wiadomości."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Zapytaj przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest "
 "na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone "
 "spacją)."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nigdy nie pytaj przed zamknięciem karty/okna rozmowy grupowej, która "
 "prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
 "rozdzielone spacją)."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Spytaj przed zamknięciem zakładki, jeśli po zamknięciu mogą zostać stracone "
 "pewne dane(rozmowy, prywatne rozmowy, grupowe rozmowy, które nie zostaną "
 "zminimalizowane)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3997,27 +4162,33 @@ msgstr ""
 "Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania "
 "plików, w przypadku tłumaczenia adresu/przekierowania portu."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "Powiadamiaj o zdarzeniach w obszarze powiadamiania."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4029,18 +4200,18 @@ msgstr ""
 "16, 17 i 18. Wyższy numery są bardziej bezpiecznie, lecz obliczanie zajmie "
 "więcej czasu podczas rozpoczynania sesji."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4050,14 +4221,14 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Jeśli ma wartość True, Gajim sprawdzi przy każdym uruchomieniu czy jest "
 "domyślnym klientem Jabbera."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4066,7 +4237,7 @@ msgstr ""
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4074,11 +4245,11 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Zdefiniuj pozycję avatara na liście kontaktów. Lewo lub prawo"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4086,7 +4257,7 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyśle zapytanie o awatar każdego kontaktu, "
 "który ostatnio nie miał awatara lub ma zapisany jedynie stary."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4094,9 +4265,10 @@ msgstr ""
 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
 "opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4109,30 +4281,34 @@ msgstr ""
 "\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
 "użytkownika do pokoju lub jego opuszczeniu."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Kolor tła dla logujących się kontaktów."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Kolor tła dla kontaktów w trakcie wylogowywania."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Jeżeli opcja ustawiona jest na True, przywrócone wiadomości będą wyświetlane "
 "mniejszą czcionką."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4142,7 +4318,7 @@ msgstr ""
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4153,7 +4329,8 @@ msgstr ""
 "wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4161,7 +4338,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontroluje zachowanie okna z nowymi wiadomościami.\n"
@@ -4174,35 +4351,43 @@ msgstr ""
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
 "oknie rozmowy."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
 "klawisza ESC."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Ukrywa przyciski w oknie czatu."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Usuwa z okna rozmowy grupowej listę osób obecnych w pokoju."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4210,15 +4395,15 @@ msgstr ""
 "Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
 "wówczas, gdy poprzednią wiadomość wysłała inna osoba."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Płynne przewijanie w oknie rozmowy"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4226,13 +4411,13 @@ msgstr ""
 "Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków "
 "w oknach czatu."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Kombinacja klawiszy Ctrl-Tab przechodzi do następnej karty, o ile w żadnej z "
 "nich nie ma nieprzeczytanych wiadomości."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4240,7 +4425,7 @@ msgstr ""
 "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
 "Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4248,7 +4433,7 @@ msgstr ""
 "Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że "
 "potwierdzenie nie będzie wyświetlane."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4256,7 +4441,7 @@ msgstr ""
 "Wyświetlać potwierdzenie statusu indywidualnego? Pusta linia oznacza, że "
 "potwierdzenie nie będzie wyświetlane."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4267,7 +4452,7 @@ msgstr ""
 "ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
 "serwera."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4275,7 +4460,7 @@ msgstr ""
 "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
 "używał Menedżera bazy kluczy GNOME."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4283,7 +4468,7 @@ msgstr ""
 "Po włączeniu Gajim użyje aplikacji KDE Wallet do przechowywania haseł (o ile "
 "biblioteka kwalletcli jest zainstalowana)."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4292,7 +4477,7 @@ msgstr ""
 "połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
 "grupy"
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4301,7 +4486,7 @@ msgstr ""
 "Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
 "wiadomość"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4310,22 +4495,13 @@ msgstr ""
 "kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
 "nie jest już otwarte."
 
-#: ../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 ""
-"Jeżeli ustawiono na 'True', Gajim dokona konwersji ciągów zawartych pomiędzy "
-"$$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do "
-"okna rozmowy."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wymagany jest okres nieaktywności zanim zamknięte zostanie okno zmiany "
 "statusu."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4333,7 +4509,7 @@ msgstr ""
 "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
 "usuwane."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4342,17 +4518,11 @@ msgstr ""
 "Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
 "powiadomień."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr "Zmień rozmiar pokazywanych formuł latex-a."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4360,52 +4530,82 @@ msgstr ""
 "Wzorce ważnych uri. Tylko wzorce z tej listy będzie przyjmowane jako "
 "\"prawdziwe\" uri. (mailto i xmpp są traktowane oddzielnie)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Pytaj o opis statusu \"Niepołączony\" wszystkich niepołączonych kontaktów, "
 "kiedy jest połączenie z kontem. OSTRZEŻENIE: To może być przyczyną wysyłania "
 "wielu zapytań!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Jeśli włączony, uzupełnianie w konferencjach będzie działać tak samo, jak w "
 "konsoli."
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
+"użyty opis domyślny."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4413,7 +4613,7 @@ msgstr ""
 "Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4422,38 +4622,38 @@ msgstr ""
 "rozmowy, zaraz wracam, nieobecny, nie przeszkadzać, niewidoczny. UWAGA: ta "
 "opcja będzie używana tylko jeśli restore_last_status będzie wyłączone"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Jeśli włączone, przywróc ostatni status, który był użyty."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Jeśli włączony, pytania o autoryzację będą automatycznie akceptowane."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Wyłącznie opcji wyłączy konto i ukryje je w oknie kontaktów."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Po wyłączeniu tej opcji, Gajim nie podpisuje komunikatów o stanach kluczem "
 "GPG, nawet jeśli GPG jest skonfigurowany."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Włączono szyfrowanie ESession dla tego konta."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to "
 "możliwe?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4461,49 +4661,64 @@ msgstr ""
 "Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. "
 "Może zawierać tls, ssl lub plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
 "program będzie ignorował."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Wysyłanie białych znaków po nieaktywności"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "Wysyłanie pingu XMPP po nieaktywności"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Czas oczekiwania (w sekundach) na odpowiedź na pakiet podtrzymujący "
 "połączenie przed podjęciem próby ponownego połączenia."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4511,15 +4726,34 @@ msgstr ""
 "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
 "file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Odpowiedź na żądanie potwierdzenia"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Wyślij żądanie potwierdzenia"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
+"używasz"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s chce przesłać ci plik."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4527,20 +4761,52 @@ msgstr ""
 "Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
 "logować?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Wiadomość wysyłana do kontaktów, które chcesz dodać"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Używaj autoryzacji serwera proxy"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anonimowa autentykacja"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4548,108 +4814,106 @@ msgstr ""
 "Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym "
 "kontaktem, jeśli to możliwe?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 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:447
-msgid "all or space separated status"
-msgstr "all lub komunikaty stanu rozdzielone spacjami"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' lub 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4658,184 +4922,379 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 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:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection.py:68
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Do"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Prośba o cofnięcie autoryzacji od %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Błąd zapisu na dysk"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"Plik bazy danych (%s) nie mógł zostać odczytany. Spróbuj to naprawić (zobacz "
+"http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum "
+"rozmów zostanie usunięte)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Pokój został usunięty"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "W zamian możesz dołączyć do pokoju %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Niepoprawny Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Doszła wiadomość od nieprawidłowego JID, będzie zignorowana"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Nieznany błąd SSL: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nowa wiadomość"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nowa wiadomość od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Wyślij prywatną wiadomość"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nowa wiadomość prywatna z pokoju %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nowa wiadomość od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nowa wiadomość"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nowa wiadomość od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s zmienił status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s ma teraz status %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt zmienił status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s połączył(a) się"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt połączył się"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s rozłączył(a) się"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt rozłączył się"
+
+#: ../src/common/connection_handlers.py:92
+#: ../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: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:135
+msgid "Registration succeeded"
+msgstr "Rejestracja zakończyła się sukcesem"
+
+#: ../src/common/connection_handlers.py:136
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "Rejestracja z %s zakończyła się sukcesem"
+
+#: ../src/common/connection_handlers.py:145
+msgid "Registration failed"
+msgstr "Rejestracja nie powiodła się"
+
+#: ../src/common/connection_handlers.py:146
+#, 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:591 ../src/common/connection.py:1770
+msgid "Invisibility not supported"
+msgstr "Niewidoczność nie jest obsługiwana"
+
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr "Konto %s nie obsługuje niewidoczności."
+
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Chciałbym dodać Cię do listy kontaktów."
+
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Nie można uzyskać certyfikatu wystawcy"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Nie można uzyskać CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nie można odszyfrować podpisu certyfikatu"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nie można odszyfrować podpisu CRL"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Nie można odkodować klucza publicznego wystawcy"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Błąd podpisu certyfikatu"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Błąd podpisu CRL"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Certyfikat nie jest prawidłowy"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL nie jest prawidłowy"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL wygasł"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Błąd w polu notBefore certyfikatu"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Błąd w polu notAfter certyfikatu"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Błąd w polu lastUpdate CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Błąd w polu nextUpdate CRL"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Certyfikat podpisany przez wystawcę"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "W łańcuchu certyfikatów znaleziono certyfikat podpisany przez wystawcę"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Nie można pobrać lokalnego certyfikatu wystawcy"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Nie można zweryfikować pierwszego certyfikatu"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Za długi łańcuch certyfikatów"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Niepoprawny certyfikat CA"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Stała długości ścieżki przekroczona"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Nieznany cel certyfikatu"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certyfikat niezaufany"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Niezgodność subject/issuer"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Tym kluczem nie można podpisywać certyfikatu"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: ../src/common/connection.py:256
-#: ../src/common/connection_handlers_events.py:910 ../src/config.py:2093
-#: ../src/config.py:2102 ../src/config.py:2170 ../src/config.py:3578
-#: ../src/dataforms_widget.py:622 ../src/dialogs.py:2957
-msgid "Invalid Jabber ID"
-msgstr "Niepoprawny Jabber ID"
-
-#: ../src/common/connection.py:257 ../src/dialogs.py:2958
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:279
+#: ../src/common/connection.py:304
 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:282
+#: ../src/common/connection.py:307
 #, 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:335
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4844,41 +5303,18 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:454 ../src/common/connection_handlers.py:338
-#: ../src/common/connection_handlers.py:1360
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1638
-#: ../src/common/connection_handlers_events.py:807
-#: ../src/common/logger.py:1124 ../src/gajim.py:374
-msgid "Disk Write Error"
-msgstr "Błąd zapisu na dysk"
-
-#: ../src/common/connection.py:458 ../src/common/connection_handlers.py:1363
-#: ../src/common/connection_handlers.py:1468
-#: ../src/common/connection_handlers.py:1641
-#: ../src/common/connection_handlers_events.py:811
-#: ../src/common/logger.py:1127 ../src/gajim.py:193 ../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 ""
-"Plik bazy danych (%s) nie mógł zostać odczytany. Spróbuj to naprawić (zobacz "
-"http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum "
-"rozmów zostanie usunięte)."
-
-#: ../src/common/connection.py:826
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:827
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:838
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
@@ -4886,59 +5322,62 @@ msgstr ""
 "%(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:880
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#. wrong answer
-#: ../src/common/connection.py:896
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:897
+#: ../src/common/connection.py:1002
 #, 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:1185 ../src/common/connection.py:1318
-#: ../src/common/connection.py:1900
-#: ../src/common/zeroconf/connection_zeroconf.py:197
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1186 ../src/gui_interface.py:557
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Nie można połączyć się z \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/common/connection.py:1191
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serwer odpowiedział: %s"
 
-#: ../src/common/connection.py:1204
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: ../src/common/connection.py:1236 ../src/common/connection.py:1297
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się %s"
 
-#: ../src/common/connection.py:1237 ../src/common/connection.py:1298
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1262
+#: ../src/common/connection.py:1388
 #, 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:1265
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4947,7 +5386,7 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1267
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4956,24 +5395,33 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: ../src/common/connection.py:1319
-msgid "Check your connection or try again later"
-msgstr "Sprawdź swoje połączenie lub spróbuj później"
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Nie można potwierdzić autentyczności certyfikatu %s."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1353
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:1355
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:1428
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: ../src/common/connection.py:1429
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4982,146 +5430,68 @@ 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:1506 ../src/common/connection_handlers.py:562
-msgid "Invisibility not supported"
-msgstr "Niewidoczność nie jest obsługiwana"
-
-#: ../src/common/connection.py:1507 ../src/common/connection_handlers.py:563
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "Konto %s nie obsługuje niewidoczności."
-
-#: ../src/common/connection.py:1767
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Wysłany kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1770
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Wyślij kontakty:"
 
-#: ../src/common/connection.py:1917 ../src/common/connection.py:1940
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
-#: ../src/common/connection.py:2406
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Błąd przy usuwaniu konta"
 
-#: ../src/common/connection.py:2407
+#: ../src/common/connection.py:2827
 #, 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/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: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:134
-msgid "Registration succeeded"
-msgstr "Rejestracja zakończyła się sukcesem"
-
-#: ../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:143
-msgid "Registration failed"
-msgstr "Rejestracja nie powiodła się"
-
-#: ../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:1675
-msgid "I would like to add you to my roster."
-msgstr "Chciałbym dodać Cię do listy kontaktów."
-
-#: ../src/common/connection_handlers_events.py:324
-#, 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_handlers_events.py:748
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Prośba o cofnięcie autoryzacji od %s"
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:829
-msgid "Room has been destroyed"
-msgstr "Pokój został usunięty"
-
-#: ../src/common/connection_handlers_events.py:837
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "W zamian możesz dołączyć do pokoju %s"
-
-#: ../src/common/connection_handlers_events.py:911
-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_events.py:1290
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nieznany błąd SSL: %d"
-
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:500
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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:1516 ../src/roster_window.py:834
-#: ../src/roster_window.py:1523 ../src/roster_window.py:1604
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1768
-#: ../src/roster_window.py:2444
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus nie działa prawidłowo na tym komputerze"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 "D-Bus nie działa prawidłowo na tym komputerze: brak demona systemowego "
 "(system bus)"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
@@ -5138,7 +5508,7 @@ msgstr ""
 "Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość "
 "False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nie jest obecny na tej maszynie lub brak modułu dla pythona"
 
@@ -5326,222 +5696,230 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr "Nazwa użytkownika winna mieć od 1 do 1023 znaków"
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr "Serwer winien mieć od 1 do 1023 znaków"
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr "Zasób winien mieć od 1 do 1023 znaków"
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Nieobecny"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 msgid "?user status:_Available"
 msgstr "?user status:_Dostępny"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "?user status:Dostępny"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Niewidoczny"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1109 ../src/common/helpers.py:1116
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5549,22 +5927,22 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1122
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:1125 ../src/common/helpers.py:1144
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:1127
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1134 ../src/common/helpers.py:1141
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5572,21 +5950,40 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1342
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "Cześć, jestem $name."
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Przekroczono czas ładowania obrazu"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Obraz jest za duży"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL nie jest prawidłowy"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Przekroczono czas ładowania obrazu"
+
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s błąd konfiguracji"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5598,110 +5995,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "błąd GStreamera"
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Komunikat błędu: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Błąd przy wykonywaniu \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s nie jest prawidłowym poziomem logowania"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr "Domyślne urządzenie"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Test audio"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "Autodetekcja"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Plik: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Video test"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zielony"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "Wyjście video"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
+msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -6338,19 +6750,115 @@ msgstr "Uczę się"
 msgid "Writing"
 msgstr "Piszę"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "domyślny"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "morski"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Ukrywam się"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Kraj:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Konto"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Opis"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Błąd"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "pierwsza"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "pokój"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "URI"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6359,22 +6867,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nie można podłączyć się do portu %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików zostanie "
-"anulowane."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6382,11 +6876,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:185
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Błąd Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:186
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6395,44 +6889,43 @@ msgstr ""
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:198
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:208
-#: ../src/common/zeroconf/connection_zeroconf.py:212
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:209
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, 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:213
-#: ../src/common/zeroconf/connection_zeroconf.py:295
-#: ../src/common/zeroconf/connection_zeroconf.py:308
-#: ../src/common/zeroconf/connection_zeroconf.py:324
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:307
-#: ../src/common/zeroconf/connection_zeroconf.py:323
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie można zmienić statusu konta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:342
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Twoja wiadomość nie mogła zostać wysłana."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:352
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:377
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6444,24 +6937,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Domyśla wiadomość"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:733 ../src/dialogs.py:1412
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6470,215 +6963,216 @@ msgstr ""
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2407 ../src/dialogs.py:2474
-#: ../src/dialogs.py:3260 ../src/disco.py:884 ../src/disco.py:1743
-#: ../src/disco.py:2046 ../src/history_window.py:90
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
 "zalogować się ponownie."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Posiadasz już konto o tej nazwie. Zmień nazwę konta na unikalną."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nową nazwę dla kontaktu %s."
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:2320 ../src/config.py:3624
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2321 ../src/config.py:3625
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Brak tajnego klucza OpenPGP."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2162 ../src/dialogs.py:2396
-#: ../src/dialogs.py:2583 ../src/disco.py:512 ../src/profile_window.py:360
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Aby wyłączyć konto, musisz się rozłączyć."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6686,11 +7180,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6698,11 +7192,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6710,11 +7204,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6722,7 +7216,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6738,107 +7232,104 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "Konto jest wyłączone"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr "Aby wyrejestrować się z serwera, konto musi być włączone."
 
-#: ../src/config.py:2972 ../src/gui_interface.py:264
-#: ../src/gui_interface.py:716
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Hasło wymagane"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:696
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz swoje hasło dla konta %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:716
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Połączenie z serwerem %s nie powiodło się"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "Usuń tylko z Gajima"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "Nic nie usuwaj. Spróbuję ponownie później"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 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:3319 ../src/dialogs.py:1959
-msgid "Invalid nickname"
-msgstr "Niepoprawny pseudonim"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Niedozwolony znak"
 
-#: ../src/config.py:3333 ../src/config.py:3600
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Niepoprawny pokój"
 
-#: ../src/config.py:3516
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3517 ../src/config.py:3523
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6847,34 +7338,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:3522
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3561
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3563
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3601
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1191
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3658 ../src/gui_interface.py:1192
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3735
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6889,7 +7380,7 @@ msgstr ""
 "Błąd SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3741 ../src/gui_interface.py:1219
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6900,77 +7391,89 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3773 ../src/config.py:3807
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3873
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:4002
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "Węzeł PEP nie został usunięty"
 
-#: ../src/config.py:4003
+#: ../src/config.py:4119
 #, 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:4031
+#: ../src/config.py:4147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "Konfiguruj"
 
-#: ../src/config.py:4050
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:4093
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Otrzymano pierwszą wiadomość"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:4094
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:4096
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:4097
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:4098
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:4099
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:4100
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:4101
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:4102
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6980,7 +7483,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:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6988,230 +7491,231 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Cytuj"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1307
-#, python-format
+#: ../src/conversation_textview.py:1386
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Wczoraj"
 msgstr[1] "%i dni temu"
 msgstr[2] "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1355 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: ../src/dataforms_widget.py:564
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "Nie można załadować obrazka"
 
-#: ../src/dataforms_widget.py:566
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nieobsługiwany typ pliku: %s"
 
-#: ../src/dataforms_widget.py:581
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "To pole jest wymagane"
 
-#: ../src/dataforms_widget.py:626
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Ten JID jest już na liście"
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:638
 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:638
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "nowy@jabber.id"
 
-#: ../src/dataforms_widget.py:641 ../src/dataforms_widget.py:643
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nowy%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:473
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Ustaw nastrój"
 
-#: ../src/dialogs.py:593
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:607
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
-#: ../src/dialogs.py:799
+#: ../src/dialogs.py:805
 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:807
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:837
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:877
+#: ../src/dialogs.py:883
 #, 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:880
+#: ../src/dialogs.py:886
 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:1049 ../src/dialogs.py:1055 ../src/dialogs.py:1060
-#: ../src/dialogs.py:3493
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:1056
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:1076
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:1122
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:1192
-msgid "A GTK+ jabber client"
-msgstr "Klient jabbera w GTK+."
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Klient Jabbera w GTK+"
 
-#: ../src/dialogs.py:1193
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:1194
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1204
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1212
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1218
+#: ../src/dialogs.py:1305
 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:1230
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
@@ -7220,7 +7724,7 @@ msgstr ""
 "Dominik Kozaczko <dominik@kozaczko.info>\n"
 "Jacek Sowiński <mruwek@mruwek.pl>"
 
-#: ../src/dialogs.py:1413
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7232,100 +7736,155 @@ 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:1960 ../src/dialogs.py:2347
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Niezabezpieczone połączenie"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Zamierzasz połączyć się z serwerem za pomocą niezabezpieczonego połączenia. "
+"To oznacza, że wszystkie twoje rozmowy będą przebiegać niezaszyfrowane."
+"Jesteś pewien, że chcesz to zrobić?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Nie pytaj mnie o to ponownie"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:2078
+#: ../src/dialogs.py:2277
 #, 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:2081
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:2157 ../src/gui_interface.py:1918
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:2163
+#: ../src/dialogs.py:2370
 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:2204
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:2334
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Błędny adres URI"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "To nie jest czat"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Niepoprawne konto"
 
-#: ../src/dialogs.py:2335
+#: ../src/dialogs.py:2599
 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:2346
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:2351 ../src/dialogs.py:2357
-#: ../src/groupchat_control.py:2029
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:2352
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Proszę wprowadzić JID konferencji w postaci pokój@serwer."
 
-#: ../src/dialogs.py:2358 ../src/groupchat_control.py:2030
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:2365
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:2366
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:2410
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:2447
+#: ../src/dialogs.py:2713
 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:2472
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:2533
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:2535
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:2536
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7334,165 +7893,135 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2943 ../src/dialogs.py:3173
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:2563 ../src/dialogs.py:2944 ../src/dialogs.py:3174
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:2572 ../src/dialogs.py:2575
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:2575
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:2584
+#: ../src/dialogs.py:2851
 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:2603
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2603
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2607
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2608
+#: ../src/dialogs.py:2875
 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:2645 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt połączył się"
-
-#: ../src/dialogs.py:2647 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Kontakt rozłączył się"
-
-#. chat message
-#: ../src/dialogs.py:2649 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nowa wiadomość"
-
-#. single message
-#: ../src/dialogs.py:2649 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Nowa wiadomość"
-
-#. private message
-#: ../src/dialogs.py:2650 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Wyślij prywatną wiadomość"
-
-#: ../src/dialogs.py:2650 ../src/gui_interface.py:826 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2652 ../src/gui_interface.py:885 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2654 ../src/gui_interface.py:788
-#: ../src/gui_interface.py:854 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2656 ../src/gui_interface.py:931
-#: ../src/gui_interface.py:954 ../src/gui_interface.py:971
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2657 ../src/gui_interface.py:934 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2659 ../src/gui_interface.py:642 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Zaproszenie na czat"
-
-#: ../src/dialogs.py:2661 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt zmienił status"
-
-#: ../src/dialogs.py:2862
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2864
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2869
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2892
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2915
+#: ../src/dialogs.py:3185
 #, 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:2994
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2995
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:3054
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:3056
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Konsola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3203
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "dodaj"
 
-#: ../src/dialogs.py:3203
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "modyfikuj"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "usuń"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7501,193 +8030,186 @@ 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:3249 ../src/dialogs.py:3295
-msgid "Add"
-msgstr "Dodaj"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3251 ../src/dialogs.py:3326
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Edytuj"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3253 ../src/dialogs.py:3350
-msgid "Delete"
-msgstr "Usuń"
-
-#: ../src/dialogs.py:3257
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3263
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupy"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3371
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s zasugerował(a), żebym dodał Cię do rostera."
 
-#: ../src/dialogs.py:3385
-#, python-format
-msgid "Added  %s contacts"
-msgstr "Dodano %s kontaktów"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Dodano %s kontaktów"
+msgstr[1] "Dodano %s kontaktów"
+msgstr[2] "Dodano %s kontaktów"
 
-#: ../src/dialogs.py:3422
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "Usunięto %s kontaktów"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Usunięto %s kontaktów"
+msgstr[1] "Usunięto %s kontaktów"
+msgstr[2] "Usunięto %s kontaktów"
 
-#: ../src/dialogs.py:3462 ../src/dialogs.py:3639
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3502
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/dialogs.py:3503
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3550
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3770
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Wystąpił błąd"
 
-#: ../src/dialogs.py:3838
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3842
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:3909
+#: ../src/dialogs.py:4186
 #, 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:3914
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: ../src/dialogs.py:3965
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:4076
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:4175
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:4177
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:4266
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:4267
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:4299
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:4302
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: ../src/dialogs.py:4304
+#: ../src/dialogs.py:4585
 #, 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:4312
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:4376
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4386 ../src/dialogs.py:4428 ../src/dialogs.py:4484
-#: ../src/dialogs.py:4572
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:4391
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:4471
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:4489
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Wybierz archiwum"
 
-#: ../src/dialogs.py:4577
+#: ../src/dialogs.py:4865
 msgid "Zip files"
 msgstr "Archiwa Zip"
 
-#: ../src/dialogs.py:4603
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:4605
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
-#: ../src/dialogs.py:4681
-msgid "Condition"
-msgstr "Warunek"
-
-#: ../src/dialogs.py:4801
-msgid "when I am "
-msgstr "kiedy mam "
-
-#: ../src/dialogs.py:5295
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7698,19 +8220,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5298
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:5304 ../src/dialogs.py:5388
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:5310
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Ponowna weryfikacja..."
 
-#: ../src/dialogs.py:5315
+#: ../src/dialogs.py:5133
 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 "
@@ -7720,19 +8242,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:5318 ../src/dialogs.py:5369 ../src/dialogs.py:5382
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:5323
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Weryfikowanie..."
 
-#: ../src/dialogs.py:5334
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Czy zweryfikowałeś/zweryfikowałaś tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:5335
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7746,85 +8268,126 @@ 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:5336
+#: ../src/dialogs.py:5154
 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:5370
+#: ../src/dialogs.py:5189
 #, 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:5376
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5383
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "Klucz GPG jest przypisany do tego kontaktu, lecz <b>ty nie importowałeś tego "
 "klucza</b>, więc wiadomość <b>nie będzie</b> odszyfrowana. Użyj twojego "
 "klienta GPG, aby importować klucz."
 
-#: ../src/dialogs.py:5389
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "Ten użytkownik ma przypisany klucz, zweryfikowałeś ten klucz, więc "
 "wiadomości będą szyfrowane"
 
-#: ../src/dialogs.py:5454
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "wideo-głosową"
 
-#: ../src/dialogs.py:5456
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "głosową"
 
-#: ../src/dialogs.py:5458
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "wideo"
 
-#: ../src/dialogs.py:5462
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s chce rozpocząć z Tobą rozmowę %(type)s. Chcesz odebrać?"
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "dla konta %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Certyfikat klienta"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Inni"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7832,305 +8395,290 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Przeglądanie %(address)s przy użyciu konta %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 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:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Wykonaj komendę"
 
-#: ../src/disco.py:1351 ../src/disco.py:1521
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1562
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanowanie %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1753
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1761
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1769
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1834 ../src/gui_interface.py:2443
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2444
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/disco.py:1844 ../src/gui_interface.py:2458
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2459
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2055
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: ../src/disco.py:2063
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/disco.py:2127
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: ../src/disco.py:2133
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/disco.py:2139
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Sprawdzanie certyfikatu SSL"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka używana do weryfikacji certyfikatów w celu zapewnienia "
 "bezpiecznego połączenia."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Wymaga python-pyopenssl"
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Rozmowy w sieci lokalnej, bez pośrednictwa serwera i z automatycznym "
 "wykrywaniem klientów."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Wymaga python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Wymaga pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)"
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Linia poleceń"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Skrypt pozwalający na sterowanie Gajimem z linii poleceń."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Wymaga python-dbus"
 
-#: ../src/features_window.py:60 ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Funkcjonalność niedostępna dla systemu Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Szyfrowanie OpenPGP"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Szyfrowanie wiadomości kluczami GPG."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:65
 msgid "Requires gpg.exe in PATH."
 msgstr ""
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Menedżer sieci"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Automatyczne wykrywanie stanu sieci."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Wymaga gnome-network-manager oraz python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Zarządzanie sesją"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "Sesja jest zapisywana przy wylogowaniu z serwera i przywracana przy "
 "logowaniu."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Wymaga python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Hasło"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Bezpieczne przechowywanie haseł."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Wymaga gnome-keyring oraz python-gnome2-desktop albo kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Możliwość połączenia z serwerami, które używają rekordów SRV."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Wymaga dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Wymaga nslookup."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Słownik"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Zwraca uwagę na błędy w wysyłanych wiadomościach."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Wymaga libgtkspell"
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Wymaga libgtkspell"
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Powiadomienia"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Wyświetla okna informujące o nowych zdarzeniach."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 "Wymaga python-notify lub python-dbus w połączeniu z notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatyczny status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Wymaga biblioteki libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Wymaga python2.5"
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-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 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 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ń."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Szyfrowanie typu \"end to end\""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Szyfrowanie wysyłanych wiadomości."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Wymaga python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "Generator RST"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8138,168 +8686,201 @@ msgstr ""
 "Tworzy XHTML z kodu RST (patrz http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Wymaga python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Można rozpocząć rozmowę głosową i wideo."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "Wymaga python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Wymaga python-dbus"
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Dostępny"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Możliwości"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Plik"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:523
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Zakończono przesyłanie pliku"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Przesyłanie pliku anulowane"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Nie można ustanowić połączenia z drugą stroną."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Odbiorca: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Przesyłanie pliku zatrzymane"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Plik: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Typ: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Opis: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s chce przesłać Ci plik:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:879
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:880
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:884
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:891
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, 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:892
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Zapisz obraz jako..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Plik: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Typ: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s chce przesłać Ci plik:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Wysyłanie profilu..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Błąd przesyłania pliku"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8307,57 +8888,153 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Plik: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "Wiadomość"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Emotikony:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Pokaż tylko na liście kontaktów"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Edytor zaawansowanych ustawień"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s błąd konfiguracji"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "Konfiguruj"
+
+#: ../src/gajim.py:211
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "Gajim wymaga do działania serwera X. Zamykanie programu..."
+
+#: ../src/gajim.py:213
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr "import PyGTK nie powiódł się: %s"
+
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
+msgstr "Gajim wymaga PyGTK w wersji 2.16 lub wyższej"
+
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+msgstr ""
+"Gajim wymaga do działania PyGTK w wersji 2.16 lub wyższej. Zamykanie "
+"programu..."
+
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
+msgstr "Gajim wymaga GTK w wersji 2.16 lub wyższej"
+
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+msgstr ""
+"Gajim wymaga do działania GTK w wersji 2.16 lub wyższej. Zamykanie "
+"programu..."
+
+#: ../src/gajim.py:269
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim wymaga do działania pakietu pywin32"
+
+#: ../src/gajim.py:270
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać "
+"spod adresu %s"
+
+#: ../src/gajim.py:410
+msgid "Gajim is already running"
+msgstr "Gajim jest już uruchomiony"
+
+#: ../src/gajim.py:411
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Wydaje się, że w tle działa już inna kopia Gajima.\n"
+"Czy mimo to chcesz uruchomić program?"
+
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Wyświetla pomoc dla wybranego polecenia"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8365,52 +9042,56 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "konto"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Zmienia status kont lub kont"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#: ../src/gajim-remote.py:110
+msgid ""
+"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 "
+"zajęty, niewidoczny. Jeśli nie ustawiono, użyj poprzedniego statusu konta"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "wiadomość"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8419,21 +9100,46 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Zmienia priorytet konta lub kont"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priorytet"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "priorytet, jaki chcesz nadać"
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8443,35 +9149,30 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8481,132 +9182,129 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "temat"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "klucz"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt do listy kontaktów"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otwiera okno dialogowe 'Rozpocznij rozmowę'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Rozpocznij rozmowę z tego konta"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Wysyła własny XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML do wysłania"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8614,44 +9312,90 @@ 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
+#: ../src/gajim-remote.py:269
+msgid "Change the avatar"
+msgstr "Zmień awatar"
+
+#: ../src/gajim-remote.py:271
+msgid "Picture to use"
+msgstr "Obrazek"
+
+#: ../src/gajim-remote.py:272
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Konto, dla którego ma być ustawiony awatar; jeżeli nie jest określone, "
+"awatar zostanie ustawiony dla wszystkich kont"
+
+#: ../src/gajim-remote.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI do obsługi"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Treść wiadomości"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Dołącz do nowego pokoju"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "pokój"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Pokój:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nick"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Nick"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "hasło"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Hasło do pokoju"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Pokazuje lub ukrywa okno iptyhon"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8660,155 +9404,44 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Użycie: %s %s %s \n"
-"\t %s"
+"Użyto: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\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-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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Błędny adres URI"
-
-#: ../src/gajim-remote.py:109
-msgid ""
-"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. Jeśli nie ustawiono, użyj poprzedniego statusu konta"
-
-#: ../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: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 "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
-
-#: ../src/gajim-remote.py:268
-msgid "Change the avatar"
-msgstr "Zmień awatar"
-
-#: ../src/gajim-remote.py:270
-msgid "Picture to use"
-msgstr "Obrazek"
-
-#: ../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 ""
-"Konto, dla którego ma być ustawiony awatar; jeżeli nie jest określone, "
-"awatar zostanie ustawiony dla wszystkich kont"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI do obsługi"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Treść wiadomości"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Pokój:"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Nick"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Hasło do pokoju"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Użyto: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8817,7 +9450,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8826,64 +9459,13 @@ msgstr ""
 "Argument \"%(arg)s\" nie jest określony. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "Nie podano uri"
 
-#: ../src/gajim.py:175
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim wymaga do działania serwera X. Zamykanie programu..."
-
-#: ../src/gajim.py:177
-#, python-format
-msgid "importing PyGTK failed: %s"
-msgstr "import PyGTK nie powiódł się: %s"
-
-#: ../src/gajim.py:219
-msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim wymaga PyGTK w wersji 2.16 lub wyższej"
-
-#: ../src/gajim.py:220
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr ""
-"Gajim wymaga do działania PyGTK w wersji 2.16 lub wyższej. Zamykanie "
-"programu..."
-
-#: ../src/gajim.py:222
-msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim wymaga GTK w wersji 2.16 lub wyższej"
-
-#: ../src/gajim.py:223
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr ""
-"Gajim wymaga do działania GTK w wersji 2.16 lub wyższej. Zamykanie "
-"programu..."
-
-#: ../src/gajim.py:232
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim wymaga do działania pakietu pywin32"
-
-#: ../src/gajim.py:233
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać "
-"spod adresu %s"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:349
-msgid "Gajim is already running"
-msgstr "Gajim jest już uruchomiony"
-
-#: ../src/gajim.py:350
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Wydaje się, że w tle działa już inna kopia Gajima.\n"
-"Czy mimo to chcesz uruchomić program?"
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Błędny adres URI"
 
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
@@ -8907,221 +9489,219 @@ msgid "You cannot delete your current theme"
 msgstr "Nie możesz skasować obecnie używanego motywu"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
-#: ../src/groupchat_control.py:175 ../src/groupchat_control.py:1504
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, 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:201 ../src/groupchat_control.py:1702
-#: ../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:229
+#: ../src/groupchat_control.py:236
 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:231
+#: ../src/groupchat_control.py:238
 #, 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:541
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:722
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: ../src/groupchat_control.py:724
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
-#: ../src/groupchat_control.py:1191
+#: ../src/groupchat_control.py:1268
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s ustawił temat na %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1206 ../src/groupchat_control.py:1447
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
-#: ../src/groupchat_control.py:1209
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: ../src/groupchat_control.py:1211
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1293
 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/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: ../src/groupchat_control.py:1227
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s został wyrzucony z pokoju: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1451
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1456
+#: ../src/groupchat_control.py:1597
 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:1462
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1465
+#: ../src/groupchat_control.py:1606
 #, 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:1474
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1618
 #, 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:1488 ../src/groupchat_control.py:1592
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1546 ../src/groupchat_control.py:1551
-#: ../src/groupchat_control.py:1557
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1548
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1553
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1559
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1642
+#: ../src/groupchat_control.py:1795
 #, 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:1646
+#: ../src/groupchat_control.py:1799
 #, 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:1661
+#: ../src/groupchat_control.py:1814
 #, 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:1665
+#: ../src/groupchat_control.py:1818
 #, 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:1695
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1700
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: ../src/groupchat_control.py:1956
+#: ../src/groupchat_control.py:2124
 #, 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:1958
+#: ../src/groupchat_control.py:2126
 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:1962 ../src/gui_interface.py:688
-#: ../src/gui_interface.py:1287 ../src/gui_interface.py:1326
-#: ../src/gui_interface.py:1366 ../src/message_window.py:224
-#: ../src/roster_window.py:2856 ../src/roster_window.py:3515
-#: ../src/roster_window.py:4254
-#, fuzzy
-msgid "_Do not ask me again"
-msgstr "_Nie pytaj mnie o to ponownie"
-
-#: ../src/groupchat_control.py:1996
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1997
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:2004
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:2005
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2036
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:2037
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9129,22 +9709,22 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:2039
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2228
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:2229 ../src/groupchat_control.py:2556
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2555
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -9169,66 +9749,60 @@ msgstr "_Zgłoś Błąd"
 msgid "Details"
 msgstr "Szczegóły"
 
-#. we talk about file
-#: ../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:377
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:352
 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:421
+#: ../src/gtkgui_helpers.py:393
 #, 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:795
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:768
 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:797
+#: ../src/gtkgui_helpers.py:769
 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:864
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:837
 #, 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:901
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:127 ../src/gui_interface.py:276
-#: ../src/gui_interface.py:285 ../src/gui_interface.py:290
-#: ../src/gui_interface.py:293 ../src/gui_interface.py:296
-#: ../src/gui_interface.py:301
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/gui_interface.py:128
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9239,92 +9813,86 @@ msgstr ""
 "innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/gui_interface.py:131
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "W przypadku konfliktu zawsze używaj tego pseudonimu"
 
-#: ../src/gui_interface.py:148
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gui_interface.py:150
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: ../src/gui_interface.py:153
+#: ../src/gui_interface.py:160
 #, 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:195 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: ../src/gui_interface.py:265
+#: ../src/gui_interface.py:287
 #, 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:277
-#, python-format
-msgid "Maximum number of users for %s has been reached"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Osiągnięto maksymalną liczbę użytkowników dla %s"
 
-#: ../src/gui_interface.py:286
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/gui_interface.py:291
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/gui_interface.py:297
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Twój pseudonim musi być używany w pokoju %s."
 
-#: ../src/gui_interface.py:302
+#: ../src/gui_interface.py:325
 #, 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:436 ../src/gui_interface.py:440
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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:451 ../src/gui_interface.py:465
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
-
-#: ../src/gui_interface.py:489 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: ../src/gui_interface.py:514
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gui_interface.py:515
+#: ../src/gui_interface.py:500
 #, 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:523
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: ../src/gui_interface.py:524
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9332,63 +9900,97 @@ msgstr ""
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: ../src/gui_interface.py:545 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Cofnij autoryzację"
 
-#: ../src/gui_interface.py:556
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gui_interface.py:654
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:656 ../src/gui_interface.py:664
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gui_interface.py:658
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne"
 
-#: ../src/gui_interface.py:663
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Niepoprawne hasło OpenPGP"
 
-#: ../src/gui_interface.py:686
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Certyfikat wygasł"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG nie jest zaufany"
 
-#: ../src/gui_interface.py:686
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "Klucz GPG używany do szyfrowania tej rozmowy nie jest zaufany. Czyn naprawdę "
 "chcesz zaszyfrować tą wiadomość?"
 
-#: ../src/gui_interface.py:699
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Menedżer bazy kluczy GNOME jest zainstalowany, ale nie został \t\t\t"
 "\tprawidłowo uruchomiony(zmienna środowiskowa prawdopodobnie nie jest \t\t\t"
 "\t właściwie ustawiona)"
 
-#: ../src/gui_interface.py:799
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:801
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9396,7 +9998,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:814
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9411,58 +10013,65 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:883
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gui_interface.py:920 ../src/roster_window.py:1855
-msgid "Remote contact stopped transfer"
-msgstr "Druga strona przerwała transfer"
-
-#: ../src/gui_interface.py:923 ../src/roster_window.py:1857
-msgid "Error opening file"
-msgstr "Błąd odczytu pliku"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Przesyłane pliki"
 
-#: ../src/gui_interface.py:955
+#: ../src/gui_interface.py:1059
 #, 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:959
+#: ../src/gui_interface.py:1063
 #, 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:972
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
+
+#: ../src/gui_interface.py:1080
 #, 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:976
+#: ../src/gui_interface.py:1084
 #, 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:1051
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
+
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: ../src/gui_interface.py:1064
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: ../src/gui_interface.py:1079
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: ../src/gui_interface.py:1080
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9471,20 +10080,20 @@ msgstr ""
 "podać nowy zasób"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1125
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce rozpocząć rozmowę głosową."
 
-#: ../src/gui_interface.py:1128
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Prośba o rozmowę głosową"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9495,15 +10104,20 @@ msgstr ""
 "%(error)s\n"
 "Czy ciagle chcesz się połączyć z serwerem?"
 
-#: ../src/gui_interface.py:1224
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: ../src/gui_interface.py:1247
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Błąd certyfikatu SSL"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Błąd certyfikatu SSL"
 
-#: ../src/gui_interface.py:1248
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9520,28 +10134,7 @@ msgstr ""
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: ../src/gui_interface.py:1282 ../src/gui_interface.py:1321
-#: ../src/gui_interface.py:1362
-msgid "Insecure connection"
-msgstr "Niezabezpieczone połączenie"
-
-#: ../src/gui_interface.py:1283
-#, fuzzy
-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 ""
-"Zamierzasz połączyć się z serwerem za pomocą niezabezpieczonego połączenia. "
-"To oznacza, że wszystkie twoje rozmowy będą przebiegać niezaszyfrowane."
-"Jesteś pewien, że chcesz to zrobić?"
-
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1325
-#: ../src/gui_interface.py:1365
-msgid "Yes, I really want to connect insecurely"
-msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
-
-#: ../src/gui_interface.py:1322
+#: ../src/gui_interface.py:1447
 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?"
@@ -9549,7 +10142,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:1363
+#: ../src/gui_interface.py:1489
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -9558,11 +10151,11 @@ msgstr ""
 "Jesteś pewien, że chcesz to zrobić?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1870 ../src/gui_interface.py:1893
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/gui_interface.py:1871
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9570,7 +10163,7 @@ msgstr ""
 "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
 "wyłączone."
 
-#: ../src/gui_interface.py:1894
+#: ../src/gui_interface.py:2019
 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 "
@@ -9580,84 +10173,87 @@ msgstr ""
 "potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej "
 "szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:1925 ../src/roster_window.py:3682
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2319
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: ../src/gui_interface.py:2864
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/gui_interface.py:2865
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:2879
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "Klucz GPG stracił ważność"
 
-#: ../src/gui_interface.py:2880
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP 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:2889
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/gui_interface.py:2890
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "tworzenie katalogu %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakty"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Wiadomość"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Temat"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9665,7 +10261,7 @@ msgstr ""
 "Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ "
 "OPCJI GDY GAJIM JEST URUCHOMIONY)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9680,95 +10276,109 @@ msgstr ""
 "\n"
 "Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Błąd bazy danych"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Przenoszenie logów rozmów..."
 
-#: ../src/history_manager.py:536
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o godzinie %(time)s napisał: %(message)s\n"
 
-#: ../src/history_manager.py:573
-msgid "Do you really want to delete logs of the selected contact?"
-msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "Czy na pewno chcesz usunąć historię rozmów wybranego kontaktu?"
-msgstr[1] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
-msgstr[2] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Czy na pewno chcesz usunąć wybraną wiadomość?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Czy na pewno chcesz usunąć historię rozmów wybranego kontaktu?"
 
-#: ../src/history_manager.py:577 ../src/history_manager.py:612
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Skutków tej operacji nie można będzie wycofać."
 
-#: ../src/history_manager.py:609
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Cofnij potwierdzenie"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?"
 msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Błąd zapisu lub odczytu na dysku"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s jes teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Błąd: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Błąd"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/htmltextview.py:518 ../src/htmltextview.py:528
-msgid "Timeout loading image"
-msgstr "Przekroczono czas ładowania obrazu"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programuję"
 
-#: ../src/htmltextview.py:538
-msgid "Image is too big"
-msgstr "Obraz jest za duży"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Wiadomości"
 
@@ -9780,98 +10390,111 @@ msgstr "- wiadomości będzie logowanych"
 msgid "- messages will not be logged"
 msgstr "- wiadomości nie będzie logowanych"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s zmienił status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignoruj"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s połączył(a) się"
+#: ../src/plugins/gui.py:82
+#, fuzzy
+msgid "Plugin"
+msgstr "_Wtyczki"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s rozłączył(a) się"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Zabanuj %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nowa wiadomość od %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Rejestracja nie powiodła się"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nowa wiadomość prywatna z pokoju %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Usługa wysłała niepoprawne dane"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nowa wiadomość od %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Ten plik już istnieje"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nowa wiadomość od %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignoruj"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfiguracja pokoju"
 
-#: ../src/profile_window.py:59
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Plik jest pusty"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:124 ../src/roster_window.py:3051
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:127 ../src/roster_window.py:3054
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:141 ../src/profile_window.py:157
-#: ../src/roster_window.py:3056 ../src/roster_window.py:3067
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: ../src/profile_window.py:228
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "Nieprawidłowy format daty"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Data musi być podana w formacie RRRR-MM-DD"
 
-#: ../src/profile_window.py:283
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informacja została odebrana"
 
-#: ../src/profile_window.py:361
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:374
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Wysyłanie profilu..."
 
-#: ../src/profile_window.py:393
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informacja NIE ZOSTAŁA opublikowana"
 
-#: ../src/profile_window.py:400
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9879,53 +10502,54 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1006
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1921
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1945
+#: ../src/roster_window.py:2084
 #, 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:1959
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1960
+#: ../src/roster_window.py:2099
 #, 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:1987
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:1988
+#: ../src/roster_window.py:2127
 #, 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:2200 ../src/roster_window.py:3612
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2201 ../src/roster_window.py:3613
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9933,38 +10557,38 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2227
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Na pewno zamknąć Gajima?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Na pewno chcesz opuścić program?"
 
-#: ../src/roster_window.py:2291
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Zawsze zamykaj Gajima"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Usuwa transfer pliku"
 
-#: ../src/roster_window.py:2375
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2406 ../src/roster_window.py:2770
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2407
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9972,16 +10596,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:2771
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9989,11 +10613,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:2778
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2783
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10002,11 +10626,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:2851
+#: ../src/roster_window.py:3043
 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:2853
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10015,57 +10639,57 @@ msgstr ""
 "żadnych komunikatów."
 
 #. it's jid
-#: ../src/roster_window.py:2943
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2944
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:2951
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2952
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:2997
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2998
+#: ../src/roster_window.py:3139
 #, 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:2999
+#: ../src/roster_window.py:3140
 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:3038
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:3039
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3422
+#: ../src/roster_window.py:3635
 #, 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:3424
+#: ../src/roster_window.py:3637
 #, 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:3429
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10074,11 +10698,11 @@ msgstr ""
 "będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3435
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: ../src/roster_window.py:3439
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10086,16 +10710,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:3442
+#: ../src/roster_window.py:3655
 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:3446
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3451
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10105,45 +10729,46 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:3509
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3511
+#: ../src/roster_window.py:3724
 #, 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:3530
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3531
+#: ../src/roster_window.py:3744
 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:4154
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:4156
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:4248
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:4250
+#: ../src/roster_window.py:4552
 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 "
@@ -10153,11 +10778,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:4365
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:4377
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10165,17 +10790,17 @@ 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:4492
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Wyślij %s do %s"
 
-#: ../src/roster_window.py:4503
+#: ../src/roster_window.py:4831
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: ../src/roster_window.py:4506
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
@@ -10185,130 +10810,130 @@ msgstr "Przekształć %s oraz %s w metakontakty"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4938 ../src/roster_window.py:4992
-#: ../src/roster_window.py:5001 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
 #. add
-#: ../src/roster_window.py:5008
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:5013
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:5052 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5072
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:5113
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:5173 ../src/roster_window.py:5278
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:5206
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:5208
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:5211
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5356
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
-#: ../src/roster_window.py:5366 ../src/roster_window.py:5539
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5374
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5378
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5559
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
 #. Edit Groups
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. Send single message
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
 #. Execute Command
-#: ../src/roster_window.py:5670
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Wykonaj komendę..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5680
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5689
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
 #. Rename
-#: ../src/roster_window.py:5699
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:5759
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5768
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Połącz ponownie"
 
-#: ../src/roster_window.py:5775
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
 #. History manager
-#: ../src/roster_window.py:5864
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:6093
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
@@ -10325,24 +10950,14 @@ msgstr "Błąd w odebranych danych"
 msgid "No result"
 msgstr "Brak wyników"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Błąd zapisu na dysk"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Temat: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10355,7 +10970,7 @@ msgstr ""
 "\n"
 "\t\tCzy akceptujesz te ustawienia?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10370,146 +10985,151 @@ msgstr ""
 "\n"
 "Kontynuować?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Zmień opis statusu..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "Ukryj _listę kontaktów"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tego pokoju"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [zablokowany]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [zminimalizowany]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Ostatni status %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "Bezczynny od %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "Bezczynny przez %s"
 
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "Nastrój: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "Nastrój:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktywność:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Utwór"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Powiadomienia"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?status transferu:wstrzymany"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Ta usługa nie odesłała jeszcze szczegółowych informacji"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10517,32 +11137,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:283
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:306
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Czas: Nieznany"
 
-#: ../src/vcard.py:330 ../src/vcard.py:340 ../src/vcard.py:548
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Grupy:</b>"
 
-#: ../src/vcard.py:375
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10550,7 +11170,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:377
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10558,12 +11178,12 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:379
+#: ../src/vcard.py:412
 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:381
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10571,18 +11191,389 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:388
+#: ../src/vcard.py:421
 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:390
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: ../src/vcard.py:395 ../src/vcard.py:449 ../src/vcard.py:571
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Wybierz plik do wysłania..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "z tym kontaktem "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Akcje</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Warunki</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Opcje zaawansowane"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Edytor ustawień zaawansowanych"
+
+#~ msgid "All statuses"
+#~ msgstr "Dowolny status"
+
+#~ msgid "Busy "
+#~ msgstr "Zajęty "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt zmienił status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt rozłączył się"
+
+#~ msgid "Don't have "
+#~ msgstr "nie rozmawiam "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Przesyłanie pliku zatrzymane"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Podświetlenie wiadomości z czatu"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Otrzymano wiadomość na czacie"
+
+#~ msgid "Have "
+#~ msgstr "rozmawiam "
+
+#~ msgid "Launch a command"
+#~ msgstr "Wykonaj komendę"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Jeden bądź więcej określonych statusów..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Dostępny / Chętny do rozmowy"
+
+#~ msgid "Play a sound"
+#~ msgstr "Odtwórz dźwięk"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Odbierz wiadomość"
+
+#~ msgid "When "
+#~ msgstr "Jeżeli "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr "_Migaj obramowaniem zminimalizowanego okna rozmowy"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "Wyłącz _automatyczne otwieranie okna czatu"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Wyłącz wyskakujące okienka"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Wyłącz dźwięki dla tego zdarzenia"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "Wyłącz _pokazywanie zdarzenia na liście kontaktów"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "Wyłącz _pokazywanie zdarzenia na liście kontaktów"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Powiadom mnie wyskakującym okienkiem"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Otwórz okno rozmowy z kontaktem"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Pokaż zdarzenie na liście kontaktów"
+
+#~ msgid "and I "
+#~ msgstr "podczas, gdy "
+
+#~ msgid "contact(s)"
+#~ msgstr "kontakt(y)"
+
+#~ msgid "for "
+#~ msgstr "dla "
+
+#~ msgid "group(s)"
+#~ msgstr "grupa/y"
+
+#~ msgid "when I'm in"
+#~ msgstr "kiedy jestem obecny"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Pokaż profil kontaktu (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Pozwól mu/jej widzieć swój status"
+
+#~ msgid "Descrition:"
+#~ msgstr "Opis:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Zaawansowane..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Wyświetlaj aktywność kontaktów z listy"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Wyświetlaj muzyczne ikonki kontaktów z listy"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Wyświetlaj nastroje kontaktów z listy"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy "
+#~ "kontaktów (roster oraz okno czatu)"
+
+#~ 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)"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Wyślij _wiadomość..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Używany avatar"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Komunikator Gajim"
+
+#~ msgid "English"
+#~ msgstr "angielski"
+
+#~ msgid "Belarusian"
+#~ msgstr "bułgarski"
+
+#~ msgid "Bulgarian"
+#~ msgstr "bułgarski"
+
+#~ msgid "Breton"
+#~ msgstr "bretoński"
+
+#~ msgid "Czech"
+#~ msgstr "czeski"
+
+#~ msgid "German"
+#~ msgstr "niemiecki"
+
+#~ msgid "Greek"
+#~ msgstr "grecki"
+
+#~ msgid "British"
+#~ msgstr "brytyjski"
+
+#~ msgid "Esperanto"
+#~ msgstr "esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "hiszpański"
+
+#~ msgid "Basque"
+#~ msgstr "baskijski"
+
+#~ msgid "French"
+#~ msgstr "francuski"
+
+#~ msgid "Croatian"
+#~ msgstr "chorwacki"
+
+#~ msgid "Italian"
+#~ msgstr "włoski"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "norweski (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "holenderski"
+
+#~ msgid "Norwegian"
+#~ msgstr "norweski"
+
+#~ msgid "Polish"
+#~ msgstr "polski"
+
+#~ msgid "Portuguese"
+#~ msgstr "portugalski"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "portugalski (Brazylia)"
+
+#~ msgid "Russian"
+#~ msgstr "rosyjski"
+
+#~ msgid "Serbian"
+#~ msgstr "serbski"
+
+#~ msgid "Slovak"
+#~ msgstr "słowacki"
+
+#~ msgid "Swedish"
+#~ msgstr "szwedzki"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "chiński (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Wybierz słownik"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Wymaga python-farsight."
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Jeżeli ustawiono na 'True', Gajim dokona konwersji ciągów zawartych "
+#~ "pomiędzy $$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed "
+#~ "wstawieniem ich do okna rozmowy."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr "Zmień rozmiar pokazywanych formuł latex-a."
+
+#~ msgid "all or space separated status"
+#~ msgstr "all lub komunikaty stanu rozdzielone spacjami"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no' lub 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' lub \""
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Sprawdź swoje połączenie lub spróbuj później"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Błąd przy wykonywaniu \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "błąd: nie można otworzyć %s do odczytu"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Nie można podłączyć się do portu %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików "
+#~ "zostanie anulowane."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Klient jabbera w GTK+."
+
+#~ msgid "Condition"
+#~ msgstr "Warunek"
+
+#~ msgid "when I am "
+#~ msgstr "kiedy mam "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Wymaga pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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ń."
+
+#, 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 ""
+#~ "Wymaga texlive-latex-base, dvipng (Wszystko jest w MikTeX). Musisz "
+#~ "ustawić zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
+
+#~ 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 "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Użycie: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakty"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Błąd zapisu na dysk"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Temat: %s"
+
+#~ msgid "Mood: %s"
+#~ msgstr "Nastrój: %s"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktywność:"
+
 #~ msgid "Requires gpg and python-GnuPGInterface."
 #~ msgstr "Wymaga GPG oraz python-GnuPGInterface."
 
@@ -10720,9 +11711,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Historia rozmów grupowych\n"
 #~ "Wszystkie historie rozmów"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Zarządzaj kontami"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10892,18 +11880,9 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Przypisz klucz Open_PGP"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Komenda nie jest wspierana dla konta zeroconf."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Polecenia: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Użycie: /%s czyście okno tekstowe."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Użycie: /%s ukrywa przyciski czatu."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10912,12 +11891,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ "aktualnego pokoju. Używaj w trzeciej osobie. (np. /%(command)s "
 #~ "eksploduje.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Brak informacji o pomocy dla /%s"
 
@@ -10934,10 +11907,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Pseudonim nie został odnaleziony: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10948,11 +11917,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10991,9 +11955,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11013,9 +11974,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH Port:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Pokaż _listę kontaktów"
-
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę"
 
@@ -11143,9 +12101,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "General:"
 #~ msgstr "Ogólne"
 
-#~ msgid "Message:"
-#~ msgstr "Wiadomość"
-
 #~ msgid "Close"
 #~ msgstr "Zamknij"
 
@@ -11197,9 +12152,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
-
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Kliknij by zobaczyć poprzednie rozmowy w tym pokoju"
 
@@ -11221,9 +12173,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "in"
 #~ msgstr "w"
 
-#~ msgid "Accept"
-#~ msgstr "Akceptuj"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Zaproszenie Odebrane"
 
@@ -11391,9 +12340,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "Company:"
 #~ msgstr "Firma:"
 
-#~ msgid "Country:"
-#~ msgstr "Kraj:"
-
 #~ msgid "Given:"
 #~ msgstr "Imię:"
 
diff --git a/po/pt.po b/po/pt.po
index 4e844586d..98823805a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,15 +2,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -20,321 +16,315 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "E_stado"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Detalhes Pessoais..."
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Iniciar Conversa"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Entrar num Chat..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Adicionar Contacto"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 #, fuzzy
 msgid "_Execute Command..."
 msgstr "comando"
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "_Modificar Conta..."
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir Compositor de Email"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Detalhes Pessoais..."
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Iniciar Conversa"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "E_stado"
+#, fuzzy
+msgid "_Modify Account"
+msgstr "_Modificar Conta..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Criação Passo-a-passo de uma Conta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Conta está a ser criada</b>\n"
-"\n"
-"Por favor, aguarde..."
+"Necessita de uma conta para se poder ligar\n"
+"à rede Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+#, 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:5
+msgid "I want to _register for a new account"
+msgstr "Quero _registar uma nova conta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "Por favor preencha os dados para a sua conta existente"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Senha:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Guardar _senha"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
-msgid "Anon_ymous authentication"
-msgstr "Usar autenticação"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Ligar quando eu premir Concluir"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Criação Passo-a-passo de uma Conta"
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Usar autenticação"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../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"
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gerir..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Usar hostname/porta personalizados"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
-msgid "Prox_y:"
-msgstr "Proxy:"
+msgid "_Hostname:"
+msgstr "Nome do Host:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Guardar _senha"
+msgid "_Port:"
+msgstr "_Porta:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "Avançado"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Necessita de uma conta para se poder ligar\n"
-"à rede Jabber."
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Terminar"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Nome do Host:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Conta está a ser criada</b>\n"
+"\n"
+"Por favor, aguarde..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Ligar quando eu premir Concluir"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Senha:"
+#, 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:29
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "_Finish"
+msgstr "_Terminar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Diversos</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Nenhum"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Detalhes Pessoais</b>"
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../data/gui/accounts_window.ui.h:4
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 #, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Registos</b>"
+msgid "Add"
+msgstr "Endereço"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
 #, fuzzy
-msgid "A_djust to status"
-msgstr "Pedir para ver o estado dele/dela"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Conta"
+msgid "Delete"
+msgstr "Apagar MOTD"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Contas"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/gui/accounts_window.ui.h:8
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
 #, fuzzy
-msgid "Administration operations"
-msgstr "_Administrador"
+msgid "_Enable"
+msgstr "Activar"
 
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
 #, fuzzy
 msgid "Anonymous authentication"
 msgstr "Usar autenticação"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 ""
+"O recurso é enviado ao servidor jabber para separar o mesmo JID em duas ou "
+"mais partes dependentemente do número de clientes ligados ao mesmo servidor "
+"com as mesma conta. Por exemplo, pode estar ligado à mesma conta com os "
+"recursos 'Casa' e 'Trabalho' ao mesmo tempo. O recurso com a maior "
+"prioridade receberá os eventos. (ver em baixo)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
 #: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
-msgid "Auto-reconnect when connection is lost"
-msgstr "Religar automaticamente em caso de perda de ligação."
+msgid "Synchronize contacts"
+msgstr "Mostrar Contactos _Offline"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Explorar"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "_Ligar ao arranque"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Mu_dar Senha"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Clique para mudar a senha da conta"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+#, fuzzy
+msgid "Administration operations"
+msgstr "_Administrador"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Escolher Ficheiro para Enviar"
+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 ""
+"A prioridade é usada no Jabber para determinar quem recebe os eventos do "
+"servidor jabber quando dois ou mais clientes estão ligados usando a mesma "
+"conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "_Escolha chave..."
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Pedir para ver o estado dele/dela"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Clique para mudar a senha da conta"
+msgid "Priority will change automatically according to your status."
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
+msgid "Priori_ty:"
+msgstr "_Prioridade"
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "Nome de utilizador inválido"
-
-#: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "_Ligar ao arranque"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Ligação"
+msgid "Resour_ce:"
+msgstr "Re_curso: "
 
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
+#: ../data/gui/accounts_window.ui.h:25
 #, fuzzy
-msgid "First Name:"
-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: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: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"
+msgid "Browse..."
+msgstr "_Explorar"
 
 #: ../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 ""
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Esta mensagem é encriptada]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
+msgid "Client certificate"
+msgstr "Nome de utilizador inválido"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Conta"
 
 #: ../data/gui/accounts_window.ui.h:29
-#, fuzzy
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Se marcado, o Gajim enviará pacotes keep-alive para evitar timeouts da "
-"ligação, os quais resultam na perda dessa ligação"
+msgid "C_onnect on Gajim startup"
+msgstr "_Ligar ao arranque"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -345,6 +335,19 @@ msgstr ""
 "usando esta conta"
 
 #: ../data/gui/accounts_window.ui.h:31
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Religar automaticamente em caso de perda de ligação."
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Guardar _históricos das conversas para todos os contactos"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sinc_ronizar estado da conta com estado global"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -353,189 +356,218 @@ msgstr ""
 "Se marcado, qualquer mudança feita ao estado global (gerido pelo combobox no "
 "fundo da lista de contactos) alterará também o estado desta conta"
 
-#: ../data/gui/accounts_window.ui.h:32
+#: ../data/gui/accounts_window.ui.h:35
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "lista de transferências de ficheiros"
+
+#: ../data/gui/accounts_window.ui.h:36
 msgid ""
-"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."
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
 msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "Informações sobre si, tal como estão gravadas no servidor"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Geral"
 
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
 
-#: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
 #, fuzzy
-msgid "Last Name:"
-msgstr "Nome:"
+msgid "_Manage..."
+msgstr "Gerir..."
 
-#: ../data/gui/accounts_window.ui.h:37
+#: ../data/gui/accounts_window.ui.h:40
 #, fuzzy
-msgid "Mer_ge accounts"
-msgstr "_Fundir contas"
-
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Nenhuma chave seleccionada"
-
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Detalhes Pessoais..."
+msgid "<b>Proxy</b>"
+msgstr "<b>Registos</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "_Prioridade"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"A prioridade é usada no Jabber para determinar quem recebe os eventos do "
-"servidor jabber quando dois ou mais clientes estão ligados usando a mesma "
-"conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr ""
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Enviar pacotes keep-alive"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_nomear"
+#: ../data/gui/accounts_window.ui.h:44
+#, fuzzy
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Se marcado, o Gajim enviará pacotes keep-alive para evitar timeouts da "
+"ligação, os quais resultam na perda dessa ligação"
 
 #: ../data/gui/accounts_window.ui.h:45
 #, fuzzy
-msgid "Resour_ce:"
-msgstr "Re_curso: "
+msgid "Use cust_om hostname/port"
+msgstr "Usar hostname/porta personalizados"
 
 #: ../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 ""
-"O recurso é enviado ao servidor jabber para separar o mesmo JID em duas ou "
-"mais partes dependentemente do número de clientes ligados ao mesmo servidor "
-"com as mesma conta. Por exemplo, pode estar ligado à mesma conta com os "
-"recursos 'Casa' e 'Trabalho' ao mesmo tempo. O recurso com a maior "
-"prioridade receberá os eventos. (ver em baixo)"
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nome do Host:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Guardar _históricos das conversas para todos os contactos"
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porta:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diversos</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Enviar pacotes keep-alive"
+msgid "Connection"
+msgstr "Ligação"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinc_ronizar estado da conta com estado global"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Nenhuma chave seleccionada"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinc_ronizar estado da conta com estado global"
+msgid "Choose _Key..."
+msgstr "_Escolha chave..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Mostrar Contactos _Offline"
+msgid "Use G_PG Agent"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr ""
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Usar hostname/porta personalizados"
+msgid "_Edit Personal Information..."
+msgstr "Editar Detalhes Pessoais..."
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Usar hostname/porta personalizados"
+msgid "Information about you, as stored in the server"
+msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
 #: ../data/gui/accounts_window.ui.h:57
-#, fuzzy
-msgid "Use file transfer proxies"
-msgstr "lista de transferências de ficheiros"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Detalhes Pessoais</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Detalhes Pessoais..."
 
 #: ../data/gui/accounts_window.ui.h:59
 #, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Editar Detalhes Pessoais..."
+msgid "Co_nnect on Gajim startup"
+msgstr "_Ligar ao arranque"
 
-#. 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
 #, fuzzy
-msgid "_Enable"
-msgstr "Activar"
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizar estado da conta com estado global"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Nome do Host:"
+msgid "Use cust_om port:"
+msgstr "Usar hostname/porta personalizados"
+
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
 
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
 #, fuzzy
-msgid "_Manage..."
-msgstr "Gerir..."
+msgid "First Name:"
+msgstr "Nome:"
 
 #: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/zeroconf_information_window.ui.h:9
 #, fuzzy
-msgid "_Port: "
-msgstr "_Porta:"
+msgid "Last Name:"
+msgstr "Nome:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+#, fuzzy
+msgid "Mer_ge accounts"
+msgstr "_Fundir contas"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
+msgid "Add New Contact"
+msgstr "Adicionar Novo Contacto"
+
+#: ../data/gui/add_new_contact_window.ui.h:2
 #, fuzzy
 msgid "A_ccount:"
 msgstr "Conta:"
 
-#: ../data/gui/add_new_contact_window.ui.h:2
+#: ../data/gui/add_new_contact_window.ui.h:3
+#, fuzzy
+msgid "_Protocol:"
+msgstr "Protocolo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:4
+#, fuzzy
+msgid "_User ID:"
+msgstr "ID do Utilizador:"
+
+#: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Alcunha:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
 #, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Adicionar Novo Contacto"
-
-#: ../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 "Gostaria de o adicionar à minha lista de contactos."
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Subscrição"
 
-#: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -543,52 +575,35 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:9
-msgid ""
-"You must be connected to the transport to be able\n"
-"to add a contact from this protocol."
-msgstr ""
-
-#: ../data/gui/add_new_contact_window.ui.h:11
-#, fuzzy
-msgid "_Group:"
-msgstr "Grupo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Alcunha:"
-
 #: ../data/gui/add_new_contact_window.ui.h:13
 #, fuzzy
-msgid "_Protocol:"
-msgstr "Protocolo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-#, fuzzy
 msgid "_Register"
 msgstr "Re_gistar"
 
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Subscrição"
+#: ../data/gui/add_new_contact_window.ui.h:14
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:16
-#, fuzzy
-msgid "_User ID:"
-msgstr "ID do Utilizador:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-#, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "Ocorreu um erro de protocolo:"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
+#, fuzzy
+msgid "Please wait while retrieving command list..."
 msgstr ""
+"Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
+"feita "
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
@@ -597,365 +612,175 @@ msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
-msgid "Error description..."
-msgstr "Descrição"
+msgid "Please wait while the command is being sent..."
+msgstr ""
+"Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
+"feita "
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Terminar"
+msgid "Please wait..."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-#, fuzzy
-msgid "Please wait while retrieving command list..."
+msgid "This jabber entity does not expose any commands."
 msgstr ""
-"Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
-"feita "
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
 #, fuzzy
-msgid "Please wait while the command is sending..."
-msgstr ""
-"Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
-"feita "
+msgid "<b>An error has occurred:</b>"
+msgstr "Ocorreu um erro de protocolo:"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr ""
+#, fuzzy
+msgid "Error description..."
+msgstr "Descrição"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr ""
+#, fuzzy
+msgid "F_inish"
+msgstr "_Terminar"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Descrição</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Editor de Configuração Avançada"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr ""
+msgid "Filter:"
+msgstr "Filtro:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor de Configuração Avançada"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Descrição</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtro:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Voltar às Cores Padrão"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Apagar MOTD"
+msgid "Show _XML Console"
+msgstr "Mostrar Consola _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Iniciar Conversa"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrador"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "E_nviar Mensagem de Servidor"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Definir MOTD"
+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:7
 msgid "Sets Message of the Day"
 msgstr "Define a Mensagem do Dia"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Mostrar Consola _XML"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Definir MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Actualiza a Mensagem do Dia"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar MOTD"
 
-#: ../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:11
-msgid "_Administrator"
-msgstr "_Administrador"
+msgid "Delete MOTD"
+msgstr "Apagar MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "E_nviar Mensagem de Servidor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-#, fuzzy
-msgid "<b>Actions</b>"
-msgstr "<b>Aplicações</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-#, fuzzy
-msgid "<b>Conditions</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-#, fuzzy
-msgid "Advanced Actions"
-msgstr "Acções A_vançadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-#, fuzzy
-msgid "Advanced Notifications Control"
-msgstr "Editor de Configuração Avançada"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-#, fuzzy
-msgid "All statuses"
-msgstr "Estado: "
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Ausente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-#, fuzzy
-msgid "Busy "
-msgstr "Ocupado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Contacto Saiu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contacto Entrou"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Transferências de Ficheiros"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Pedido de Transferência de Ficheiro"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Transferência de Ficheiro Parada"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Nova Mensagem"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisível"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-#, fuzzy
-msgid "Launch a command"
-msgstr "comando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Indisponível"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-#, fuzzy
-msgid "Online / Free For Chat"
-msgstr "Livre para conversar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-#, fuzzy
-msgid "Play a sound"
-msgstr "Tocar _Sons"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nova Mensagem Privada"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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 ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-#, fuzzy
-msgid "_Disable auto opening chat window"
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-#, fuzzy
-msgid "_Open chat window with user"
-msgstr "Usar uma única janela de conversa com _abas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Mostrar apenas na _lista"
+msgid "Deletes Message of the Day"
+msgstr "Apaga a Mensagem do Dia"
 
-#: ../data/gui/advanced_notifications_window.ui.h:36
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "_Show event in roster"
-msgstr "Mostrar apenas na _lista"
+msgid "No"
+msgstr "Nenhum"
 
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:38
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "contact(s)"
-msgstr "Contacto:"
+msgid "Prefer"
+msgstr "Preferências"
 
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-#, fuzzy
-msgid "for "
-msgstr "Porta:"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:2
+#: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Local</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:4
+#: ../data/gui/archiving_preferences_window.ui.h:9
 #, fuzzy
 msgid "Auto"
 msgstr "Entrar automaticamente"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
-msgstr ""
+#: ../data/gui/atom_entry_window.ui.h:1
+#, fuzzy
+msgid "New entry received"
+msgstr "Quando um novo evento é recebido"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Nenhum"
-
-#: ../data/gui/archiving_preferences_window.ui.h:8
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
-msgid "Prefer"
-msgstr "Preferências"
-
-#: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+msgid "Feed name:"
+msgstr "nome do tema"
 
-#: ../data/gui/atom_entry_window.ui.h:1
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "Entry:"
 msgstr "País:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
-#, fuzzy
-msgid "Feed name:"
-msgstr "nome do tema"
-
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:5
 #, fuzzy
 msgid "Last modified:"
 msgstr "Nome:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-#, fuzzy
-msgid "New entry received"
-msgstr "Quando um novo evento é recebido"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
 msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
@@ -964,61 +789,61 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Configurar Mensagens de Estado</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
-msgstr "<b>Registos</b>"
+msgid "<b>Message:</b> "
+msgstr "<b>Configurar Mensagens de Estado</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Registos</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Registos</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Mudar Senha"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Introduza novamente para confirmação"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Introduza a nova senha:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Introduza novamente para confirmação"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
 #, fuzzy
-msgid "<b>Type your new status message</b>"
-msgstr "Escreva a sua nova mensagem de estado:"
+msgid "Save as Preset..."
+msgstr "Guardar Ficheiro como..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 #, fuzzy
-msgid "Activity:"
-msgstr "Activo"
+msgid "Mood:"
+msgstr "Sala:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 #, fuzzy
-msgid "Mood:"
-msgstr "Sala:"
+msgid "Activity:"
+msgstr "Activo"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 #, fuzzy
@@ -1027,296 +852,284 @@ msgstr "mensagem de estado:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
 #, fuzzy
-msgid "Save as Preset..."
-msgstr "Guardar Ficheiro como..."
+msgid "<b>Type your new status message</b>"
+msgstr "Escreva a sua nova mensagem de estado:"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "_Entrar num Chat"
+msgid "_Copy Link Location"
+msgstr "_Copiar Localização do Link"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Adicionar à Lista"
+msgid "_Open Link in Browser"
+msgstr "_Abrir Link no Navegador"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar JID/Endereço de Email"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar Localização do Link"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Abrir Compositor de Email"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Abrir Link no Navegador"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr ""
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "_Entrar num Chat"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Adicionar à Lista"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Clique para inserir um emoticon (Alt+E)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Adiciona o contacto à lista"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está a prestar atenção à conversa"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "está a prestar atenção à conversa"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Enviar mensagem"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "E_nviar"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Invisível"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-#, fuzzy
-msgid "MUC server"
-msgstr "Servidor"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-
-#: ../data/gui/contact_context_menu.ui.h:1
 #, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Pedir para ver o estado dele/dela"
+msgid "MUC server"
+msgstr "Servidor"
 
-#: ../data/gui/contact_context_menu.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "<b>Notificações Visuais</b>"
+msgid "In_vite"
+msgstr "Invisível"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Atribuir chave OpenPGP"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Iniciar _Conversa"
 
-#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
 #, fuzzy
-msgid "E_xecute Command..."
-msgstr "comando"
+msgid "Send Single _Message..."
+msgstr "Enviar _Mensagem Simples"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Editar _Grupos"
+msgid "Send _File..."
+msgstr "Enviar _Ficheiro"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Contacto:"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Activar/Desactivar Encriptação Open_PGP"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Remover"
+msgid "Toggle End to End Encryption"
+msgstr "Activar/Desactivar Encriptação Open_PGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Pedir para ver o estado dele/dela"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "comando"
+
 #: ../data/gui/contact_context_menu.ui.h:10
 #, fuzzy
-msgid "Send Single _Message..."
-msgstr "Enviar _Mensagem Simples"
+msgid "M_anage Contact"
+msgstr "Contacto:"
 
 #: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
-msgid "Send _File..."
-msgstr "Enviar _Ficheiro"
+msgid "_Rename..."
+msgstr "_Renomear"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Editar _Grupos"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Iniciar _Conversa"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Atribuir chave OpenPGP"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Activar/Desactivar Encriptação Open_PGP"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Activar/Desactivar Encriptação Open_PGP"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "<b>Notificações Visuais</b>"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Subscrição"
 
 #: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
-msgid "_Allow him/her to see my status"
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Pedir para ver o estado dele/dela"
 
 #: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
-msgid "_Forbid him/her to see my status"
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Histórico"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Contacto:"
+msgid "_Unignore"
+msgstr "_Continuar"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Renomear"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Subscrição"
+#: ../data/gui/contact_context_menu.ui.h:25
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Remover"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "_Continuar"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Histórico"
 
 #: ../data/gui/data_form_window.ui.h:1
+msgid "Room Configuration"
+msgstr "Configuração da Sala"
+
+#: ../data/gui/data_form_window.ui.h:2
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Neste grupo"
 
-#: ../data/gui/data_form_window.ui.h:2
-msgid "Room Configuration"
-msgstr "Configuração da Sala"
-
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar Grupos"
@@ -1330,62 +1143,54 @@ msgstr "<b>Descrição</b>"
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Recursos dos Servidores"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
+msgid "File Transfers"
+msgstr "Transferências de Ficheiros"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Cancelar transferência de ficheiro"
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr ""
+"Mostra uma lista de transferências de ficheiros entre si e outras pessoas"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Cancela a transferência de ficheiro seleccionada"
+msgid "file transfers list"
+msgstr "lista de transferências de ficheiros"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Cancela a transferência de ficheiro seleccionada e remove o ficheiro "
-"incompleto"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Limpar"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Transferências de Ficheiros"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+"Quando uma transferência de ficheiro é concluida, exibir um popup de "
+"notificação"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Esconde a janela"
-
-#: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Remover a transferência de ficheiro da lista."
-
-#: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Remove transferências de ficheiros completas, canceladas e falhadas da lista"
 
-#: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr ""
-"Mostra uma lista de transferências de ficheiros entre si e outras pessoas"
+#: ../data/gui/filetransfers.ui.h:8
+msgid "Remove file transfer from the list."
+msgstr "Remover a transferência de ficheiro da lista."
 
-#: ../data/gui/filetransfers.ui.h:11
+#: ../data/gui/filetransfers.ui.h:9
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1393,44 +1198,56 @@ msgstr ""
 "Esta acção remove uma única transferência de ficheiro da lista. Se a "
 "transferência estiver activa, será primeiro interrompida e depois removida."
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Limpar"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pausa"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
-"Quando uma transferência de ficheiro é concluida, exibir um popup de "
-"notificação"
+"Cancela a transferência de ficheiro seleccionada e remove o ficheiro "
+"incompleto"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continuar"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Cancelar transferência de ficheiro"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
+msgid "Cancels the selected file transfer"
+msgstr "Cancela a transferência de ficheiro seleccionada"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Abrir Pasta"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Esconde a janela"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pausa"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Continuar"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista de transferências de ficheiros"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Abrir Pasta"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr ""
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Conta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Negrito"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contacto:"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 #, fuzzy
@@ -1438,70 +1255,68 @@ msgid "Chat Banner"
 msgstr "Faixa:"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr ""
+msgid "Gajim Themes Customization"
+msgstr "Personalização de Temas do Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contacto:"
+msgid "Text _color:"
+msgstr "_Cor do texto"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Estilo da letra:"
+msgid "_Background:"
+msgstr "Cor _de fundo"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalização de Temas do Gajim"
+msgid "Text _font:"
+msgstr "_Letra do texto"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-#, fuzzy
-msgid "Gone"
-msgstr "Nenhum"
+msgid "Font style:"
+msgstr "Estilo da letra:"
 
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Negrito"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
+msgid "Italic"
+msgstr "Itálico"
+
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pausada"
+
+#: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr ""
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
-msgid "Italic"
-msgstr "Itálico"
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
 
-#: ../data/gui/gajim_themes_window.ui.h:13
+#: ../data/gui/gajim_themes_window.ui.h:16
+#, fuzzy
+msgid "Gone"
+msgstr "Nenhum"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "Mensagem"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pausada"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Cor do texto"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Letra do texto"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "Cor _de fundo"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
 msgid "Change _Nickname..."
@@ -1509,91 +1324,101 @@ msgstr "Muda Alcu_nha"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Gerir Bookmarks"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Muda A_ssunto"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Configurar _Sala"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Adicionar esta Sala aos _Bookmarks"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Descrição: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Gerir Bookmarks"
+msgid "_Request Voice"
+msgstr "_Voz"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Adicionar esta Sala aos _Bookmarks"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derador"
+msgid "_Send Private Message"
+msgstr "E_nviar Mensagem Privada"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Enviar _Ficheiro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "Acções de _Ocupantes"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Enviar _Ficheiro"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Adicionar à Lista"
+msgid "_Voice"
+msgstr "_Voz"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derador"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Banir"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Dono"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Membro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Dono"
+msgid "_Ban"
+msgstr "_Banir"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "E_nviar Mensagem Privada"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voz"
+msgid "_Add to Roster"
+msgstr "_Adicionar à Lista"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Adicionar esta Sala aos _Bookmarks"
+msgid "Show a list of formattings"
+msgstr "Clique para inserir um emoticon (Alt+E)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Muda Alcu_nha"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Muda Alcu_nha"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Adicionar esta Sala aos _Bookmarks"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1605,37 +1430,19 @@ msgid "From:"
 msgstr "De:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Assunto:"
 
 #: ../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."
+msgid "Gajim History Logs Manager"
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-#, fuzzy
-msgid "Delete"
-msgstr "Apagar MOTD"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1644,175 +1451,196 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:8
 #, fuzzy
 msgid "_Search Database"
 msgstr "_Pesquisar"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Estado: "
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Histórico das Conversas"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr ""
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Nome do Contacto"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Chat"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Estado: "
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Histórico das Conversas"
+
 #: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "_Pesquisar"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Arquivar mudanças de estado dos contactos"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
+#: ../src/gajim-remote.py:230
+msgid "jid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Host:"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Sala:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Alcunha:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Recentemente:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recentemente:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Sala:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Servidor:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Adicionar esta Sala aos _Bookmarks"
+msgid "Bro_wse Rooms"
+msgstr "_Explorar"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Entrar"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Entrar automaticamente"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gerir Bookmarks"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Título:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:7
 #, fuzzy
-msgid "Print status:"
+msgid "Pr_int status:"
 msgstr "Mostrar hora:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Entrar automaticamente"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Título:"
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1825,103 +1653,105 @@ msgid "_Configure"
 msgstr "_Continuar"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Propriedades</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Ligação HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Definições</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Ligação HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Senha:"
+#, fuzzy
+msgid "_Name:"
+msgstr "_Nome: "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Propriedades</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Porta:"
+msgid "Use HTTP prox_y"
+msgstr "_Usar proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
+msgid "_BOSH URL:"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Usar proxy"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
-#, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usar autenticação"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "Nome de _utilizador"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr ""
+msgid "Pass_word:"
+msgstr "_Senha:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
 #, fuzzy
-msgid "_Name:"
-msgstr "_Nome: "
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
+msgid "Proxy _Port:"
+msgstr "_Porta:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "Nome de _utilizador"
+msgid "<b>Settings</b>"
+msgstr "<b>Definições</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Gerir Contas"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Autorizar"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
-msgid "Available"
-msgstr "Indisponível"
+msgid "Version:"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Continuar"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Descrição: %s"
+msgid "Authors:"
+msgstr "_Autorizar"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1929,38 +1759,32 @@ msgid "Homepage:"
 msgstr "Página pessoal:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Interrompida"
+msgid "Description:"
+msgstr "Descrição: %s"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Continuar"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
+#, fuzzy
+msgid "Installed"
+msgstr "Interrompida"
 
 #: ../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"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1974,516 +1798,507 @@ msgid "Event desc"
 msgstr "Eventos"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor de Configuração Avançada</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplicações</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Definições Personalizadas</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Aplicações</b>"
+msgid "All chat states"
+msgstr "Estado: "
 
 #: ../data/gui/preferences_window.ui.h:4
-#, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Aplicações</b>"
+msgid "Composing only"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Formato de uma linha</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Mudanças na última versão</b>"
+msgid "Never"
+msgstr "_Nunca"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notificações Visuais</b>"
+msgid "Only when pending events"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Sons</b>"
+msgid "Always"
+msgstr "Ausente"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Mostrar a mensagem como pop-up"
 
-#. 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>Definições Personalizadas</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificar-me"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Registos</b>"
+msgid "Show only in roster"
+msgstr "Mostrar apenas na _lista"
 
 #: ../data/gui/preferences_window.ui.h:12
-#, fuzzy
-msgid "<b>GMail Options</b>"
-msgstr "<b>Aplicações</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Configurar Mensagens de Estado</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<b>Propriedades</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Configurar Mensagens de Estado</b>"
+msgid "Last state"
+msgstr "Iconset de _estados padrão:"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Preferências"
 
 #: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Propriedades</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
 #: ../data/gui/preferences_window.ui.h:20
 #, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Formato de uma linha</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
+"lista"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notificações Visuais</b>"
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
+msgstr "Exibir mensagens de estado dos contactos na lista"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Avançado"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Avançado"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
+"lista"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Estado: "
+msgid "Sort contacts by status"
+msgstr "Ordenar contactos por estados"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Permitir o envio de informações do _SO "
+#, fuzzy
+msgid "in _roster"
+msgstr "Fora da lista"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Permitir o envio de informações do _SO "
+msgid "in _group chats"
+msgstr "_Entrar num Chat"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Permitir popup/notificações quando estou _ausente/indisponível/ocupado/"
-"invisível"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid "_Window behavior:"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:30
 #, fuzzy
-msgid "Always"
-msgstr "Ausente"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
+"gráficos equivalentes."
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Pedir a mensagem de estado quando eu me: "
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Gerir Emoticons"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Enviar mensagem e fechar a janela"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
+msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:35
-#, fuzzy
-msgid "Chat message:"
-msgstr "Mensagem de estado:"
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr ""
+msgid "_Highlight misspelled words"
+msgstr "_Destacar palavras mal soletradas"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
+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:38
-msgid "Configure color and font of the interface"
-msgstr ""
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Mostrar janela principal ao arranque"
 
 #: ../data/gui/preferences_window.ui.h:39
-#, fuzzy
-msgid "Contact's message:"
-msgstr "Mensagem de estado:"
+msgid "Show icon when your messages are received"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
-msgid "Contact's nickname:"
-msgstr "Nome do Contacto"
-
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Definições Personalizadas</b>"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Formato de uma linha</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Quando um novo evento é recebido"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notificar-me sobre contactos que acabem de se: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar-me sobre contactos que acabem de se: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
+"Permitir popup/notificações quando estou _ausente/indisponível/ocupado/"
+"invisível"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+msgid "Notify on new _GMail email"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+msgid "Display _extra email details"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
+"lista"
 
 #: ../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"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Aplicações</b>"
 
 #: ../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"
+msgid "Show notification area icon:"
+msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
 #: ../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"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notificações Visuais</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-#, fuzzy
-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 pode enviar e receber meta-informação relativa a uma conversa que "
-"esteja a ter com um contacto "
+msgid "Play _sounds"
+msgstr "Tocar _Sons"
 
 #: ../data/gui/preferences_window.ui.h:55
 #, fuzzy
-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 pode enviar e receber meta-informação relativa a uma conversa que "
-"esteja a ter com um contacto "
+msgid "Ma_nage..."
+msgstr "Gerir..."
 
 #: ../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"
+msgid "Allow sound when I'm _busy"
 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:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sons</b>"
 
 #: ../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."
+msgid "Notifications"
+msgstr "Modificação da Conta"
 
 #: ../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"
+"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 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
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Noti_ficação do estado da conversa:"
 
 #: ../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"
+"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 pode enviar e receber meta-informação relativa a uma conversa que "
+"esteja a ter com um contacto "
 
 #: ../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 ""
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Noti_ficação do estado da conversa:"
 
 #: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
-"lista"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificações Visuais</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
 #, fuzzy
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
-"nomes de cada um na janela principal"
+msgid "Personal Events"
+msgstr "Detalhes Pessoais..."
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
-"lista"
+msgid "_Away after:"
+msgstr "Marcar automaticamente como _ausente depois de:"
 
 #: ../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á imagens pessoais (avatars) dos seus contactos na "
-"lista"
+"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:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
-"lista"
+msgid "_Not available after:"
+msgstr "Marcar automaticamente como _indisponível depois de:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
-"lista"
 
 #: ../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 ""
+msgid "minutes"
+msgstr "minutos"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Marque esta opção apenas se alguem que não está na sua lista o estiver a "
-"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: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:72
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Se marcado, o Gajim usará ícones de estado específicos a cada protocolo. "
-"(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: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:75
-#, fuzzy
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
-"gráficos equivalentes."
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr ""
+#, fuzzy
+msgid "<b>Auto Status</b>"
+msgstr "<b>Aplicações</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Enviar mensagem e fechar a janela"
+msgid "Ask status message when I:"
+msgstr "Pedir a mensagem de estado quando eu me: "
 
 #: ../data/gui/preferences_window.ui.h:78
-#, fuzzy
-msgid "Ma_nage..."
-msgstr "Gerir..."
+msgid "Sign _in"
+msgstr "_Ligar"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Nunca"
+msgid "Sign _out"
+msgstr "_Desligar"
 
 #: ../data/gui/preferences_window.ui.h:80
-#, fuzzy
-msgid "Notifications"
-msgstr "Modificação da Conta"
+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:81
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Notificar-me sobre contactos que acabem de se: "
+msgid "<b>Status Messages</b>"
+msgstr "<b>Configurar Mensagens de Estado</b>"
 
 #: ../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: "
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notificar-me"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Estado"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
+msgid "Use system _default"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Mensagem de estado:"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Detalhes Pessoais..."
+msgid "<b>Font</b>"
+msgstr "<b>Registos</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Tocar _Sons"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Usar iconsets de _transportes"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Mostrar a mensagem como pop-up"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se marcado, o Gajim usará ícones de estado específicos a cada protocolo. "
+"(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:89
-msgid "Preferences"
-msgstr "Preferências"
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Iconset de _estados padrão:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
+msgid "Configure color and font of the interface"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:91
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Servidor:"
+msgid "<b>Themes</b>"
+msgstr "<b>Propriedades</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
+msgid "Contact's nickname:"
+msgstr "Nome do Contacto"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Mostrar apenas na _lista"
+msgid "Your nickname:"
+msgstr "Antes da alcunha:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Ligar"
+#, fuzzy
+msgid "_Status message:"
+msgstr "Mensagem de estado:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Desligar"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Voltar às Cores Padrão"
 
 #: ../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 ""
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Mensagem de estado:"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "Ordenar contactos por estados"
+msgid "Your message:"
+msgstr "Introduza a sua mensagem :"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Estado"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Chat"
 
 #: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Iconset de _estados padrão:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Mudanças na última versão</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
@@ -2491,589 +2306,599 @@ msgid "Style"
 msgstr "Interrompida"
 
 #: ../data/gui/preferences_window.ui.h:103
-#, fuzzy
-msgid "T_heme:"
-msgstr "Tema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Aplicações</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Usar iconsets de _transportes"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Formato de uma linha</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr ""
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Quando um novo evento é recebido"
+msgid "<b>Connection</b>"
+msgstr "<b>Sons</b>"
+
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
-msgid "Your message:"
-msgstr "Introduza a sua mensagem :"
+msgid "_File manager:"
+msgstr "Gestor de ficheiros:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Antes da alcunha:"
+msgid "_Mail client:"
+msgstr "Cliente de e_mail:"
 
 #: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Marcar automaticamente como _ausente depois de:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegador:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Noti_ficação do estado da conversa:"
+msgid "<b>Custom</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Gerir Emoticons"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplicações</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-#, fuzzy
-msgid "_File manager:"
-msgstr "Gestor de ficheiros:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Destacar palavras mal soletradas"
+#, fuzzy
+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 ""
+"Marque esta opção apenas se alguem que não está na sua lista o estiver a "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorar eventos de contactos que não estão na lista"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Permitir o envio de informações do _SO "
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr ""
+#, 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:128
-msgid "_Log status changes of contacts"
-msgstr "_Arquivar mudanças de estado dos contactos"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Permitir o envio de informações do _SO "
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "Cliente de e_mail:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Marcar automaticamente como _indisponível depois de:"
+msgid "Log _encrypted chat session"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:131
-#, fuzzy
-msgid "_Open..."
-msgstr "Abrir..."
+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:132
 #, fuzzy
-msgid "_Reset to Default Colors"
-msgstr "Voltar às Cores Padrão"
+msgid "Allow my _idle time to be sent"
+msgstr "Permitir o envio de informações do _SO "
 
 #: ../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:134
-#, fuzzy
-msgid "_Status message:"
-msgstr "Mensagem de estado:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<b>Propriedades</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr ""
+msgid "_Log status changes of contacts"
+msgstr "_Arquivar mudanças de estado dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "in _group chats"
-msgstr "_Entrar num Chat"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
-msgid "in _roster"
-msgstr "Fora da lista"
+msgid "_Open..."
+msgstr "Abrir..."
 
-#: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minutos"
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor de Configuração Avançada</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avançado"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Iniciar Conversa"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
 msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:2
-#, fuzzy
-msgid "<b>List of rules</b>"
-msgstr "<b>Formato de uma linha</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 #, fuzzy
 msgid "Active on each startup"
 msgstr "_Ligar ao arranque"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+#, fuzzy
+msgid "<b>List of rules</b>"
+msgstr "<b>Formato de uma linha</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
+msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "_Subscrição"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Negar"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+#, fuzzy
+msgid "all in the group"
+msgstr "Neste grupo"
+
 #: ../data/gui/privacy_list_window.ui.h:11
 #, fuzzy
-msgid "Order:"
-msgstr "Servidor:"
+msgid "all by subscription"
+msgstr "_Subscrição"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
 msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:13
 #, fuzzy
-msgid "all by subscription"
-msgstr "_Subscrição"
+msgid "to send me messages"
+msgstr "Enviar mensagem"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-#, fuzzy
-msgid "all in the group"
-msgstr "Neste grupo"
+msgid "to send me queries"
+msgstr ""
 
 #: ../data/gui/privacy_list_window.ui.h:15
 #, fuzzy
-msgid "both"
-msgstr "Ambos"
+msgid "to view my status"
+msgstr "Permitir que ele/ela veja o meu estado"
 
 #: ../data/gui/privacy_list_window.ui.h:16
 #, fuzzy
-msgid "from"
-msgstr "De"
+msgid "to send me status"
+msgstr "Pedir para ver o estado dele/dela"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "Nenhum"
+msgid "All (including subscription)"
+msgstr "_Subscrição"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr ""
+#, fuzzy
+msgid "Order:"
+msgstr "Servidor:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
-msgid "to send me messages"
-msgstr "Enviar mensagem"
+msgid "none"
+msgstr "Nenhum"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr ""
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
 
 #: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
-msgid "to send me status"
-msgstr "Pedir para ver o estado dele/dela"
+msgid "from"
+msgstr "De"
 
 #: ../data/gui/privacy_list_window.ui.h:22
+msgid "to"
+msgstr ""
+
+#. Family Name
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "to view my status"
-msgstr "Permitir que ele/ela veja o meu estado"
+msgid "<b>Family:</b>"
+msgstr "Família:"
 
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
+#. Middle Name
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Address</b>"
+msgid "<b>Middle:</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../data/gui/profile_window.ui.h:2
+#. Prefix in Name
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Definir _Avatar"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Propriedades</b>"
 
-#: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
+#. Given Name
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Aniversário"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#. Suffix in Name
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Definições Personalizadas</b>"
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sons</b>"
 
-#: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
-msgid "<b>Company:</b>"
+msgid "<b>Full Name</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Street:</b>"
+msgstr "<b>Definições</b>"
 
-#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Departamento:"
+msgid "<b>City:</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "E-Mail:"
+msgid "<b>State:</b>"
+msgstr "<b>Definições</b>"
 
-#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Complemento:"
 
-#. Family Name
-#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Família:"
+msgid "<b>Postal Code:</b>"
+msgstr "Código Postal:"
 
-#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Full Name</b>"
-msgstr "<b>Definições Personalizadas</b>"
+msgid "<b>Country:</b>"
+msgstr "<b>Sons</b>"
 
-#. Given Name
-#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>Address</b>"
+msgstr "<b>Formato de uma linha</b>"
 
-#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Página pessoal:"
 
-#. Middle Name
-#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-#, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Formato de uma linha</b>"
-
-#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Alcunha:"
 
-#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefone:"
 
-#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-#, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-#, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Código Postal:"
-
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-#, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Propriedades</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Registos</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Aniversário"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Definições</b>"
+msgid "<b>E-Mail:</b>"
+msgstr "E-Mail:"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Definições</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Definir _Avatar"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr ""
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sons</b>"
+msgid "Personal Info"
+msgstr "Detalhes Pessoais..."
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+#, fuzzy
+msgid "<b>Company:</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Sobre"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr ""
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Departamento:"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
-
-#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
 #, fuzzy
-msgid "Personal Info"
-msgstr "Detalhes Pessoais..."
+msgid "<b>Role:</b>"
+msgstr "<b>Registos</b>"
 
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>O que pretende fazer?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Sobre"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _apenas do Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>O que pretende fazer?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Remover"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Adicionar Contacto"
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Acções"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Fea_tures"
-msgstr "Recursos dos Servidores"
+msgid "Add _Contact..."
+msgstr "_Adicionar Contacto"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Transferências de Ficheiros"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Questões Perguntadas Frequentemente (FAQ) (online)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Contas"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Ajuda online"
+#: ../data/gui/roster_window.ui.h:11
+#, fuzzy
+msgid "Profile, A_vatar"
+msgstr "Perfil, Avatar"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:13
 #, fuzzy
-msgid "Profile, A_vatar"
-msgstr "Perfil, Avatar"
+msgid "_View"
+msgstr "_Voz"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Mostrar Contactos _Offline"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:16
 #, fuzzy
-msgid "Show Trans_ports"
+msgid "Show T_ransports"
 msgstr "Transportes"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Mostrar Contactos _Offline"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Contas"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Transferências de Ficheiros"
 
-#. 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 "_Acções"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Ajuda"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Editar"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Ajuda online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: ../data/gui/roster_window.ui.h:23
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Enviar _Mensagem Simples"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Questões Perguntadas Frequentemente (FAQ) (online)"
 
 #: ../data/gui/roster_window.ui.h:25
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "_View"
-msgstr "_Voz"
+msgid "Fea_tures"
+msgstr "Recursos dos Servidores"
 
 #: ../data/gui/search_window.ui.h:1
 #, fuzzy
+msgid "Search"
+msgstr "_Pesquisar"
+
+#: ../data/gui/search_window.ui.h:2
+#, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr ""
 "Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
 "feita "
 
-#: ../data/gui/search_window.ui.h:2
-#, fuzzy
-msgid "Search"
-msgstr "_Pesquisar"
-
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Adicionar _Contacto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Pesquisar"
 
@@ -3093,43 +2918,37 @@ msgstr "Registar para"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Responder a esta mensagem"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Para:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Enviar"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Enviar mensagem"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Enviar mensagem e fechar a janela"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Responder"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Para:"
+msgid "Reply to this message"
+msgstr "Responder a esta mensagem"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Responder"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "E_nviar & Fechar"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Enviar mensagem e fechar a janela"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-#, fuzzy
-msgid "Au_thorize"
-msgstr "_Autorizar"
+msgid "Subscription Request"
+msgstr "Pedido de Subscrição"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-#, fuzzy
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autorize o contacto para ele saber quando você está ligado"
+msgid "_Deny"
+msgstr "_Negar"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
@@ -3140,281 +2959,294 @@ msgstr ""
 "Recusar autorização do contacto, para que ele não possa saber quando você "
 "está ligado"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Pedido de Subscrição"
+#: ../data/gui/subscription_request_window.ui.h:6
+#, fuzzy
+msgid "Au_thorize"
+msgstr "_Autorizar"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Negar"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorize o contacto para ele saber quando você está ligado"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Mostrar Contactos _Offline"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-#, fuzzy
-msgid "Select the contacts you want to synchronise"
-msgstr "JID do contacto com quem deseja conversar"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/gui/systray_context_menu.ui.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
-msgid "Mute Sounds"
-msgstr "Sons Wav"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Enviar _Mensagem Simples"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Mostrar Todos os _Eventos Pedentes"
+msgid "Select the contacts you want to synchronise"
+msgstr "JID do contacto com quem deseja conversar"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "C_hat"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-#, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Aplicações</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Enviar _Mensagem Simples"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Definições Personalizadas</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: ../data/gui/vcard_information_window.ui.h:8
+#: ../data/gui/systray_context_menu.ui.h:6
 #, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Definições</b>"
+msgid "Mute Sounds"
+msgstr "Sons Wav"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informações do Contacto"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Recurso:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Definições</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Descrição</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
-msgid "Comments"
-msgstr "Comentário: %s"
+msgid "<b>Contact time:</b>"
+msgstr "<b>Definições</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>User avatar:</b>"
+msgstr "Definir _Avatar"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Configurar _Sala"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
-msgid "Contact"
-msgstr "Contacto:"
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrição</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informações do Contacto"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Aplicações</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Mais"
 
-#: ../data/gui/vcard_information_window.ui.h:48
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
 #, fuzzy
-msgid "User avatar:"
-msgstr "_Escolher Avatar"
+msgid "Contact"
+msgstr "Contacto:"
 
-#: ../data/gui/xml_console_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:49
 #, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Registos</b>"
+msgid "Comments"
+msgstr "Comentário: %s"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfego Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Entrada XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Consulta"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Registos</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IC"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Consulta"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presença"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presença"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Entrada XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Modificar Conta..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr ""
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-#, fuzzy
-msgid "Personal"
-msgstr "Detalhes Pessoais..."
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Cliente Jabber GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+#, fuzzy
+msgid "Personal"
+msgstr "Detalhes Pessoais..."
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr ""
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Cliente Jabber GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informações do Contacto"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Entrada inválida"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr ""
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Deactivated"
 msgstr "Activo"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 #, fuzzy
 msgid "Integer"
 msgstr "Neste grupo"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Nome Preferencial"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Escondida"
 
@@ -3425,245 +3257,179 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] ""
 msgstr[1] ""
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "German"
-msgstr "Geral"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Greek"
-msgstr "green"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Croatian"
-msgstr "Morada"
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Italian"
-msgstr "Itálico"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr ""
-
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Polish"
-msgstr "_Publicar"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
+#: ../src/chat_control.py:209
+msgid "Ping?"
 msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Russian"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:219
 #, fuzzy
-msgid "Serbian"
-msgstr "Geral"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr ""
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr ""
-
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr ""
+msgid "Error."
+msgstr "Erro:"
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 #, fuzzy
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Serviço"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 #, fuzzy
 msgid "Font"
 msgstr "Letra:"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informações do Contacto"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Encriptação activada"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "A mensagem de estado auto-indisponível"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Enviar Ficheiro"
+
+#: ../src/chat_control.py:1785
 #, 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:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
@@ -3671,66 +3437,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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3738,353 +3504,736 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Transferências de Ficheiros"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Tamanho: "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Aceitar"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Transferência de ficheiro completa"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Remove o contacto da lista"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro na leitura do ficheiro:"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Transferência de Ficheiro Parada"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Transferência de ficheiro cancelada"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Ligação ao peer não pode ser estabelecida."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uso: /%s, limpa a janela de texto."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uso: /%s, limpa a janela de texto."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s não encontrado"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Ausente"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Indisponível"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uso: /%s, limpa a janela de texto."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Activar/Desactivar Encriptação Open_PGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Clique para ver conversas anteriores com este contacto"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Sessão bus não está disponível"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Sessão bus não está disponível"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Muda Alcu_nha"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
+"especificado."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Alcunha não encontrada: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
+"especificado."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Está banido/a desta sala."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Nome de utilizador inválido"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Filiação: "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Argumento em falta \"contacto_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "a criar base de dados dos logs"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Informações do Contacto"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Contacto Saiu"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "_Continuar"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrição"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Chat"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Neste grupo"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 #, fuzzy
 msgid "Groupchats"
 msgstr "Chat"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Já está na sala %s"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - %d mensagem não lida"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Gajim - %d mensagem não lida"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por estar inactivo"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Indisponível por estar inactivo"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Nome de utilizador inválido"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "texto da mensagem de estado"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Mostrar apenas na _lista"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Mostrar apenas na _lista"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Noti_ficação do estado da conversa:"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Pedido de Transferência de Ficheiro"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Transferência de ficheiro cancelada"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr ""
+"Quando uma transferência de ficheiro é concluida, exibir um popup de "
+"notificação"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Nome de utilizador inválido"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Mudar Alcunha"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "texto da mensagem de estado"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 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:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
 "(bold) mas * * não seja removido."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 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
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista de contactos?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Número de minutos que as últimas linhas da conversa anterior devem durar."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4092,11 +4241,11 @@ msgstr ""
 "Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
 "(Comportamento por defeito do cliente ICQ Mirabilis)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4105,11 +4254,11 @@ msgstr ""
 "Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
 "ou 'WIKTIONARY', que significa que será usado o Wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -4117,48 +4266,48 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4167,28 +4316,34 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4196,12 +4351,12 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
@@ -4209,7 +4364,7 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4218,13 +4373,13 @@ msgstr ""
 "Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
 "clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Se Verdadeiro (True), Gajim registará para xmpp:// a cada arranque."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4232,7 +4387,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
 "não lidas. Dependendo do tema, este ícone poderá ser animado."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -4241,11 +4396,11 @@ msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4253,7 +4408,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim perguntará por um avatar a cada contacto que não "
 "tinha um da última vez ou tenha um na memória cache há demasiado tempo."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4262,44 +4417,48 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4307,7 +4466,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4315,53 +4474,61 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4370,371 +4537,445 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 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
+#: ../src/common/config.py:287
 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
+#: ../src/common/config.py:288
 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
+#: ../src/common/config.py:289
 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
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s quer enviar-lhe um ficheiro."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Usar autenticação"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Usar autenticação"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr ""
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../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 ''"
+#: ../src/common/config.py:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4743,27 +4984,185 @@ 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Para"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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 ""
+"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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "pedido de remoção de subscrição por %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Autorização foi removida"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Jabber ID Inválido"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "erro ao enviar"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Versão D-Bus desconhecida: %s"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nova Mensagem Instantânea"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova Mensagem Instantânea"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nova Mensagem Privada"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, fuzzy, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova Mensagem Privada"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2225
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova Mensagem como %s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nova Mensagem"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova Mensagem como %s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, fuzzy, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+#, fuzzy
+msgid "Contact Changed Status"
+msgstr "Contacto Saiu"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contacto Entrou"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contacto Entrou"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contacto Saiu"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contacto Saiu"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
@@ -4774,214 +5173,192 @@ msgstr "Impossível entrar na sala"
 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:134
+#: ../src/common/connection_handlers.py:135
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Publicação vCard deu-se com sucesso"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 #, fuzzy
 msgid "Registration failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 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 ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Jabber ID Inválido"
-
-#: ../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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4990,180 +5367,190 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../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:884
+#: ../src/common/connection.py:1001
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Impossível ligar a \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Ligação"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 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:1400
+#: ../src/common/connection.py:1574
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "erro ao enviar"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contacto:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 #, 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 #, fuzzy
 msgid "Not in roster"
 msgstr "Fora da lista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Bindings do python D-Bus estão em falta neste computador"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
@@ -5179,7 +5566,7 @@ msgstr ""
 "Serviço/Recurso indisponível: Gajim não está a correr, ou remote_control é "
 "False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
 
@@ -5370,271 +5757,297 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Indisponível"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Mostrar hora:"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Invisível"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar mensagem"
 msgstr[1] "Enviar mensagem"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr ""
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Imagem é muito grande"
+
+#: ../src/common/helpers.py:1507
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Erro na leitura do ficheiro:"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuração da Sala"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5646,111 +6059,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Mensagem de Estado"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Tamanho: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Ficheiro: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "green"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "erro: impossível abrir %s para leitura"
+msgid "Error: cannot open %s for reading"
+msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
@@ -6453,97 +6880,181 @@ msgstr ""
 msgid "Writing"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Apagar MOTD"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Expulsando %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "País:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Conta"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Descrição"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Erro:"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "Nenhum"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr ""
+
+#: ../src/common/pep.py:349
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "Impossível entrar na sala"
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível entrar na sala"
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6554,292 +7065,292 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "erro ao enviar"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "Gerir Contas"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+msgid "Your server doesn't support vCard"
 msgstr ""
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 #, 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:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6849,118 +7360,114 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Ligação"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remover conta _apenas do Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, verifique se preencheu os campos servidor e sala ou remova este "
 "bookmark"
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Nome de utilizador inválido"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 #, fuzzy
 msgid "Invalid server"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6971,34 +7478,34 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7008,7 +7515,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7016,86 +7523,103 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Continuar"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Nova Mensagem"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7104,247 +7628,248 @@ 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:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "_Sair"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Ontem"
 msgstr[1] "Ontem"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossível entrar na sala"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir MOTD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 #, 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:1057
+#: ../src/dialogs.py:1092
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Um cliente Jabber GTK+"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Cliente Jabber GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7353,107 +7878,158 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "Insecure connection"
+msgstr "Ligação"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Não voltar a perguntar"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Frase de acesso"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nome de conta inválido"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, 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:2388
+#: ../src/dialogs.py:2663
 #, 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:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 #, 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7463,172 +8039,140 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contacto Entrou"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Contacto Saiu"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nova Mensagem"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nova Mensagem Privada"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../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:2651 ../src/notify.py:239 ../src/notify.py:491
-#, fuzzy
-msgid "Contact Changed Status"
-msgstr "Contacto Saiu"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Interrompida"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Remover"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7636,199 +8180,193 @@ msgid ""
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Adicionar _Contacto"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Adicionar _Contacto"
+msgstr[1] "Adicionar _Contacto"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Remove o contacto da lista"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Remove o contacto da lista"
+msgstr[1] "Remove o contacto da lista"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 #, 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:4221
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está banido/a desta sala."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4602
-#, fuzzy
-msgid "Condition"
-msgstr "Ligação"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr ""
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7836,38 +8374,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7877,77 +8415,115 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "para conta %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7955,477 +8531,492 @@ 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:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 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:1341
+#: ../src/disco.py:1378
 #, fuzzy
 msgid "_Execute Command"
 msgstr "comando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Comandos: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Mensagem recebida:"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "_Histórico"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Session Management"
 msgstr "Mensagem"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "As senhas não conferem"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr ""
 
 #: ../src/features_window.py:85
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Notification"
 msgstr "Modificação da Conta"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../src/features_window.py:90
-msgid "Ability to measure idle time, in order to set auto status."
-msgstr ""
-
 #: ../src/features_window.py:91
-msgid "Requires libxss library."
+msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
 #: ../src/features_window.py:92
-msgid "Requires python2.5."
+msgid "Requires libxss library."
 msgstr ""
 
 #: ../src/features_window.py:93
-msgid "LaTeX"
+msgid "Requires python2.5."
 msgstr ""
 
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"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 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
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Mensagem recebida:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "Geral"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Disponível"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 #, fuzzy
 msgid "Feature"
 msgstr "Recursos dos Servidores"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Transferência de ficheiro completa"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Transferência de ficheiro cancelada"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Ligação ao peer não pode ser estabelecida."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Transferência de Ficheiro Parada"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Escolher Ficheiro para Enviar"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 #, fuzzy
 msgid "Description: "
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Este ficheiro está a ser usado por outro processo."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Ficheiro: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Descrição: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s quer enviar-lhe um ficheiro:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 #, 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Guardar Ficheiro como..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Ficheiro: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Descrição: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s quer enviar-lhe um ficheiro:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Enviar _Ficheiro"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Erro na Transferência de Ficheiro"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8433,114 +9024,150 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Ficheiro Inválido"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "mensagem"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Gerir Emoticons"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Mostrar apenas na _lista"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor de Configuração Avançada"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Configuração da Sala"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 msgstr ""
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "Exibe ajuda acerca de um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8549,53 +9176,57 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "conta"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "estado"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensagem"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8604,22 +9235,50 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Muda o estado de uma ou várias contas"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "_Prioridade"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quero _registar uma nova conta"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8630,34 +9289,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8668,196 +9322,241 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Adiciona o contacto à lista"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 #, 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 #, 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 ""
 "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
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 #, 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
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 #, fuzzy
 msgid "XML to send"
 msgstr "Consola XML"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Contacto Saiu"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Alcunha não encontrada: %s"
+
+#: ../src/gajim-remote.py:272
+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:278
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:283
+#, fuzzy
+msgid "Message content"
+msgstr "conteúdo da mensagem"
+
+#: ../src/gajim-remote.py:287
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Juntar-se a uma Nova Sala"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "room"
+msgid "?CLI:room"
 msgstr "De"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:289
 #, fuzzy
-msgid "nick"
+msgid "Room JID"
+msgstr "Sala:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "_Expulsar"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Alcunha não encontrada: %s"
+
+#: ../src/gajim-remote.py:291
 #, fuzzy
-msgid "password"
+msgid "?CLI:password"
 msgstr "Senha:"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "As senhas não conferem"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 #, 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8866,166 +9565,42 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:433
+#, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Uso: %s %s %s \n"
-"\t"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../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-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \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-plugin.py:518 ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Frase de acesso"
-
-#: ../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 ""
-"um de: offline, disponível, livre para conversar, ausente, indisponível, "
-"ocupado, invisível"
-
-#: ../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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:242
-#, 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.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Contacto Saiu"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Alcunha não encontrada: %s"
-
-#: ../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
-#, fuzzy
-msgid "Message content"
-msgstr "conteúdo da mensagem"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Sala:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Alcunha não encontrada: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "As senhas não conferem"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9034,7 +9609,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9043,10 +9618,15 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Frase de acesso"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -9070,205 +9650,239 @@ msgid "You cannot delete your current theme"
 msgstr "Não pode apagar o seu tema actual"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s agora é conhecido como %s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s foi expulso: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Filiação: "
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 #, 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrição: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -9293,67 +9907,61 @@ msgstr "_Reportar Erro (Bug)"
 msgid "Details"
 msgstr "Detalhes"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - Um cliente Jabber GTK+"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Deseja sobre-escrevê-lo?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:873
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9363,196 +9971,182 @@ 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:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Está banido/a desta sala."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:314
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:320
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 #, fuzzy
 msgid "Subscription request"
 msgstr "Pedido de Subscrição"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Subscrever"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../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:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Frase de acesso Necessária"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Introduza a chave GPG para a conta %s"
+
+#: ../src/gui_interface.py:704
+msgid "OpenPGP key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:704
+msgid ""
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:717
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:755
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9562,105 +10156,89 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../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:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1038
 #, fuzzy
-msgid "Error opening file"
-msgstr "Erro na leitura do ficheiro:"
+msgid "File Transfer Failed"
+msgstr "Transferências de Ficheiros"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Transferência de %(filename)s de %(name)s interrompida."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 #, 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:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-#, fuzzy
-msgid "Error."
-msgstr "Erro:"
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Recurso: "
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9668,15 +10246,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr ""
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9687,32 +10270,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../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:1777
-#, fuzzy
-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 "Tem de criar uma conta antes de poder conversar com outros contactos."
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9720,114 +10284,115 @@ msgid ""
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 #, 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3044
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Encriptação OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Chat"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
 #, fuzzy
-msgid "Cannot find history logs database"
-msgstr "a criar base de dados dos logs"
+msgid "Set logs directory"
+msgstr "a criar directório %s"
 
-#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:126
 #, fuzzy
-msgid "Contacts"
-msgstr "Contacto:"
+msgid "Cannot find history logs database"
+msgstr "a criar base de dados dos logs"
 
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Mensagem"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9836,101 +10401,115 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:487
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../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] ""
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Informações do Contacto"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 #, fuzzy
 msgid "Disk Error"
 msgstr "Erro:"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 #, fuzzy
 msgid "Error"
 msgstr "Erro:"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr ""
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Ligação"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Imagem é muito grande"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
@@ -9943,105 +10522,116 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, fuzzy, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s está agora %(status)s"
+#: ../src/notify.py:324
+#, fuzzy
+msgid "Ignore"
+msgstr "_Continuar"
 
-#: ../src/notify.py:242
-#, fuzzy, python-format
-msgid "%(nickname)s Signed In"
-msgstr "Contacto Entrou"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
+#: ../src/plugins/gui.py:151
 #, fuzzy, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "Contacto Saiu"
+msgid "Warning: %s"
+msgstr "Banindo %s"
 
-#: ../src/notify.py:261
-#, fuzzy, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nova Mensagem Instantânea"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Publicação vCard falhou"
 
-#: ../src/notify.py:268
-#, fuzzy, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova Mensagem Privada"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
 msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nova Mensagem como %s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Este ficheiro já existe"
 
-#: ../src/notify.py:279
-#, fuzzy, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nova Mensagem como %s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "_Continuar"
+msgid "Configuration"
+msgstr "Configuração da Sala"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Localização do ficheiro"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 #, fuzzy
 msgid "File is empty"
 msgstr "Localização do ficheiro"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tal sala não existe."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informações do Contacto"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10049,51 +10639,52 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10101,39 +10692,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 #, 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:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar transferência de ficheiro"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10141,16 +10732,16 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -10159,12 +10750,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10173,72 +10764,72 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -10248,12 +10839,12 @@ msgstr ""
 "sempre como offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10261,17 +10852,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10280,68 +10871,73 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 #, 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:4191
+#: ../src/roster_window.py:4552
 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:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Envia um ficheiro a um contacto"
+
+#: ../src/roster_window.py:4834
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
@@ -10351,143 +10947,143 @@ msgstr "Envia um ficheiro a um contacto"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 #, fuzzy
 msgid "Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto Entrou"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto Entrou"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
@@ -10504,31 +11100,21 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "Assunto: %s\n"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10538,150 +11124,155 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Não é possível usar OpenPGP neste computador"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Fora da lista"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Versão %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 #, fuzzy
 msgid "Connected"
 msgstr "Ligação"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto Entrou"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr "Versão %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Sala:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Activo"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Modificação da Conta"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Completa"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço/recurso ainda não respondeu com informações detalhadas"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10689,34 +11280,34 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10724,7 +11315,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:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10732,31 +11323,260 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
 #, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Escolher Ficheiro para Enviar"
+
+#, fuzzy
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Aplicações</b>"
+
+#, fuzzy
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Sons</b>"
+
+#, fuzzy
+#~ msgid "Advanced Actions"
+#~ msgstr "Acções A_vançadas"
+
+#, fuzzy
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Editor de Configuração Avançada"
+
+#, fuzzy
+#~ msgid "All statuses"
+#~ msgstr "Estado: "
+
+#, fuzzy
+#~ msgid "Busy "
+#~ msgstr "Ocupado"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Contacto Saiu"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contacto Entrou"
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Transferência de Ficheiro Parada"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Nova Mensagem"
+
+#, fuzzy
+#~ msgid "Launch a command"
+#~ msgstr "comando"
+
+#, fuzzy
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Livre para conversar"
+
+#, fuzzy
+#~ msgid "Play a sound"
+#~ msgstr "Tocar _Sons"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nova Mensagem Privada"
+
+#, fuzzy
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#, fuzzy
+#~ msgid "_Open chat window with user"
+#~ msgstr "Usar uma única janela de conversa com _abas"
+
+#, fuzzy
+#~ msgid "_Show event in roster"
+#~ msgstr "Mostrar apenas na _lista"
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contacto:"
+
+#, fuzzy
+#~ msgid "for "
+#~ msgstr "Porta:"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupo"
+
+#, fuzzy
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Adiciona o contacto à lista"
+
+#, fuzzy
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Permitir que ele/ela veja o meu estado"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Descrição: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Avançado"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos "
+#~ "na lista"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos "
+#~ "na lista"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Enviar _Mensagem Simples"
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "_Escolher Avatar"
+
+#, fuzzy
+#~ msgid "German"
+#~ msgstr "Geral"
+
+#, fuzzy
+#~ msgid "Greek"
+#~ msgstr "green"
+
+#, fuzzy
+#~ msgid "Croatian"
+#~ msgstr "Morada"
+
+#, fuzzy
+#~ msgid "Italian"
+#~ msgstr "Itálico"
+
+#, fuzzy
+#~ msgid "Polish"
+#~ msgstr "_Publicar"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Geral"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Verifique a sua ligação ou tente novamente mais tarde"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "erro: impossível abrir %s para leitura"
+
+#, fuzzy
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Impossível entrar na sala"
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Um cliente Jabber GTK+"
+
+#, fuzzy
+#~ msgid "Condition"
+#~ msgstr "Ligação"
+
+#, fuzzy
+#~ 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"
+
+#, 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)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Uso: %s %s %s \n"
+#~ "\t"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Argumento \"%s\" não está especificado. \n"
+#~ "Escreva \"%s help %s\" para mais informações"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Contacto:"
+
+#, fuzzy
+#~ msgid "Subject: %s"
+#~ msgstr "Assunto: %s\n"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Sala:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Activo"
+
+#, fuzzy
 #~ msgid "_Show event in systray"
 #~ msgstr "Mostrar apenas na _lista"
 
@@ -10772,31 +11592,12 @@ msgstr " recurso com prioridade "
 #~ 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"
 
@@ -10851,9 +11652,6 @@ msgstr " recurso com prioridade "
 #~ "Contacto\n"
 #~ "Banner"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Gerir Contas"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Apagar MOTD"
@@ -10930,9 +11728,6 @@ msgstr " recurso com prioridade "
 #~ msgstr ""
 #~ "Para continuar a enviar e receber mensagens, precisará de se reconectar."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Esta mensagem é encriptada]"
-
 #~ msgid "%i days ago"
 #~ msgstr "Há %i dias atrás"
 
@@ -10946,13 +11741,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Commands: %s"
 #~ msgstr "Comandos: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uso: /%s, limpa a janela de texto."
-
-#, fuzzy
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uso: /%s, limpa a janela de texto."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10961,14 +11749,6 @@ msgstr " recurso com prioridade "
 #~ "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
 #~ "pessoa. (Por exemplo, /%s explode.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
-
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uso: /%s, limpa a janela de texto."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Não há informações de ajuda para /%s"
 
@@ -10983,10 +11763,6 @@ msgstr " recurso com prioridade "
 #~ msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Alcunha não encontrada: %s"
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10997,14 +11773,6 @@ msgstr " recurso com prioridade "
 #~ "neste momento na sala, este será também expulso. Não suporta espaços numa "
 #~ "alcunha."
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
-#~ "especificado."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
@@ -11048,10 +11816,6 @@ msgstr " recurso com prioridade "
 #~ msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
 
 #, fuzzy
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
@@ -11157,9 +11921,6 @@ msgstr " recurso com prioridade "
 #~ "Se tem duas ou mais contas e esta opção for marcada, o Gajim listará "
 #~ "todos os contactos como se tivesse apenas uma conta"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Clique para ver conversas anteriores com este contacto"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "Vista _Compacta    Alt+C"
 
@@ -11172,9 +11933,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Query Builder..."
 #~ msgstr "Query Builder..."
 
-#~ msgid "Accept"
-#~ msgstr "Aceitar"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Convite Recebido"
 
@@ -11247,9 +12005,6 @@ msgstr " recurso com prioridade "
 #~ msgid "The auto away status message"
 #~ msgstr "A mensagem de estado auto-ausente"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "A mensagem de estado auto-indisponível"
-
 #, fuzzy
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
@@ -11286,9 +12041,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Company:"
 #~ msgstr "Empresa:"
 
-#~ msgid "Country:"
-#~ msgstr "País:"
-
 #~ msgid "Given:"
 #~ msgstr "Nome Dado:"
 
@@ -11506,9 +12258,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizar automaticamente contacto"
 
-#~ msgid "Send File"
-#~ msgstr "Enviar Ficheiro"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "_Juntar-se a uma Nova Sala..."
 
@@ -11557,12 +12306,6 @@ msgstr " recurso com prioridade "
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Todos os contactos deste grupo estão offline ou têm erros"
 
-#~ msgid "Size: "
-#~ msgstr "Tamanho: "
-
-#~ msgid "Session bus is not available"
-#~ msgstr "Sessão bus não está disponível"
-
 #~ msgid "Sound"
 #~ msgstr "Som"
 
@@ -11825,9 +12568,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Po_sition:"
 #~ msgstr "Cargo:"
 
-#~ msgid "Show roster window on Gajim startup"
-#~ msgstr "Mostrar janela principal ao arranque"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "_Busca de Serviços"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 468b9421a..a7b4eb0de 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,15 +6,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -27,308 +23,299 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Eventos _pessoais"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Iniciar conversa..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Entrar em uma conferência..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Adicionar contato..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Descubra serviços"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Executar comando..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Alterar conta"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir caixa de entrada do GMail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Eventos _pessoais"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Iniciar conversa..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "_Alterar conta"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Assistente de configuração de conta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Conectando ao servidor</b>\n"
-"\n"
-"Por favor aguarde..."
+"Você precisa ter uma conta para conectar na\n"
+"rede Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Eu quero _registrar uma nova conta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor, preencha os dados para sua conta existente</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Por favor, selecione um servidor</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Senha:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Adicionar este certificado na lista de certificados confiáveis.\n"
-"SHA1 fingerprint do certificado:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Salvar sen_ha"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Autenticação anôn_ima"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Conectar quando eu clicar em Concluir"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Assistente de configuração de conta"
+msgid "Anon_ymous authentication"
+msgstr "Autenticação anôn_ima"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Por favor, selecione um servidor</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gerenciar..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Usa nome de máquina/porta customizados"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "_Nome do computador:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Salvar sen_ha"
+msgid "_Port:"
+msgstr "_Porta:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Configurar perfil quando eu conectar"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avançado"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Você precisa ter uma conta para conectar na\n"
-"rede Jabber."
+"Adicionar este certificado na lista de certificados confiáveis.\n"
+"SHA1 fingerprint do certificado:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Concluir"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Nome do computador:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Conectando ao servidor</b>\n"
+"\n"
+"Por favor aguarde..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Conectar quando eu clicar em Concluir"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Senha:"
+msgid "Set my profile when I connect"
+msgstr "Configurar perfil quando eu conectar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "_Finish"
+msgstr "_Concluir"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Diversos</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Nenhum"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Informações pessoais</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Adicionar"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Deletar"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Aj_ustar para status"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Conta"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Ha_bilitar"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Contas"
+msgid "Anonymous authentication"
+msgstr "Autenticação anônima"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Operações de administração"
+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 ""
+"Um recurso é enviado ao servidor jabber com o objetivo de 'separar' o mesmo "
+"JID em duas ou mais partes dependendo do número de clientes conectados no "
+"mesmo servidor com a mesma conta. Então você pode estar conectado na mesma "
+"conta com o recurso 'Casa' e 'Trabalho' ao mesmo tempo. O recurso que "
+"possuir a maior prioridade receberá os eventos. (veja abaixo)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Autenticação anônima"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Reconectar automaticamente quando a conexão cair"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Sincronizar contatos"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Navegar"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Clique para requisitar autorização para todos os contatos de outra conta"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_onectar na inicialização do Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "A_lterar senha"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Clique para mudar a senha da conta"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Marcando esta opção, o Gajim irá perguntar você antes de enviar sua senha "
-"através de uma conexão não-segura."
+msgid "Administration operations"
+msgstr "Operações de administração"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Escolha o arquivo para enviar..."
+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 ""
+"A prioridade é usada no Jabber para determinar quem recebe os eventos do "
+"servidor jabber quando dois ou mais clientes estão conectados usando a mesma "
+"conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "_Escolha a chave..."
+msgid "A_djust to status"
+msgstr "Aj_ustar para status"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Clique para mudar a senha da conta"
+msgid "Priority will change automatically according to your status."
+msgstr "A prioridade será alterada automaticamente de acordo com o seu status."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Clique para requisitar autorização para todos os contatos de outra conta"
+msgid "Priori_ty:"
+msgstr "_Prioridade:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Certificado próprio"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Co_nectar na inicialização do Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Conexão"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Email:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Primeiro nome:"
+msgid "Resour_ce:"
+msgstr "Recur_so:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Navegar"
 
 #: ../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 ""
-"Se marcado, o Gajim irá transmitir também alguns outros IP's exceto o seu, "
-"então a transferência de arquivo tem grandes possibilidades de executar "
-"corretamente."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certificado rejeitado"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se marcado, o Gajim obterá a senha de um agente GPG como o Seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Certificado próprio"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Conta"
 
 #: ../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 ""
-"Se marcado, o Gajim irá enviar pacotes keep-alive para prevenir timeout na "
-"conexão, evitando-a cair"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onectar na inicialização do Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -339,6 +326,18 @@ msgstr ""
 "jabber usando esta conta"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Reconectar automaticamente quando a conexão cair"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Salvar his_tórico para todos os contatos desta conta"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "_Sincronizar status da conta com status global"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -347,176 +346,205 @@ msgstr ""
 "Se marcada, o status deste cliente será alterado de acordo com qualquer "
 "mudança no status global (definido pela caixa no fundo da janela da lista)"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se a porta padrão usada para recebimento de mensagens não for adequada você "
-"pode selecionar outra aqui.\n"
-"Considere a possível modificação das regras do seu firewall."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Usar proxies de transferência de arquivos"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Último nome:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Se marcado, o Gajim irá transmitir também alguns outros IP's exceto o seu, "
+"então a transferência de arquivo tem grandes possibilidades de executar "
+"corretamente."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Mes_clar contas"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Geral"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Nenhuma chave selecionada"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_usar variável de ambiente HTTP__PROXY"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Informações pessoais"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "Gere_nciar..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "_Prioridade:"
+msgid "_Warn before using an insecure connection"
+msgstr "A_visar antes de usar uma conexão não-segura"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"A prioridade é usada no Jabber para determinar quem recebe os eventos do "
-"servidor jabber quando dois ou mais clientes estão conectados usando a mesma "
-"conta; O cliente com a maior prioridade receberá os eventos"
+"Marcando esta opção, o Gajim irá perguntar você antes de enviar sua senha "
+"através de uma conexão não-segura."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "A prioridade será alterada automaticamente de acordo com o seu status."
+msgid "Send _keep-alive packets"
+msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_nomear"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Se marcado, o Gajim irá enviar pacotes keep-alive para prevenir timeout na "
+"conexão, evitando-a cair"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Recur_so:"
+msgid "Use cust_om hostname/port"
+msgstr "Usa nome de máquina/porta personalizad_os"
 
 #: ../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 ""
-"Um recurso é enviado ao servidor jabber com o objetivo de 'separar' o mesmo "
-"JID em duas ou mais partes dependendo do número de clientes conectados no "
-"mesmo servidor com a mesma conta. Então você pode estar conectado na mesma "
-"conta com o recurso 'Casa' e 'Trabalho' ao mesmo tempo. O recurso que "
-"possuir a maior prioridade receberá os eventos. (veja abaixo)"
+msgid "_Hostname: "
+msgstr "_Nome do computador:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Salvar his_tórico para todos os contatos desta conta"
+msgid "_Port: "
+msgstr "_Porta:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diversos</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Enviar pacotes para manter a conexão (keep-alive)"
+msgid "Connection"
+msgstr "Conexão"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "_Sincronizar status da conta com status global"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Nenhuma chave selecionada"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Sincroni_zar status da conta com status global"
+msgid "Choose _Key..."
+msgstr "_Escolha a chave..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Sincronizar contatos"
+msgid "Use G_PG Agent"
+msgstr "Usar o Agente G_PG"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se marcado, o Gajim obterá a senha de um agente GPG como o Seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Usar o Agente G_PG"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Usa nome de máquina/porta personalizad_os"
+msgid "_Edit Personal Information..."
+msgstr "_Editar detalhes pessoais..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Usar porta pers_onalizada:"
+msgid "Information about you, as stored in the server"
+msgstr "Informações sobre você são gravadas no servidor"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Usar proxies de transferência de arquivos"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Informações pessoais</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Informações pessoais"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Editar detalhes pessoais..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Co_nectar na inicialização do Gajim"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Ha_bilitar"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Sincroni_zar status da conta com status global"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Nome do computador:"
+msgid "Use cust_om port:"
+msgstr "Usar porta pers_onalizada:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "Gere_nciar..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Se a porta padrão usada para recebimento de mensagens não for adequada você "
+"pode selecionar outra aqui.\n"
+"Considere a possível modificação das regras do seu firewall."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Primeiro nome:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Porta:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Último nome:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "A_visar antes de usar uma conexão não-segura"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Email:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_usar variável de ambiente HTTP__PROXY"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Mes_clar contas"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "C_onta:"
+msgid "Add New Contact"
+msgstr "Adicionar novo contato"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "D_eixar este contato ver meu status"
+msgid "A_ccount:"
+msgstr "C_onta:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Adicionar novo contato"
+msgid "_Protocol:"
+msgstr "_Protocolo:"
 
-#: ../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 "Por favor, eu gostaria de adicioná-lo à minha lista."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ID do usuário:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Apelido:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "D_eixar este contato ver meu status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Inscrição"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -528,7 +556,11 @@ msgstr ""
 "contatos deste protocolo. Clique no \n"
 "botão Registrar para aceitar."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registrar"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -536,594 +568,374 @@ msgstr ""
 "Você deve estar conectado para que o transporte \n"
 "possa adicionar um contato desse protocolo."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Apelido:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocolo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registrar"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Inscrição"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ID do usuário:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Por favor, eu gostaria de adicioná-lo à minha lista."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Ocorreu um erro:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Comandos ad-hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Escolha um comando para executar</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Por favor aguarde enquanto a lista de comandos é recuperada..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Comandos ad-hoc - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Escolha um comando para executar</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Verificar novamente"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Descrição do erro..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Por favor aguarde enquanto a lista de comandos é enviada..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Concluir"
+msgid "Please wait..."
+msgstr "Por favor aguarde..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Por favor aguarde enquanto a lista de comandos é recuperada..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Esta entidade jabber não expõe quaisquer comandos."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Por favor aguarde enquanto a lista de comandos é enviada..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Ocorreu um erro:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Por favor aguarde..."
+msgid "Error description..."
+msgstr "Descrição do erro..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Esta entidade jabber não expõe quaisquer comandos."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Concluir"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Editor de configurações avançado"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Descrição</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTA:</b> Você deve reiniciar o Gajim para que algumas configurações "
 "tenham efeito"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor de configurações avançado"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtro:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Voltar para as cores _padrões"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Excluir MOTD"
+msgid "Show _XML Console"
+msgstr "Exibir console _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Editar listas de _privacidade..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrador"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
+msgid "_Send Server Message..."
+msgstr "_Enviar mensagem de servidor..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 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:6
-msgid "Set MOTD..."
-msgstr "Definir MOTD..."
-
 #: ../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:8
-msgid "Show _XML Console"
-msgstr "Exibir console _XML"
+msgid "Set MOTD..."
+msgstr "Definir MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Atualizar MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Atualizar MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrador"
+msgid "Delete MOTD"
+msgstr "Excluir MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Enviar mensagem de servidor..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " uma janela/aba aberta com o contato "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Ações</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Condições</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Ações avançadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Controle avançado de notificações"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Afastado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Ocupado "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "O contato alterou seu status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contato desconectou"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Não possui "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Transferência de arquivos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Solicitação de transferência de arquivos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Transferência do arquivo parada"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Mensagem destacada de conferência"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Mensagem de conferência recebida"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Possui "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisível"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Executar um comando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Não disponível"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Um ou mais status especiais..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Online / Livre para conversa"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Tocar um som"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Enviar mensagem privada"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Quando "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Ativar o recurso \"UrgencyHint\" do gerenciador de janelas faz a janela de "
-"conversa piscar na barra de tarefas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Desativar a abertura automática da janela de conversa"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Desativar janelas popup existentes"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Desativar sons existentes para este evento"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Desativar exibição de eventos na lista"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Notificar-me com uma janela popup"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Abrir janela de conversa com o contato"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "Mo_strar somente na lista"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "e eu "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Contatos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "para "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "quando eu estiver em"
+msgid "Deletes Message of the Day"
+msgstr "Excluir mensagem do dia"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Nenhum"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferências"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Ingresso automático"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Nenhum"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Preferências"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Ingresso automático"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entrada:"
+msgid "New entry received"
+msgstr "Novo evento recebido"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Você recebeu uma nova entrada:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Nome do feed:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entrada:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Modificado:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Novo evento recebido"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Você recebeu uma nova entrada:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Mensagem:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Definir atividade"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Define uma atividade"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Mensagem:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Mensagem:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humor:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Mensagem:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Alterar senha"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Digite novamente para confirmar:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Digite sua nova senha:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Digite novamente para confirmar:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Digite sua nova mensagem de status:</b>"
+msgid "Save as Preset..."
+msgstr "Salvar como modelos..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Atividade:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Humor:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Atividade:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Modelos de mensagens"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Salvar como modelos..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Digite sua nova mensagem de status:</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "_Entrar em uma conferência"
+msgid "_Copy Link Location"
+msgstr "_Copiar URL"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Adicionar à lista..."
+msgid "_Open Link in Browser"
+msgstr "_Visualizar no navegador"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar e-mail/JID"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar URL"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Abrir cliente de e-mail"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Visualizar no navegador"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "_Entrar em uma conferência"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Adicionar à lista..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Exibe uma lista de emoticons (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Adicionar este contato para a lista (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Convidar contatos para a conversa (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Convidar contatos para a conversa (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Pesquisar o histórico de conversas (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Exibir um menu com funções avançadas (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Enviar mensagem"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
+msgid "*"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Con_vidar"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
-#: ../data/gui/chat_to_muc_window.ui.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "Invite Friends!"
 msgstr "Convidar amigos!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Servidor MUC"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Por favor, selecione um servidor MUC."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1131,119 +943,136 @@ msgstr ""
 "Você está prestes a iniciar uma Conversa Multi-Usuário (MUC).\n"
 "Selecione os contatos que você quer convidar"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "P_eça para ver o status dele/dela"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Por favor, selecione um servidor MUC."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Adicionar _notificação especial..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Servidor MUC"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Atribuir chave Open_PGP..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Con_vidar"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "E_xecutar comando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Iniciar _conversa"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Editar _grupos..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Enviar _mensagem simples..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Enviar _arquivo..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Convidar _contatos"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Remo_ver"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Ativar criptografia Open_PGP"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Alternar para criptografia End to End"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Enviar status perso_nalizado"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "E_xecutar comando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Enviar _mensagem simples..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Gerenciar contato"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Enviar _arquivo..."
+msgid "_Rename..."
+msgstr "_Renomear..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Definir _avatar personalizado..."
+msgid "Edit _Groups..."
+msgstr "Editar _grupos..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Iniciar _conversa"
+msgid "Assign Open_PGP Key..."
+msgstr "Atribuir chave Open_PGP..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Alternar para criptografia End to End"
+msgid "Set Custom _Avatar..."
+msgstr "Definir _avatar personalizado..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Ativar criptografia Open_PGP"
+msgid "Add Special _Notification..."
+msgstr "Adicionar _notificação especial..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Inscrição"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Permitir que ele/ela veja meu status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "D_eixar este contato ver meu status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "P_eça para ver o status dele/dela"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Histórico"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorar"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Bloquear"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Gerenciar contato"
+msgid "_Unignore"
+msgstr "Nã_o ignorar"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Renomear..."
+msgid "_Ignore"
+msgstr "_Ignorar"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Inscrição"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Remo_ver"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "Nã_o ignorar"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Histórico"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Preencha o formulário."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuração da sala"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Preencha o formulário."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar grupos"
@@ -1256,58 +1085,49 @@ msgstr "(Informações <b>ESession</b>)"
 msgid "_Verify"
 msgstr "_Verificar"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Recursos"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Listas dos possíveis recursos do Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Recursos"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Uma lista de transferências de arquivo ativas, completadas e paradas"
+msgid "File Transfers"
+msgstr "Transferência de arquivos"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Cancelar transferência de arquivo"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Exibe uma lista de transferências de arquivos entre você e os outros"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Cancela a transferência de arquivo selecionada"
+msgid "file transfers list"
+msgstr "lista de transferência de arquivos"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Cancela a transferência de arquivo selecionada e remove o arquivo incompleto"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Uma lista de transferências de arquivo ativas, completadas e paradas"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Limpar"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Transferência de arquivos"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Esconder a janela"
-
-#: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Remover a transferência de arquivo da lista."
-
-#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Remover da lista as transferências de arquivos completas, canceladas ou "
 "interrompidas"
 
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Exibe uma lista de transferências de arquivos entre você e os outros"
+#: ../data/gui/filetransfers.ui.h:8
+msgid "Remove file transfer from the list."
+msgstr "Remover a transferência de arquivo da lista."
 
-#: ../data/gui/filetransfers.ui.h:11
+#: ../data/gui/filetransfers.ui.h:9
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1315,82 +1135,109 @@ msgstr ""
 "Esta ação remove uma única transferência de arquivo da lista. Se a "
 "transferência está ativa, isto vai pará-la e removê-la"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Limpar"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pausa"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr ""
+"Cancela a transferência de arquivo selecionada e remove o arquivo incompleto"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continuar"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Cancelar transferência de arquivo"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notificar-me quando a transmissão do arquivo terminar"
+msgid "Cancels the selected file transfer"
+msgstr "Cancela a transferência de arquivo selecionada"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Abrir pasta do arquivo"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Esconder a janela"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pausa"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Continuar"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista de transferência de arquivos"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Abrir pasta do arquivo"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Aba de cores do bate-papo</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Conta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Negrito"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contato"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Escrevendo"
+msgid "Gajim Themes Customization"
+msgstr "Customização de temas do Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contato"
+msgid "Text _color:"
+msgstr "_Cor do texto"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Estilo da fonte:"
+msgid "_Background:"
+msgstr "Cor _de fundo"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Customização de temas do Gajim"
+msgid "Text _font:"
+msgstr "_Fonte do texto"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Enviado"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+msgid "Font style:"
+msgstr "Estilo da fonte:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inativo"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Negrito"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Itálico"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pausado"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Escrevendo"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inativo"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Aba de cores do bate-papo</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Enviado"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1398,7 +1245,7 @@ msgstr ""
 "MUC\n"
 "mensagens"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1406,105 +1253,98 @@ msgstr ""
 "MUC Direto\n"
 "mensagens"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pausado"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Cor do texto"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Fonte do texto"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "Cor _de fundo"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Alterar _apelido..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Gerenciar sala"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Alterar as_sunto..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Configurar _sala..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "Ma_rcadores"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Excluir sala"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Gerenciar sala"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimizar ao fechar"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Voz"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "Ma_rcadores"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derador"
+msgid "_Send Private Message"
+msgstr "_Enviar mensagem privada"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Ações de ocupante"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Enviar _arquivo"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Ações de ocupante"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Adicionar à lista"
+msgid "_Voice"
+msgstr "_Voz"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derador"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administração"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Banir"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "Proprietári_o"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Chutar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Membro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "Proprietári_o"
+msgid "_Ban"
+msgstr "_Banir"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Enviar mensagem privada"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voz"
+msgid "_Add to Roster"
+msgstr "_Adicionar à lista"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Exibe uma lista de formatações"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Alterar o seu apelido (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1516,40 +1356,19 @@ msgid "From:"
 msgstr "De:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Assunto:"
 
 #: ../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."
-msgstr ""
-"<b>CUIDADO:</b>\n"
-"Se você planeja fazer apagamentos maciços, certifique-se por favor que o "
-"Gajim não está executando. Evite apagamentos com contatos que você esteja "
-"conversando no momento."
+msgid "Gajim History Logs Manager"
+msgstr "Gerenciador de histórico de logs do Gajim"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Deletar"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Exportar"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gerenciador de histórico de logs do Gajim"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1563,173 +1382,200 @@ msgstr ""
 "Use este programa para deletar ou exportar logs. Você pode selecionar logs "
 "ao lado e/ou pesquisar na base de dados abaixo."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>CUIDADO:</b>\n"
+"Se você planeja fazer apagamentos maciços, certifique-se por favor que o "
+"Gajim não está executando. Evite apagamentos com contatos que você esteja "
+"conversando no momento."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Buscar no banco de dados"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Totos os status"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Histórico de conversação"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Exportar"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Nome do contato"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Salas"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Totos os status"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Histórico de conversação"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Pesquisar:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Histórico de conversação"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Log mudanças de status dos contatos"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Quente"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "JID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Quente"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Entrar nesta sala automaticamente quando eu conectar"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Sala:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Apelido:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Recentemente:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recentemente:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Entrar nesta sala automaticamente quando eu conectar"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Sala:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Adicionar esta sala aos marcadores"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Servidor:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Adicionar esta sala aos marcadores"
+msgid "Bro_wse Rooms"
+msgstr "_Navegar"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Ingressar"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Ingresso automático"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Se marcado, o Gajim irá ingressar na conferência no ínicio da aplicação"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gerenciar marcadores"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimizar ao entrar automaticamente"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Título:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Imprimir status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Ingresso automático"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Se marcado, o Gajim irá ingressar na conferência no ínicio da aplicação"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Título:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimizar ao entrar automaticamente"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1740,100 +1586,103 @@ msgid "_Configure"
 msgstr "_Configurar"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Propriedades</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"Conexão HTTP\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Configurações</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"Conexão HTTP\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gerenciar perfis de proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Tipo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Senha:"
+msgid "_Name:"
+msgstr "_Nome:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Máqu_ina Proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Propriedades</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "_Porta do máquina:"
+msgid "Use HTTP prox_y"
+msgstr "Usar prox_y HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "URL _BOSH:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Usar prox_y HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Usar aut_enticação de proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "Nome de _usuário:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "URL _BOSH:"
+msgid "Pass_word:"
+msgstr "_Senha:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Nome:"
+msgid "Proxy _Host:"
+msgstr "Máqu_ina Proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Tipo:"
+msgid "Proxy _Port:"
+msgstr "_Porta do máquina:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "Nome de _usuário:"
+msgid "<b>Settings</b>"
+msgstr "<b>Configurações</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Gerenciar contas"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torizar"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "Dis_ponível"
+msgid "Version:"
+msgstr "Versão do GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Configurar"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Descrição: "
+msgid "Authors:"
+msgstr "Au_torizar"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1841,39 +1690,32 @@ msgid "Homepage:"
 msgstr "<b>Página pessoal:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Parado"
+msgid "Description:"
+msgstr "Descrição: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Configurar"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Parado"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1887,217 +1729,290 @@ msgid "Event desc"
 msgstr "Eventos"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor de configurações avançadas</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Sempre usar as aplicações padrões do OS/X"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplicações</b>"
+msgid "Custom"
+msgstr "Personalizar"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Ações</b>"
+msgid "All chat states"
+msgstr "Totos os status"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Status automático</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Escrevendo"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Aparência da conversa</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Desabilitado"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Cores da linha da conversa</b>"
+#, fuzzy
+msgid "Never"
+msgstr "_Nunca"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notificações do estado da conversa</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nunca\n"
+"Somente quando houver eventos pendentes\n"
+"Sempre"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Condições</b>"
+msgid "Always"
+msgstr "Afastado"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Alerta visual"
 
-#. 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>Customizar</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notifique-me sobre isto"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Fonte</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Mostre somente na _lista"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opções do GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Mensagens de status disponíveis</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privacidade</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Aparência da lista</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Último status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Mensagens de status</b>"
+msgid "Preferences"
+msgstr "Preferências"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Tema</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Exibir a_vatar dos contatos na lista"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Nome do meio:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na "
+"conferência"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notificações visuais</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Exibir _mensagem de status da lista de contato"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Avançado"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Exibir hum_or dos contatos na lista"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Avançado..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Totos os status"
+msgid "Sort contacts by status"
+msgstr "Ordena contatos pelo status"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Permitir o envio de informações do _SO"
+msgid "in _roster"
+msgstr "na _lista"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Permitir o envio de informações do _SO"
+msgid "in _group chats"
+msgstr "em uma c_onferência"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Permite janela/notificação quando eu estou _afastado/ND/ocupado/invisível"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Aparência da lista</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Permitir som quando eu estiver _ocupado"
+msgid "_Window behavior:"
+msgstr "Comportamento da jan_ela:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Afastado"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Solicite uma mensagem de status quanto eu:"
+msgid "_Emoticons:"
+msgstr "_Emoticons:"
 
-#: ../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:32
+msgid "Ma_ke message windows compact"
+msgstr "T_ornar a janela de mensagem compacta"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Esconder todos os botões nas janelas de conversa"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorar conteúdo formatado nas mensagens recebidas"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Mensagem da conversa:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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: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"
+msgid "_Highlight misspelled words"
+msgstr "_Destacar palavras mal escritas"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Escrevendo"
+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 ""
+"Se marcado, o Gajim irá destacar erros de ortografia em campos de entrada "
+"nas janelas de conversa. Se nenhuma linguagem foi explicitamente definida "
+"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:38
-msgid "Configure color and font of the interface"
-msgstr "Configurar cores e fontes da interface"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Exibi_r lista"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "Mensagem do contato:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "Apelido do contato:"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Personalizar"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Aparência da conversa</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Quando novo evento é recebido:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Notifique-me sobre contatos ao _conectar"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Notifique-me sobre contatos ao _desconectar"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Desabilitado"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Permite janela/notificação quando eu estou _afastado/ND/ocupado/invisível"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Exibir a_tividade dos contatos na lista"
+msgid "Notify on new _GMail email"
+msgstr "Notificar cada nova mensagem do _GMail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Exibir detalhes _extras dos emails"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Se marcado, o Gajim irá exibir uma notificação quando um novo email via "
+"GMail for recebido"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Exibir hum_or dos contatos na lista"
+msgid "Display _extra email details"
+msgstr "Exibir detalhes _extras dos emails"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Exibir sin_tonia dos contatos na lista"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
+"emails"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Exibir a_vatar dos contatos na lista"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opções do GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Exibir hum_or dos contatos na lista"
+#, 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:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Exibir _mensagem de status da lista de contato"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notificações visuais</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Tocar _sons"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Gere_nciar..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Permitir som quando eu estiver _ocupado"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Sons</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Notificações"
+
+#: ../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 "
@@ -2107,7 +2022,11 @@ 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:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Exibir notificações de status de conversa:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2117,687 +2036,627 @@ 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: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 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:58
-msgid "Hide all buttons in chat windows"
-msgstr "Esconder todos os botões nas janelas de conversa"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
-"operacional está usando"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
-"emails"
-
-#: ../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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Se marcado, o Gajim irá alterar o status para Não disponível quando o "
-"computador não estiver mais em uso"
+msgid "_Send chat state notifications:"
+msgstr "_Enviar notificações de status de conversa:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na "
-"conferência"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificações do estado da conversa</b>"
 
 #: ../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 ""
-"Se marcado, Gajim indicará mensagens de status dos contatos sob o nome do "
-"contato na janela da lista e na conferência"
+msgid "Personal Events"
+msgstr "Eventos pessoais"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "_Afastado depois:"
 
 #: ../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"
+"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: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"
+msgid "_Not available after:"
+msgstr "_Não disponível depois:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Se marcado, o Gajim irá exibir a sintonia dos contatos na janela da lista"
+"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: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 ""
-"Se marcado, o Gajim irá destacar erros de ortografia em campos de entrada "
-"nas janelas de conversa. Se nenhuma linguagem foi explicitamente definida "
-"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."
+msgid "minutes"
+msgstr "minutos"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Se marcado, o Gajim irá ignorar eventos que venham de contatos não "
-"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: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 ""
-"Se marcado, o Gajim irá manter os logs para mensagens criptografadas. Por "
-"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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Se marcado, o Gajim irá exibir uma notificação quando um novo email via "
-"GMail for recebido"
+"A mensagem de status de ausência automática. Se vazia, o Gajim não irá "
+"alterar a mensagem de status atual\n"
+"$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: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, "
-"etc...)"
-msgstr ""
-"Se marcado, o Gajim usará ícones protocolo-específicos do status. (por "
-"exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
-"conectado, ausente, ocupado, etc....)"
-
-#: ../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 ""
-"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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Se habilitado, Gajim substituirá o ascii para smilies, como ':)' com a "
-"animação equivalente ou estático emoticons gráfico"
+"A mensagem de status de não disponibilidade automática. Se vazia, o Gajim "
+"não irá alterar a mensagem de status atual\n"
+"$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:76
-msgid "Log _encrypted chat session"
-msgstr "Registrar sessão de conversa _criptografada"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Status automático</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "T_ornar a janela de mensagem compacta"
+msgid "Ask status message when I:"
+msgstr "Solicite uma mensagem de status quanto eu:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Gere_nciar..."
+msgid "Sign _in"
+msgstr "_Conectar"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Nunca"
+msgid "Sign _out"
+msgstr "_Desconectar"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Notificações"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Notifique-me sobre contatos ao _conectar"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Mensagens de status</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Notifique-me sobre contatos ao _desconectar"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Mensagens de status disponíveis</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notifique-me sobre isto"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notificar cada nova mensagem do _GMail"
+msgid "Use system _default"
+msgstr "Usar o _padrão do sistema"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Nunca\n"
-"Somente quando houver eventos pendentes\n"
-"Sempre"
+msgid "Chat message:"
+msgstr "Mensagem da conversa:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Eventos pessoais"
+msgid "<b>Font</b>"
+msgstr "<b>Fonte</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Tocar _sons"
+msgid "Use _transports icons"
+msgstr "Usar ícones de _transportes"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Alerta visual"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se marcado, o Gajim usará ícones protocolo-específicos do status. (por "
+"exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
+"conectado, ausente, ocupado, etc....)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Preferências"
+msgid "Status _iconset:"
+msgstr "_Conjunto de ícones de status:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Configurar cores e fontes da interface"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Tema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Servidor:"
+msgid "<b>Themes</b>"
+msgstr "<b>Tema</b>"
 
 #: ../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)"
+msgid "Contact's nickname:"
+msgstr "Apelido do contato:"
 
 #: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
-msgid "Show only in roster"
-msgstr "Mostre somente na _lista"
+msgid "Your nickname:"
+msgstr "Seu apelido:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "_Conectar"
+msgid "_Status message:"
+msgstr "_Mensagem de status:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Desconectar"
+msgid "_URL highlight:"
+msgstr "Destaque de _URL:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "Voltar para as cores _padrões"
 
 #: ../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 ""
-"Algumas mensagens podem incluir conteúdo rico (formatação, cores etc). Se "
-"marcado, o Gajim apenas exibirá as mensagens em texto puro."
+msgid "Contact's message:"
+msgstr "Mensagem do contato:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Ordena contatos pelo status"
+msgid "Your message:"
+msgstr "Sua mensagem:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Mensagem destacada de conferência"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "_Conjunto de ícones de status:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Cores da linha da conversa</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Estilo"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Tema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Ações</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"A mensagem de status de ausência automática. Se vazia, o Gajim não irá "
-"alterar a mensagem de status atual\n"
-"$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:107
-msgid ""
-"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"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"A mensagem de status de não disponibilidade automática. Se vazia, o Gajim "
-"não irá alterar a mensagem de status atual\n"
-"$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:110
-msgid "Use _transports icons"
-msgstr "Usar ícones de _transportes"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Sempre usar as aplicações padrões do OS/X"
+msgid "<b>Video</b>"
+msgstr "<b>Nome do meio:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Usar o _padrão do sistema"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Condições</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "Quando novo evento é recebido:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Áudio / Vídeo"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "Sua mensagem:"
+msgid "_File manager:"
+msgstr "_Gerenciamento de arquivos:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "Seu apelido:"
+msgid "_Mail client:"
+msgstr "_Cliente de email:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Afastado depois:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegar:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Exibir notificações de status de conversa:"
+msgid "<b>Custom</b>"
+msgstr "<b>Customizar</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emoticons:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplicações</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Gerenciamento de arquivos:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Destacar palavras mal escritas"
+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 ""
+"Se marcado, o Gajim irá ignorar eventos que venham de contatos não "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignore eventos de contatos que não estejam na minha lista"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Permitir o envio de informações do _SO"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorar conteúdo formatado nas mensagens recebidas"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
+"operacional está usando"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Log mudanças de status dos contatos"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Permitir o envio de informações do _SO"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Cliente de email:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
+"operacional está usando"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Não disponível depois:"
+msgid "Log _encrypted chat session"
+msgstr "Registrar sessão de conversa _criptografada"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Abrir..."
+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 ""
+"Se marcado, o Gajim irá manter os logs para mensagens criptografadas. Por "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "Voltar para as cores _padrões"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Permitir o envio de informações do _SO"
 
 #: ../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:134
-msgid "_Status message:"
-msgstr "_Mensagem de status:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "Destaque de _URL:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Privacidade</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "Comportamento da jan_ela:"
+msgid "_Log status changes of contacts"
+msgstr "_Log mudanças de status dos contatos"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "em uma c_onferência"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "na _lista"
+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:139
-msgid "minutes"
-msgstr "minutos"
+msgid "_Open..."
+msgstr "_Abrir..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor de configurações avançadas</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avançado"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listas de privacidade:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Adicionar / Editar regra</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Lista de privacidade"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista de regras</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista de privacidade</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Ativo para esta sessão"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Ativar ao iniciar o programa"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista de regras</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Todos"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Adicionar / Editar regra</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Todos (incluindo inscrições)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Negar"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Jabber ID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "todos no grupo"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ordem:"
+msgid "all by subscription"
+msgstr "todos por inscrição"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Lista de privacidade"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Todos"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "todos por inscrição"
+msgid "to send me messages"
+msgstr "para me enviar mensagens"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "todos no grupo"
+msgid "to send me queries"
+msgstr "para enviar minhas requisições"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Ambos"
+msgid "to view my status"
+msgstr "para ver meu status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "De"
+msgid "to send me status"
+msgstr "para seu status para mim"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "um"
+msgid "All (including subscription)"
+msgstr "Todos (incluindo inscrições)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dois"
+msgid "Order:"
+msgstr "Ordem:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "para me enviar mensagens"
+#, fuzzy
+msgid "none"
+msgstr "um"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "para enviar minhas requisições"
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "para seu status para mim"
+#, fuzzy
+msgid "from"
+msgstr "De"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "para ver meu status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Endereço</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "dois"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Aniversário:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Cidade:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Família:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Empresa:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>País:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Nome do meio:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Departamento:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>Email:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefixo</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Complemento:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Primeiro nome:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Família:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sufixo</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Nome completo</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Rua:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Primeiro nome:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Cidade:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Página pessoal:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Estado:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Complemento:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Nome do meio:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Código postal:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Nome:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>País:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Apelido:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Endereço</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefone:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Página pessoal:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Posição:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Nome:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Código postal:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Apelido:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefone:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefixo</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Cargo:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Aniversário:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Estado:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>Email:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Rua:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Clique para definir seu avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sufixo</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Informações pessoais"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Empresa:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Sobre"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Posição:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Clique para definir seu avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Departamento:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Cargo:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Informações pessoais"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>O que você quer fazer?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Sobre"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _somente do Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>O que você quer fazer?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Remover"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Troca de itens na lista de contatos"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2805,117 +2664,114 @@ msgstr ""
 "<b>alguem@algumacoisa.com</b> gostaria que você <b>adicionasse</b> alguns "
 "contatos em sua lista de contatos."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
-"Corpo da mensagem <atualmente sem uso, então será escondida por padrão>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Troca de itens na lista de contatos"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Adicionar _contato..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr ""
+"Corpo da mensagem <atualmente sem uso, então será escondida por padrão>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "Re_cursos"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Ações"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Transferência de _arquivos"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Adicionar _contato..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Perguntas freqüentes (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Ajuda online"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "Cont_as"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Perfil, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Ver"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Exibir desc_onectados"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Exibir somente _ativos"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Exibir trans_portes"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Exibir desc_onectados"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Exibir _lista"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "Cont_as"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Transferência de _arquivos"
 
-#. 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 "_Ações"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Ajuda"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "Índi_ces"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Editar"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Ajuda online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "_Enviar mensagem simples..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Perguntas freqüentes (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Re_cursos"
 
 #: ../data/gui/search_window.ui.h:1
+msgid "Search"
+msgstr "Buscar"
+
+#: ../data/gui/search_window.ui.h:2
 msgid "Please wait while retrieving search form..."
 msgstr ""
 "Por favor aguarde enquanto o formulário de pesquisa está sendo obtido..."
 
-#: ../data/gui/search_window.ui.h:2
-msgid "Search"
-msgstr "Buscar"
-
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Adicionar contato"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informações"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2935,42 +2791,37 @@ msgstr "Registrar para"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Resposta para esta mensagem"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Para:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "E_nviar"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Enviar mensagem"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Enviar mensagem e fechar a janela"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Responder"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Para:"
+msgid "Reply to this message"
+msgstr "Resposta para esta mensagem"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Responder"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Enviar & fechar"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Enviar mensagem e fechar a janela"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torizar"
+msgid "Subscription Request"
+msgstr "Solicitação de inscrição"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
-"Autorize o contato para que ele ou ela saiba quando você estiver conectado"
+msgid "_Deny"
+msgstr "_Negar"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2980,262 +2831,275 @@ msgstr ""
 "Negar a autorização do contato, assim ele não poderá saber quando você está "
 "conectado"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Solicitação de inscrição"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torizar"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Negar"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+"Autorize o contato para que ele ou ela saiba quando você estiver conectado"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Sincronizar contatos"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Selecione a conta que você quer sincronizar"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Selecione os contatos que você quer sincronizar"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sincronizar: selecionar contatos"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Sons mudos"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Enviar _mensagem simples"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Exibir todos _eventos pendentes"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Selecione os contatos que você quer sincronizar"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Conferência"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Pergunta:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Enviar _mensagem simples"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Cliente:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Exibir todos _eventos pendentes"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Tempo do contato:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Sons mudos"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informações do contato"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Recurso:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Inscrição:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Cliente:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Sistema:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Comentários"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Tempo do contato:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Configurar avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Contato"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Inscrição:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informações do contato"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Pergunta:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Mais"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Avatar do usuário:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Contato"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Fonte</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Comentários"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafégo do Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Entrada XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Consulta"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Fonte</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Consulta"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presença"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presença"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Entrada XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Alterar conta..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "JID local:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Pessoal"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Um cliente Jabber GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Pessoal"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Mensageiro Instantâneo Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Um cliente de IM Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Um cliente Jabber GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Cancelar confirmação"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Sala inválida"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "O serviço enviou dados inválidos"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "O serviço alterou o identificador da sessão."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Comandos ad-hoc - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "O serviço retornou um erro."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Ativado"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Desativado"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Inteiro"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Nome da preferência"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Nada)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Escondido"
 
@@ -3246,240 +3110,183 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "Você recebeu novas entradas (e %d não exibida):"
 msgstr[1] "Você recebeu novas entradas (e %d não exibidas):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Inglês"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Bielorusso"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretão"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Tcheco"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Alemão"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Grego"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Inglês britânico"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Espanhol"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Basco"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francês"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Croata"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiano"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norueguês (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandês"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norueguês"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polonês"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Português"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Português Brasileiro"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Russo"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Sérvio"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Eslovaco"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Sueco"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Chinês (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Idioma do corretor ortográfico"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Erro."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Fonte"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Limpar formatação"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Realmente enviar o arquivo?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "Criptografia GPG habilitada"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Este contato não suporta transferência de arquivo."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Alternar sessão de áudio"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Alternar sessão de vídeo"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Recurso não disponível no Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Enviar _arquivo"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Este contato não suporta transferência de arquivo."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, 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:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Nenhuma chave GPG atribuída"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Você não poderá "
 "criptografar mensagem com GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "Criptografia GPG desabilitada"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "A sessão SERÁ gravada"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "A sessão NÃO SERÁ gravada"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "está"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NÃO está"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NÃO será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "e autenticada"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3488,32 +3295,32 @@ msgstr ""
 "Criptografia%(type)s %(status)s ativa %(authenticated)s.\n"
 "Sua conversa %(logged)s está sendo gravada."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Negociação da sessão cancelada"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "A sessão NÃO SERÁ gravada"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Esta sessão está criptografada"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " e SERÁ gravada"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " e NÃO SERÁ gravada"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3521,25 +3328,25 @@ msgstr ""
 "Identidade do contato remoto não verificada. Clique no botão de proteção "
 "para mais detalhes."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "Criptografia E2E desabilitada"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "A seguinte mensagem NÃO estava criptografada"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, 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:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3547,13 +3354,14 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3562,169 +3370,476 @@ 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Não foi possível descriptografar a mensagem de %s\n"
+"Ela pode ter sido adulterada."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s agora está %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Transferência de arquivos"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Tamanho: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Aceitar"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Transferência de arquivos completa"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Convite para conferência"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "O contato remoto parou a transferência"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Erro abrindo arquivo"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Transferência do arquivo parada"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Transferência de arquivos cancelada"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Conexão com o par não pode ser estabelecida."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uso: /%s, esconde os botões do bate-papo."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uso: /%s, envia a mensagem para o contato"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s não encontrado"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Afastado"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "Dis_ponível"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uso: /%s, apaga o texto da janela."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Ativar criptografia Open_PGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Uso: /%s, envia um ping para o contato"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Comando sem suporte para conta zeroconf."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Clique para ver o histórico de conversas com este contato"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s não é um nível de gravação (loglevel) válido"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Uma conexão não está disponível"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Conexão não disponível"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Alterar o seu apelido (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Apelido inválido"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uso: /%s <apelido>, abre uma janela de conferência privada com um ocupante "
+"específico."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Apelido não encontrado: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uso: /%s <apelido>, abre uma janela de conferência privada com um ocupante "
+"específico."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Perguntar antes de fechar um aba ou janela de conferência."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Enviar %s para %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Você foi convidado para uma conferência"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Servidor inválido"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "filiação alterada"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uso: /%s , mostra ou atualiza o tópico da sala atual."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Argumento não informado \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "criando banco de dados de logs"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Alterar informação de status"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Alterar status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Definir o tipo e a descrição da presença"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Conectado"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Muito afastado"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Descrição da presença:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "O status foi alterado."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Sair das salas"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Você não entrou em uma sala."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Salas"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Você saiu das seguintes salas:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Encaminhar mensagens não lidas"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Todas as mensagens não lidas foram encaminhadas."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Encaminhar mensagens não lidas"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Tocar som quando usuário estiver ocupado"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para exibir notificações"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Exibir somente contatos disponíveis e livres para conversa na lista."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo em minutos, depois do qual seu status muda para a afastado."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Afastado em conseqüência de estar inativo há mais de $T min)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S será substituída pela mensagem de status atual, $T pelo tempo de ausência "
 "automática."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo em minutos, depois do qual seu status muda para não disponível."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Não disponível em conseqüência de estar inativo há mais de $T min)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S será substituída pela mensagem de status atual, $T pelo tempo de "
 "indisponibilidade automática."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
@@ -3732,64 +3847,120 @@ msgstr ""
 "Quando exibir um ícone na área de notificação. Pode ser \"nunca\", com "
 "\"eventos\" e \"sempre\"."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Cor do apelido de entrada."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Cor do apelido de saída."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Cor do texto de entrada."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Cor do texto de saída."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Cor do texto da mensagem de status."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Mo_strar somente na lista"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Mo_strar somente na lista"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Pré-visualizar novas mensagens em uma janela popup?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Solicitação de transferência de arquivos"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Transferência de arquivos cancelada"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Convite para conferência"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Fonte do apelido de entrada."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Fonte do apelido de saída."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Fonte do texto de entrada."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Fonte do texto de saída."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Fonte do texto da mensagem de status."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "padrão"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Idioma usado pelo corretor ortográfico"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3799,7 +3970,7 @@ msgstr ""
 "'às vezes' - exibir hora a cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca exibir a hora."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3809,18 +3980,18 @@ msgstr ""
 "varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
 "menos. Isto é usado apenas se o valor de print_time for 'às vezes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Aproveite os pare * /_ como caracteres de formatação."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se verdadeiro, não remova */_. Assim *ABC* será negrito mas com * * não "
 "removido."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3831,7 +4002,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Se você quiser usar "
 "isso, instale o docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3839,7 +4010,7 @@ msgstr ""
 "Caracter a adicionar ao apelido quando se estiver usando o recurso de "
 "completar apelido (tecla Tab) na conferência."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3847,7 +4018,13 @@ msgstr ""
 "O caracter a ser proposto para adicionar ao final do apelido desejado quando "
 "ele já estiver sendo usado por outra pessoa na conferência."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3858,46 +4035,53 @@ msgstr ""
 "strftime na documentação do Python: http://docs.python.org/lib/module-time."
 "html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Os caracteres que são exibidos antes do apelido nas conversas"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Os caracteres que são exibidos após o apelidos nas conversas"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Quantas linhas lembrar da conversação anterior quando uma aba/janela de bate-"
 "papo for reaberta."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Quantos minutos exibir as últimas linhas da conversação anterior."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Quantas linhas requisitar ao servidor quando entrar em uma conferência."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "Quantos minutos esperar para requisitar registros quando entrar em uma sala."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3906,7 +4090,12 @@ msgstr ""
 "você foi desconectado. Definir para 0 irá desabilitar a tentativa de re-"
 "conexão (autorejoining)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3914,11 +4103,11 @@ msgstr ""
 "Enviar a mensagem com Ctrl+Enter e criar uma nova linha com Enter "
 "(comportamento padrão do cliente ICQ da Mirabilis)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quantas linhas armazenar com Ctrl+Acima."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3927,12 +4116,12 @@ msgstr ""
 "Uma ou outra URL costuma vir com %s onde %s é a palvra/frase ou em "
 "'WIKTIONARY' que significam o uso wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3944,14 +4133,14 @@ msgstr ""
 "configurado para Falso e se estiverem sincronizadas com o status global) "
 "baseado no status da conexão de rede."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3959,7 +4148,7 @@ msgstr ""
 "Notificações de estado de conversa exibidos nas janelas de conversa. Pode "
 "ser one of all, composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3967,36 +4156,39 @@ msgstr ""
 "Quando não estiver exibindo a hora para cada mensagem (print_time == "
 "simetimes), exibi-lo a cada x minutos."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Sempre perguntar antes de fechar um aba/janela nesta lista separada por "
 "espaço de JID's de conferências."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nunca perguntar antes de fechar uma aba/janela de conferência nesta lista "
 "separada por espaço de salas separadas por jids."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Perguntar antes de fechar uma aba de janela de conversa se ela puder perder "
 "dados (conversa, conversa privada, conferências que não podem ser "
 "minimizadas)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4005,28 +4197,34 @@ msgstr ""
 "interfaces locais, para Transferência de Arquivo no caso de tradução de "
 "endereço/encaminhamento de porta."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notificar os eventos no ícone da bandeja do sistema."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Exibir aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Exibir borda de caderno tabulada nas janelas de conversa?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Exibir botão de fechar na aba?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4038,18 +4236,18 @@ msgstr ""
 "16, 17 e 18. Números maiores são mais seguros, mas demoram mais para "
 "calcular quando você inicia uma sessão."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Pré-visualizar novas mensagens em uma janela popup?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
 "conferências."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4058,13 +4256,13 @@ msgstr ""
 "Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
 "opção só faz sentido quando a opção trayicon está sendo usada."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Se verdadeiro, o Gajim verifica ao iniciar se é o cliente Jabber padrão."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4072,7 +4270,7 @@ msgstr ""
 "Se verdadeiro, Gajim exibirá um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4080,11 +4278,11 @@ msgstr ""
 "Se verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
 "para cada contato sob o nome do contato na janela da lista."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define a posição do avatar na lista. Pode ser esquerda ou direita"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4092,7 +4290,7 @@ msgstr ""
 "Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
 "ou tem um cache que é velho demais."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4100,9 +4298,10 @@ msgstr ""
 "Se falso, você não verá por mais muito tempo a linha de status nas conversas "
 "quando um contato alterar seu status e/ou sua mensagem de status."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4114,29 +4313,33 @@ msgstr ""
 "\" o Gajim exibirá todas as mensagens de status. Se for \"in_and_out\" o "
 "Gajim só exibirá FOO entradas/saídas em conferências."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fundo dos contatos quando eles simplesmente desconectarem."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Verdadeiro, as mensagens restauradas usarão uma fonte menor que o padrão."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Não exibir o avatar para o próprio transporte."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Não exibir a lista na bandeja do sistema."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4146,7 +4349,7 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4157,7 +4360,8 @@ msgstr ""
 "informações sha na presenças de conferências."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4165,7 +4369,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Controlar a janela onde novas mensagens são colocadas.\n"
@@ -4178,32 +4382,40 @@ msgstr ""
 "'pertype' - Cada tipo de mensagem (ex. bate-papo vs. conferência) são "
 "enviadas para uma janela específica."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Se falso, você não verá por muito tempo o avatar na janela do bate-papo."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se verdadeiro, pressionando a tecla Esc fecha a aba/janela."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Esconder os botões nas janelas de conversa."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Esconder o banner na janela de conferência"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Esconder o banner na janela de conversa para duas pessoas"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4211,15 +4423,15 @@ msgstr ""
 "Em uma conferência, exibir o apelido no começo da linha apenas quando a "
 "mensagem atual não for da mesma pessoa que mandou a última."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Usar identação ao mesclar apelidos consecutivos."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Suavizar a rolagem de mensagens na janela de conversação"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4227,13 +4439,13 @@ msgstr ""
 "A lista de cores, separadas por \":\", que serão usadas para colorir os "
 "apelidos nas salas de conferência."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
 "aba."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4241,7 +4453,7 @@ msgstr ""
 "Devemos exibir o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos exibir o diálogo."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4249,7 +4461,7 @@ msgstr ""
 "Devemos exibir o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos exibir o diálogo."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4257,7 +4469,7 @@ msgstr ""
 "Devemos exibir o diálogo de confirmação status customizados ou não? Uma "
 "string vazia significa que nós nunca devemos exibir o diálogo."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4268,7 +4480,7 @@ msgstr ""
 "autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
 "mensagem do seu servidor."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4276,7 +4488,7 @@ msgstr ""
 "Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4284,7 +4496,7 @@ msgstr ""
 "Se verdadeiro, o Gajim usará o KDE Wallet (se disponível) para armazenar as "
 "senhas das contas."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4292,7 +4504,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim exibirá o número de contatos online e do total de "
 "contatos nas linha de conta e grupo."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4300,7 +4512,7 @@ msgstr ""
 "Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
 "recebidas como se elas fossem do tipo especificado"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4308,21 +4520,13 @@ msgstr ""
 "Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
 "última mensagem, se a janela de conversa ainda não estiver aberta."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Se definido como verdadeiro o Gajim converterá strings entre $$ e $$ em uma "
-"imagem usando o dvips antes de inseri-la em uma janela de conversa."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "O tempo de inatividade necessário antes de fechar a janela de alteração de "
 "status."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4330,7 +4534,7 @@ msgstr ""
 "Número máximo de linhas que são exibidas em conversações. As linhas mais "
 "antigas são apagadas."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4339,19 +4543,11 @@ msgstr ""
 "Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
 "serão anexadas ao ícone da bandeja do sistema."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Escolha intervalo entre 2 verificações de inatividade."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Alterar o valor para alterar o status das fórmulas latex exibidas. Quanto "
-"mais elevado é maior."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4359,22 +4555,23 @@ msgstr ""
 "Esquema uri válido. Somente esquemas nesta lista irão ser aceitos como uri "
 "\"real\". (mailto e xmpp são manipulados separadamente)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Perguntar a mensagem de status para todos os contatos desconectados quando a "
 "conexão com uma conta for estabelecida. AVISO: Isto pode resultar em muitas "
 "requisições a serem enviadas."
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Se verdadeiro, a ação de auto-completar na conferência irá ser como a do "
 "shell"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4382,31 +4579,60 @@ msgstr ""
 "Quando a linha de auto contatos é exibida. Pode ser \"sempre\", "
 "\"quando_em_outro_recurso\" ou \"nunca\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Se habilitado, o Gajim não irá perguntar por mensagem de status. A mensagem "
+"padrão especificada será usada neste caso."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4414,7 +4640,7 @@ msgstr ""
 "A prioridade será alterada automaticamente de acordo com o seu status. As "
 "prioridades são definidas nas opções autopriority_*."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4423,40 +4649,40 @@ msgstr ""
 "inativo, fora, np, invisível. NOTA: esta opção é usada somente se a opção "
 "restore_last_status estiver desativada"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Se habilitado, restaura o último status que foi usado."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Se verdadeiro, requisição de autorização de contatos  irão ser "
 "automaticamente aceitos."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Se falso, esta conta será desativada e não irá aparecer na lista de contatos."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Se desativado, não assinar presenças com chaves GPG, se o GPG estiver "
 "configurado."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Habilitar criptografia ESessions para esta conta."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "O Gajim deve iniciar automaticamente em sessão criptografada quando possível?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4464,51 +4690,66 @@ msgstr ""
 "Lista ordenada de tipos de conexão (separada por espaço) para tentar. Pode "
 "conter tls, ssl ou simples"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Exibir uma mensagem de alerta antes de usar uma biblioteca padrão SSL."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espaços de erros do ssl para ignorar."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Espaço em branco enviado após inatividade"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado após inatividade"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Quantos segundos aguardar a resposta do pacote de tempo-de-vida antes de "
 "tentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4516,15 +4757,34 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Respostas para requisições recebidas"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Requisições recebidas enviadas"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
+"operacional está usando"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s quer te enviar um arquivo."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4532,20 +4792,52 @@ msgstr ""
 "Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
 "suas mensagens sejam gravadas?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Autenticação anônima"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Autenticação anôn_ima"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4553,108 +4845,110 @@ msgstr ""
 "O Gajim deve iniciar automaticamente uma sessão criptografada com este "
 "contato quando possível?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 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:447
-msgid "all or space separated status"
-msgstr "todos ou lista de status separados por espaço"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'sim', 'não' ou 'ambos'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Quantas linhas requisitar ao servidor quando entrar em uma conferência."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Quantos minutos esperar para requisitar registros quando entrar em uma sala."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4662,27 +4956,186 @@ 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Para"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "remoção de inscrição solicitada por %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Erro de escrita em disco"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"O arquivo da base de dados (%s) não pôde ser lido. Tente repará-lo (veja "
+"http://trac.gajim.org/wiki/DatabaseBackup) ou removê-lo (todo o histórico "
+"será perdido)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "A sala foi excluída"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Você pode entrar nessa sala ao invés: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Jabber ID inválido:"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+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."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "erro ao enviar %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Erro de SSL desconhecido: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nova mensagem"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova mensagem simples de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Enviar mensagem privada"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova mensagem privada da conferência %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Mensagem enviada por %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nova mensagem"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova mensagem de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s alterou seu status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s agora está %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "O contato alterou seu status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s conectou"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Contato conectou"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s desconectou"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Contato desconectou"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Incapaz de carregar o módulo inativo"
@@ -4692,213 +5145,188 @@ msgstr "Incapaz de carregar o módulo inativo"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registro realizado com sucesso"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registro com o agente %s completado com sucesso"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Falha ao registrar"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, 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: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:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "A conta %s não suporta invisibilidade."
 
-#: ../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: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:1956
+msgid "I would like to add you to my roster."
+msgstr "Eu gostaria de adiciona-lo à minha lista."
 
-#: ../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 ""
-"O arquivo da base de dados (%s) não pôde ser lido. Tente repará-lo (veja "
-"http://trac.gajim.org/wiki/DatabaseBackup) ou removê-lo (todo o histórico "
-"será perdido)."
-
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Não foi possível obter certificado CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Não foi possível descriptografar a assinatura do certificado"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Não foi possível descriptografar a assinatura CRL"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Não foi possível decodificar a chave pública do emissor"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Assinatura do certificado falhou"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Falha na assinatura CRL"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "O certificado ainda não é válido"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "O certificado expirou"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL ainda não é válido"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL expirou"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Erro de formato nos certificados no campo notBefore"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Erro de formato nos certificados no campo notAfter"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erro de formato no campo lastUpdate do CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erro de formato no campo nextUpdate do CRL"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Certificado próprio"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado próprio na cadeia de certificados"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor local"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Não foi possível verificar o primeiro certificado"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "A cadeia de certificados é muito longa"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Certificado CA inválido"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Limite de comprimento do caminho excedido"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Certificado de propósito não suportado"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certificado não confiável"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certificado rejeitado"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Assunto do emissor não coincide"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Chave identificadora de autoridade e assunto não coincidem"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoridade e número serial do emissor não coincidem"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "O uso das chaves não inclui assinatura de certificado"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem está *criptografada* (Veja :XEP:`27`)]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4907,80 +5335,81 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, 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:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Erro de SSL desconhecido: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Impossível conectar a \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "O servidor respondeu: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Não foi possível conectar a conta %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, 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:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4989,7 +5418,7 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4998,24 +5427,33 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "A autenticidade do certificado %s pode ser inválida."
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Impossível conectar a \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 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:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Erro ao remover lista de privacidade"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5024,66 +5462,66 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Enviar contato: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Enviar contatos:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Falha ao cancelar registro"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Fora da lista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Acesso ao python D-Bus foi perdido neste computador"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "O D-Bus não está sendo executado corretamente nesta máquina"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "O D-Bus não está sendo executado corretamente nesta máquina"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "O D-Bus não está sendo executado corretamente nesta máquina"
@@ -5098,7 +5536,7 @@ msgstr ""
 "Serviço não disponível: o Gajim não está funcionando ou a opção "
 "'remote_control' é falsa"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "O D-Bus não está presente nesta máquina ou o módulo do Python está faltando"
@@ -5284,267 +5722,294 @@ msgstr "Fim da semana"
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Não disponível"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status da transferência:Parado"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status da transferência:Parado"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Invisível"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do contato de conferência:Nenhuma"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Dono"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensagem pendente"
 msgstr[1] "%d mensagens pendentes"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " da sala %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " do usuário %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento pendente"
 msgstr[1] "%d eventos pendentes"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Tempo esgotado ao carregar a imagem"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "A imagem é grande demais"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL ainda não é válido"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Tempo esgotado ao carregar a imagem"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuração da sala"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5556,50 +6021,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Mensagem de erro: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Erro executando \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s não é um nível de gravação (loglevel) válido"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Mensagem padrão"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 #, fuzzy
 msgid "Audio test"
 msgstr "Áudio / Vídeo"
@@ -5607,61 +6067,80 @@ msgstr "Áudio / Vídeo"
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Tamanho: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Arquivo: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "verde"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "erro: impossível abrir %s para leitura"
+msgid "Error: cannot open %s for reading"
+msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "azul celeste"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
@@ -6298,19 +6777,115 @@ msgstr "Estudando"
 msgid "Writing"
 msgstr "Escrevendo"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "padrão"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marinho"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Me escondendo"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "País:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Conta"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Descrição"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Erro"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "um"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "sala"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "URI"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Artista desconhecido"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Título desconhecido"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Fonte desconhecida"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6319,22 +6894,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Impossível conectar à porta %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Talvez haja uma outra instância do Gajim em execução. A transferência de "
-"arquivos será cancelada."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6342,11 +6903,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:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Erro do Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6355,44 +6916,43 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 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:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Impossível iniciar o serviço local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível conectar-se à porta %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível alterar status da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Sua mensagem não pode ser enviada."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6405,24 +6965,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao adicionar serviço. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Mensagem padrão"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, 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:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6431,67 +6991,67 @@ msgstr ""
 "Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
 "selecionar outro idioma ajustando a opção 'speller_language'."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você iniciou uma conversa usando a conta %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar desconectado."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, você deve ler todas os eventos pendentes."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6499,146 +7059,147 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Renomear conta"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entre com um novo nome para a conta %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Não há chave secreta OpenPGP disponível."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de chave OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Para desativar esta conta, você deve estar desconectado."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Lista de membros"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Lista de proprietários"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Cargo"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6646,11 +7207,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Adicionando membro..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6658,11 +7219,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Adicionando proprietário..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6670,11 +7231,11 @@ msgstr ""
 "<b>Quem você quer tornar um proprietário?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Adicionando administrador..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6682,7 +7243,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6698,111 +7259,108 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons desabilitados"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "O que você quer fazer?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remover conta _somente do Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Nova conferência"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tem dados inválidos"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
 "este marcador."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Apelido inválido"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Caractere não permitido"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Sala inválida"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6812,34 +7370,34 @@ msgstr ""
 "avançado, ou mais tarde clicando em contas no menu editar da janela "
 "principal."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 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:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6854,7 +7412,7 @@ msgstr ""
 "Erro do SSL: %(error)s\n"
 "Você ainda quer conectar com este servidor?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6865,72 +7423,89 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "O nó PEP não foi removido"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Configurar"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Primeira mensagem recebida"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Primeira mensagem recebida"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Nova mensagem recebida com foco"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Nova mensagem recebida sem foco"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Contato conectado"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Contato desconectou"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Mensagem enviada"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem destacada de conferência"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Email do GMail recebido"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6940,7 +7515,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:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6948,233 +7523,234 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Frase"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _dicionário"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de procura na web não existe \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Procura na web por isto"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Abrir como _link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, python-format
+#: ../src/conversation_textview.py:1386
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Ontem"
 msgstr[1] "Há %i dias"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Incapaz de carregar o módulo inativo"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID já existente na lista"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "novo@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novo%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contato: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Nome do contato"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Definir humor"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s mensagem de status"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever mensagem de status?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID do usuário:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Um cliente jabber GTK+"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Desenvolvedores atuais:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Desenvolvedores passados:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br>\n"
@@ -7182,7 +7758,7 @@ msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
 "Og Maciel <og.maciel@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7195,100 +7771,154 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Conexão não-segura"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+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/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Não me pergunte novamente"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "URI incorreta"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Isto não é uma conferência"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Conta inválida"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Apelido inválido"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 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:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 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:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7297,165 +7927,135 @@ msgstr ""
 "você quer enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, 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:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar conectado para mudar sua senha."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contato conectou"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Contato desconectou"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nova mensagem"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Nova mensagem"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Enviar mensagem privada"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Convite para conferência"
-
-#: ../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:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "adicionar"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "modificar"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "remover"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7465,188 +8065,184 @@ msgstr ""
 "lista."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupos"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugeriu adicionar você à minha lista."
 
-#: ../src/dialogs.py:3356
-#, python-format
-msgid "Added  %s contacts"
-msgstr "Adicionados %s contatos"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Adicionados %s contatos"
+msgstr[1] "Adicionados %s contatos"
 
-#: ../src/dialogs.py:3393
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "Removidos %s contatos"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Removidos %s contatos"
+msgstr[1] "Removidos %s contatos"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Nome do servidor inválido"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "O serviço retornou um erro."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %(order)s, ação: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Nome de lista inválido"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Você foi convidado para uma conferência"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Você quer aceitar este convite?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Escolher som"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando notificação especial para %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condição"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "quando eu estiver "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7657,19 +8253,19 @@ msgstr ""
 "\n"
 "A String Curta de Autenticação (SAS) da sessão é <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Você já verificou a identidade deste contato."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Identidade do contato verificada"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Verificar novamente..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7679,19 +8275,19 @@ msgstr ""
 "mensagens e enviar mensagens, você precisa verificar a identidade dela "
 "clicando no botão abaixo."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "A identidade do contato NÃO foi verificada"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Você verificou a identidade deste contato?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7706,53 +8302,58 @@ msgstr ""
 "\n"
 "Esta String de  Autenticação Curta é <b>%(sas)s</ b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 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:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "Uma chave GPG está atribuída para este contato, mas <b>você não validou "
 "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:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 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:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "um áudio e vídeo"
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "um áudio"
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "um video"
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7761,33 +8362,69 @@ msgstr ""
 "O %(contact)s quer iniciar uma sessão  %(type)s com você. Você quer "
 "responder a chamada?"
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "para conta %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Certificado próprio"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar serviços usando conta %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Buscar serviços"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7795,236 +8432,251 @@ 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:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Nome do servidor inválido"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Explorando %(address)s usando conta %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 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:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Executar comando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Varrendo %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Marcador já configurado"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" já existe nos marcadores."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Marcador foi adicionado com sucesso"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nova postagem"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Validação de certificado SSL"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Uma biblioteca usada para validar os certificados do servidor para garantir "
 "uma conexão segura."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Requer o python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Conversa sem servidor com clientes detectados automaticamente em uma rede "
 "local."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Requer o python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Requer pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Linha de comando"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Um script para controlar o Gajim via linha de comando."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Requer o 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Recurso não disponível no Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Criptografia de mensagem OpenPGP"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Criptografando as mensagens das conversas com chaves gpg."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Requer gpg e python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Detecção automática do status da rede."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requer gnome-network-manager e python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Gerenciamento de sessão"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "A sessão do Gajim é armazenada no logout and restaurada no login."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Requer python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Criptografia de senha"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "As senhas podem ser armazenadas de maneira segura e não apenas em texto "
 "plano."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Requer gnome-keyring e python-gnome2-desktop ou kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Habilidade de conectar a servidores que estão usando registros SRV."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Requer dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Requer nslookup para usar registros SRV."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Verificador ortográfico"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Verificação ortográfica das mensagens escritas."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Requer libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Requer libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Notificação"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Popups passivos notificando novos eventos."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -8032,67 +8684,40 @@ msgstr ""
 "Requer python-notify ou então python-dbus em conjunto com notification-"
 "daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Status automático"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Habilidade de medir o tempo de inatividade para definir o status automático."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Requer biblioteca libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Requer python2.5"
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Transforma expressões LaTeX entre $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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 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 "
-"avançadas."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Criptografia de mensagem End to End"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Criptografando mensagens da conversa."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Requer python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "Gerador RST"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8100,139 +8725,137 @@ msgstr ""
 "Gera saída XHTML a partir de código RST (veja http://docutils.sourceforge."
 "net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Requer python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Habilidade para iniciar uma conversa da áudio e vídeo."
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "Requer o python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "Requer python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Requer o python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Disponível"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Recurso"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvo em: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Transferência de arquivos completa"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Transferência de arquivos cancelada"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Conexão com o par não pode ser estabelecida."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Conteúdo: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensagem de erro: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Transferência do arquivo parada"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Escolha o arquivo para enviar..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Descrição: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Arquivo: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Descrição: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s quer te enviar um arquivo:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8240,33 +8863,64 @@ 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, 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:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Salvar arquivo como..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Arquivo: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Descrição: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s quer te enviar um arquivo:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Enviando perfil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Erro na transferência de arquivos"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8274,69 +8928,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Arquivo: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "mensagem"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Emoticons:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Mostre somente na _lista"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor de configurações avançado"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Configuração da sala"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim necessita do servidor X para rodar. Encerrando..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importação PyGTK falhou: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "O Gajim necessita do GTK 2.12 ou superior"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "O Gajim necessita do GTK 2.12 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa do pywin32 para rodar"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8345,12 +9036,11 @@ msgstr ""
 "Por favor certifique-se de que o PyWin32 está instalado em seu sistema. Você "
 "pode obtê-lo em %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "O Gajim já está em execução"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8358,28 +9048,28 @@ msgstr ""
 "Outra instância do Gajim parece estar rodando\n"
 "Executar de qualquer forma?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Mostra uma ajuda para um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "exibir ajuda no comando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "exibe ou esconder a janela principal"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8387,52 +9077,56 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "conta"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "exibir somente os contatos desta conta"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Mudar o status da conta ou contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensagem"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8441,21 +9135,45 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Mudar a prioridade da conta ou das contas"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioridade:"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "prioridade que deseja dar para a conta"
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "conteúdo da mensagem. A conta deve estar especificada ou \"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8465,35 +9183,30 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8503,135 +9216,132 @@ 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-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "assunto"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "assunto da mensagem"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "O JID do contato que receberá a mensagem"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "arquivo"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Adicionar contato para a lista"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 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
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abrir o diálogo 'Iniciar Conversa'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa, usando esta conta"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Envia XML personalizado"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8639,44 +9349,93 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Alterar status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Apelido a ser usado"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for 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.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI a manipular"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Selecione a conta na qual você quer manipular isto"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Conteúdo da mensagem"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Entrar em uma sala MUC"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "sala"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Sala JID"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "apelido"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Apelido a ser usado"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "senha"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Senhas para entrar na sala"
+
+#: ../src/gajim-remote.py:292
+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:297
 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
+#: ../src/gajim-remote.py:301
 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8685,160 +9444,45 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Uso: %s %s %s \n"
-"\t %s"
+"Uso: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "URI incorreta"
-
-#: ../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 ""
-"um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
-
-#: ../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: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:242
-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.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Alterar status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Apelido a ser usado"
-
-#: ../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 ""
-"A conta em que o XML será enviado; se não estiver especificado, será enviado "
-"para todas as contas"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI a manipular"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Selecione a conta na qual você quer manipular isto"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Conteúdo da mensagem"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Sala JID"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Apelido a ser usado"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Senhas para entrar na sala"
-
-#: ../src/gajim-remote.py:291
-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:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Uso: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8847,7 +9491,7 @@ msgstr ""
 "Muitos argumentos. \n"
 "Digite \"%(basename)s help %(command)s\" para mais informações"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8856,10 +9500,14 @@ msgstr ""
 "Argumento \"%(arg)s\" não está especificado. \n"
 "Digite\"%(basename)s help %(command)s\" para maiores informações"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "URI incorreta"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8882,180 +9530,218 @@ msgid "You cannot delete your current theme"
 msgstr "Você não pode apagar o seu tema corrente"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Conversação com "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Conversação continuada"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s alterou o assunto para %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "A sala agora exibe membros indisponíveis"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "a sala agora não mostra membros indisponíveis"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "A gravação das conversas da sala está ativo agora"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "A gravação das conversas da sala está desligado agora"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Agora a sala é não-anônima"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Agora a sala é semi-anônima"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Agora a sala é totalmente anônima"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s foi removido da sala (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Mudando assunto"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Mudando apelido"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "O Jabber ID da conferência possui caracteres não permitidos."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9063,22 +9749,22 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 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:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -9101,66 +9787,60 @@ msgstr "_Reportar erro"
 msgid "Details"
 msgstr "Detalhes"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "O Gajim não é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 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:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9171,92 +9851,86 @@ msgstr ""
 "outro ocupante.\n"
 "Por favor, especifique um outro apelido abaixo:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Sempre usar este apelido quando houver um conflito"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> 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."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Você está banido da sala %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "A sala %s não existe."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Seu nickname registado deve ser usado na sala %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9264,109 +9938,105 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Desinscrever"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "A sala agora exibe membros indisponíveis"
-
-#: ../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:930
-msgid "A non-privacy-related room configuration change has occurred"
+msgid "%(jid)s declined the invitation: %(reason)s"
 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:934
-msgid "Room logging is now enabled"
-msgstr "A gravação das conversas da sala está ativo agora"
-
-#: ../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:938
-msgid "Room is now non-anonymous"
-msgstr "Agora a sala é não-anônima"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Agora a sala é semi-anônima"
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Agora a sala é totalmente anônima"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Frase de acesso OpenGPG incorreta"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "O certificado expirou"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr ""
+"Entre com a frase de acesso da chave GPG %(keyid)s para conta (account "
+"%(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "Chave GPG não confiável"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "A chave GPG usada para criptografar esta conversa não é confiável. Você "
 "realmente deseja criptografar esta mensagem?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo email em %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9381,80 +10051,65 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: ../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:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Erro abrindo arquivo"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Transferência de arquivos"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Não foi possível descriptografar a mensagem de %s\n"
-"Ela pode ter sido adulterada."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Não foi possível descriptografar a mensagem"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Erro."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Conflito de recurso"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9463,20 +10118,20 @@ msgstr ""
 "novo"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer iniciar uma conversa com voz."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Solicitação de conversa com voz"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Erro ao verificar o certificado SSL"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9487,15 +10142,20 @@ msgstr ""
 "%(error)s\n"
 "Você ainda deseja conectar-se a este servidor?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este erro para este certificado."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Erro de certificado SSL"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Erro de certificado SSL"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9512,27 +10172,7 @@ msgstr ""
 "\n"
 "Você ainda quer conectar e atualizar o fingerprint do certificado?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"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: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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9540,7 +10180,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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9550,11 +10190,11 @@ msgstr ""
 "certeza que quer fazer isto?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Emoticons desabilitados"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9562,7 +10202,7 @@ msgstr ""
 "Você configurou um tema de emoticons que não foi encontrado, então os "
 "emoticons estão desativados."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9572,85 +10212,88 @@ msgstr ""
 "precisar atualizar o formato do arquivo emoticons.py. Veja http://trac.gajim."
 "org/wiki/Emoticons para mais detalhes."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "A chave GPG expirou"
 
-#: ../src/gui_interface.py:3427
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso errada"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Nova conferência"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à minha lista"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "criando diretório %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Contatos"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Apelido"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Mensagem"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9658,7 +10301,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9672,93 +10315,108 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Erro na base de dados"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exportando histórico de logs..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s em %(time)s disse: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Você realmente quer excluir os logs do contato selecionado?"
-msgstr[1] "Você realmente quer excluir os logs dos contatos selecionados?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Você realmente quer excluir a mensagem selecionada?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Você realmente quer excluir os logs do contato selecionado?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Esta é uma operação irreversível."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Cancelar confirmação"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Você realmente quer excluir a mensagem selecionada?"
 msgstr[1] "Você realmente quer excluir as mensagens selecionadas?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversação com %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Erro de disco"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s é agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Erro: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Tempo esgotado ao carregar a imagem"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Codificado"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "A imagem é grande demais"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Você está prestes a fechar todas as abas"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Mensagens"
 
@@ -9770,151 +10428,164 @@ msgstr "- as mensagens serão gravadas"
 msgid "- messages will not be logged"
 msgstr "- as mensagens não serão gravadas"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s alterou seu status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s conectou"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s desconectou"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Banindo %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nova mensagem simples de %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Falha ao registrar"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova mensagem privada da conferência %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "O serviço enviou dados inválidos"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Mensagem enviada por %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Este arquivo já existe"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nova mensagem de %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorar"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuração da sala"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informações do contato"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informação recebida"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informação NÃO publicada"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 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:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG não é usável"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9922,38 +10593,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "não sincronizado"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Realmente sair do Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Sempre fechar o Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar transferência de arquivo"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9961,16 +10632,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:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9978,11 +10649,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9991,12 +10662,12 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens para contatos destes "
 "transportes: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 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:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10005,56 +10676,56 @@ msgstr ""
 "ele enviar para você."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10063,11 +10734,11 @@ msgstr ""
 "ele ou ela sempre o verá offiline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10075,16 +10746,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10094,15 +10765,15 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a enviar um status customizado. Tem certeza que quer "
 "continuar?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10111,34 +10782,35 @@ 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 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:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10148,23 +10820,28 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s para %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Fazer %s e %s metacontatos"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
@@ -10174,130 +10851,130 @@ msgstr "Fazer %s e %s metacontatos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Gerenciar marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Configurar serviços..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Editar _grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Enviar mensagem simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Reconectar"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Mudar mensagem de status..."
 
@@ -10314,24 +10991,14 @@ msgstr "Erro no formulário de dados recebido"
 msgid "No result"
 msgstr "Sem resultados"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Erro ao escrever em disco"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Assunto: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Confirme essas opções de sessão"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10343,7 +11010,7 @@ msgstr ""
 "\n"
 "\tEssas opções são aceitáveis?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10358,147 +11025,152 @@ msgstr ""
 "\n"
 "Continuar com a sessão?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "O OpenPGP está ativado para este contato?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Mudar mensagem de status..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _lista"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dessa sala"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Último status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "Console XML para %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Humor:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Atividade:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Sintonia:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Notificação"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Completo"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?status da transferência:Parado"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço não respondeu ainda com informação detalhada"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10506,32 +11178,32 @@ msgstr ""
 "Este serviço não pode responder com informações detalhadas.\n"
 "É provável que esteja quebrado"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Tempo:Desconhecido"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliação:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10539,7 +11211,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:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10547,13 +11219,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:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10561,19 +11233,401 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum outro está "
 "interessado no seu"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Não há requisições de inscrições pendentes."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Escolha o arquivo para enviar..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " uma janela/aba aberta com o contato "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Ações</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Condições</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Ações avançadas"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Controle avançado de notificações"
+
+#~ msgid "All statuses"
+#~ msgstr "Totos os status"
+
+#~ msgid "Busy "
+#~ msgstr "Ocupado "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "O contato alterou seu status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contato desconectou"
+
+#~ msgid "Don't have "
+#~ msgstr "Não possui "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Transferência do arquivo parada"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Mensagem destacada de conferência"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Mensagem de conferência recebida"
+
+#~ msgid "Have "
+#~ msgstr "Possui "
+
+#~ msgid "Launch a command"
+#~ msgstr "Executar um comando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Um ou mais status especiais..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Online / Livre para conversa"
+
+#~ msgid "Play a sound"
+#~ msgstr "Tocar um som"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Enviar mensagem privada"
+
+#~ msgid "When "
+#~ msgstr "Quando "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Ativar o recurso \"UrgencyHint\" do gerenciador de janelas faz a janela "
+#~ "de conversa piscar na barra de tarefas"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Desativar a abertura automática da janela de conversa"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Desativar janelas popup existentes"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Desativar sons existentes para este evento"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Desativar exibição de eventos na lista"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Desativar exibição de eventos na lista"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Notificar-me com uma janela popup"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Abrir janela de conversa com o contato"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Mo_strar somente na lista"
+
+#~ msgid "and I "
+#~ msgstr "e eu "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contatos"
+
+#~ msgid "for "
+#~ msgstr "para "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupos"
+
+#~ msgid "when I'm in"
+#~ msgstr "quando eu estiver em"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Exibir o perfil do contato (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Permitir que ele/ela veja meu status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Descrição: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Avançado..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Exibir a_tividade dos contatos na lista"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Exibir sin_tonia dos contatos na lista"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Exibir hum_or dos contatos na lista"
+
+#~ 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"
+
+#, 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"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Enviar mensagem simples..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Avatar do usuário:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Mensageiro Instantâneo Gajim"
+
+#~ msgid "English"
+#~ msgstr "Inglês"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bielorusso"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
+
+#~ msgid "Breton"
+#~ msgstr "Bretão"
+
+#~ msgid "Czech"
+#~ msgstr "Tcheco"
+
+#~ msgid "German"
+#~ msgstr "Alemão"
+
+#~ msgid "Greek"
+#~ msgstr "Grego"
+
+#~ msgid "British"
+#~ msgstr "Inglês britânico"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Espanhol"
+
+#~ msgid "Basque"
+#~ msgstr "Basco"
+
+#~ msgid "French"
+#~ msgstr "Francês"
+
+#~ msgid "Croatian"
+#~ msgstr "Croata"
+
+#~ msgid "Italian"
+#~ msgstr "Italiano"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norueguês (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandês"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norueguês"
+
+#~ msgid "Polish"
+#~ msgstr "Polonês"
+
+#~ msgid "Portuguese"
+#~ msgstr "Português"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Português Brasileiro"
+
+#~ msgid "Russian"
+#~ msgstr "Russo"
+
+#~ msgid "Serbian"
+#~ msgstr "Sérvio"
+
+#~ msgid "Slovak"
+#~ msgstr "Eslovaco"
+
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chinês (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Idioma do corretor ortográfico"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Se definido como verdadeiro o Gajim converterá strings entre $$ e $$ em "
+#~ "uma imagem usando o dvips antes de inseri-la em uma janela de conversa."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Alterar o valor para alterar o status das fórmulas latex exibidas. Quanto "
+#~ "mais elevado é maior."
+
+#~ msgid "all or space separated status"
+#~ msgstr "todos ou lista de status separados por espaço"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'sim', 'não' ou 'ambos'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'sim', 'não', ou ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Verifique sua conexão ou tente novamente mais tarde"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Erro executando \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "erro: impossível abrir %s para leitura"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Impossível conectar à porta %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Talvez haja uma outra instância do Gajim em execução. A transferência de "
+#~ "arquivos será cancelada."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Um cliente jabber GTK+"
+
+#~ msgid "Condition"
+#~ msgstr "Condição"
+
+#~ msgid "when I am "
+#~ msgstr "quando eu estiver "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Requer pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Requer gpg e python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transforma expressões LaTeX entre $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "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 "
+#~ "avançadas."
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Requer o python-farsight."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "um desses: desconectado, conectado, bate-papo, inativo, fora, np, "
+#~ "invisível "
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Uso: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Contatos"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Erro ao escrever em disco"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Assunto: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Humor:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Atividade:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10601,32 +11655,12 @@ msgstr " recurso com prioridade "
 #~ msgid "Nickname not allowed: %s"
 #~ msgstr "Apelido não permitido: %s"
 
-#~ msgid "Room has been destroyed"
-#~ msgstr "A sala foi excluída"
-
-#~ 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"
 
@@ -10729,9 +11763,6 @@ msgstr " recurso com prioridade "
 #~ "Históricos das salas\n"
 #~ "Todos os históricos de conversa"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Gerenciar contas"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10900,27 +11931,15 @@ msgstr " recurso com prioridade "
 #~ msgid "B_OSH Port:"
 #~ msgstr "Porta B_OSH:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Exibi_r lista"
-
 #~ msgid "Add Special _Notification"
 #~ msgstr "Adicionar _notificações especiais"
 
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Atribuir chave Open_PGP"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Comando sem suporte para conta zeroconf."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Comandos: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uso: /%s, apaga o texto da janela."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uso: /%s, esconde os botões do bate-papo."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10928,21 +11947,12 @@ msgstr " recurso com prioridade "
 #~ "Uso: /%(command)s <action>, emite a ação à sala atual. Use a terceira "
 #~ "pessoa. (e.g. /%(command)s explodes.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Uso: /%s, envia um ping para o contato"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uso: /%s, envia a mensagem para o contato"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Sem ajuda para /%s"
 
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Transferência de arquivo parada pelo contato do outro lado"
 
-#~ msgid "Nickname not found: %s"
-#~ msgstr "Apelido não encontrado: %s"
-
 #~ msgid "This group chat has no subject"
 #~ msgstr "Esta conferência não tem assunto"
 
@@ -10961,13 +11971,6 @@ msgstr " recurso com prioridade "
 #~ "espaços no apelido."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uso: /%s <apelido>, abre uma janela de conferência privada com um "
-#~ "ocupante específico."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -11006,9 +12009,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Uso: /%s , mostra ou atualiza o tópico da sala atual."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
@@ -11119,9 +12119,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Encryption disabled"
 #~ msgstr "Criptografia desabilitada"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Clique para ver o histórico de conversas com este contato"
-
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Clique para ver o histórico de conversas nesta sala"
 
@@ -11143,9 +12140,6 @@ msgstr " recurso com prioridade "
 #~ msgid "in"
 #~ msgstr "em"
 
-#~ msgid "Accept"
-#~ msgstr "Aceitar"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Convite Recebido"
 
@@ -11223,9 +12217,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Company:"
 #~ msgstr "Empresa:"
 
-#~ msgid "Country:"
-#~ msgstr "País:"
-
 #~ msgid "Given:"
 #~ msgstr "Nome:"
 
diff --git a/po/ru.po b/po/ru.po
index 5514a3c23..d0127192a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 09:36+0400\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2013-08-26 10:00+0300\n"
 "Last-Translator: Fomin Denis <fominde@gmail.com>\n"
 "Language-Team: Linux Support LLC\n"
@@ -186,8 +186,8 @@ msgstr "_Закончить"
 #: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
 #: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
-#: ../src/dialogs.py:536 ../src/roster_window.py:3149
-#: ../src/roster_window.py:3155 ../src/roster_window.py:3160
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
 msgid "None"
 msgstr "Нет"
 
@@ -208,7 +208,7 @@ msgid "Delete"
 msgstr "Удалить"
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5794
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
 msgid "Re_name"
 msgstr "П_ереименовать"
 
@@ -365,8 +365,8 @@ msgstr ""
 #. General group cannot be changed
 #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41
 #: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
-#: ../src/roster_window.py:3091 ../src/roster_window.py:4217
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
 msgid "General"
 msgstr "Общие"
 
@@ -761,8 +761,8 @@ msgstr "Заблокированные контакты"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5813
-#: ../src/roster_window.py:5940 ../src/roster_window.py:6073
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
@@ -971,8 +971,8 @@ msgstr "Отправить _файл..."
 #. Invite to
 #. Invite to Groupchat
 #: ../data/gui/contact_context_menu.ui.h:4
-#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5749
-#: ../src/roster_window.py:5908
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
@@ -988,8 +988,8 @@ msgstr "Включить Open_PGP шифрование"
 msgid "Toggle End to End Encryption"
 msgstr "Включить End to End шифрование"
 
-#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759
-#: ../src/roster_window.py:5997
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Установи_ть статус"
 
@@ -1041,8 +1041,8 @@ msgid "_Forbid contact to see my status"
 msgstr "_Запретить ему или ей видеть мой статус"
 
 #: ../data/gui/contact_context_menu.ui.h:21
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5821
-#: ../src/roster_window.py:5946 ../src/roster_window.py:6076
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
 msgid "_Block"
 msgstr "_Блокировать"
 
@@ -1061,7 +1061,7 @@ msgstr "_Удалить"
 #: ../data/gui/contact_context_menu.ui.h:26
 #: ../data/gui/gc_control_popup_menu.ui.h:9
 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
-#: ../src/roster_window.py:6147
+#: ../src/roster_window.py:6145
 msgid "_History"
 msgstr "_История"
 
@@ -1161,7 +1161,7 @@ msgstr "Скрывает окно"
 msgid "_Continue"
 msgstr "_Продолжить"
 
-#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3350
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
 #: ../src/filetransfers_window.py:213
 msgid "_Open Containing Folder"
 msgstr "_Открыть папку с принятым файлом"
@@ -1320,7 +1320,7 @@ msgstr "_Забанить"
 msgid "_Add to Roster"
 msgstr "_Добавить в ростер"
 
-#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1722
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
 msgid "Show a list of formattings"
 msgstr "Показать список форматирования"
 
@@ -1533,7 +1533,7 @@ msgstr "Сервер:"
 msgid "Bro_wse Rooms"
 msgstr "Просмотр конферен_ций"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3385
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
 #: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Присоединиться"
@@ -2601,8 +2601,8 @@ msgstr "<b>Что вы хотите сделать?</b>"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5831
-#: ../src/roster_window.py:5956 ../src/roster_window.py:6086
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Удалить"
 
@@ -2720,7 +2720,7 @@ msgid "_Add contact"
 msgstr "Добавить _контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6098
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Информация о контакте"
 
@@ -3038,16 +3038,16 @@ msgstr "Название опции"
 msgid "Value"
 msgstr "Значение"
 
-#: ../src/advanced_configuration_window.py:122
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:177
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Нет)"
 
-#: ../src/advanced_configuration_window.py:303
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Скрытый"
 
@@ -3106,80 +3106,80 @@ 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:1664 ../src/chat_control.py:2248
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 msgid "OpenPGP encryption enabled"
 msgstr "OpenPGP шифрование включено"
 
-#: ../src/chat_control.py:1726
+#: ../src/chat_control.py:1727
 msgid "Formattings are not available when GPG is active"
 msgstr "Форматирование невозможно если включено GPG"
 
-#: ../src/chat_control.py:1729
+#: ../src/chat_control.py:1730
 msgid "This contact does not support HTML"
 msgstr "Этот контакт не поддерживает HTML"
 
 #. Add to roster
-#: ../src/chat_control.py:1734 ../src/common/contacts.py:152
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67
 #: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
 #: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
-#: ../src/gui_menu_builder.py:265 ../src/gui_menu_builder.py:420
-#: ../src/roster_window.py:771 ../src/roster_window.py:1734
-#: ../src/roster_window.py:1736 ../src/roster_window.py:2084
-#: ../src/roster_window.py:3620 ../src/roster_window.py:3647
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
 #. change tooltip text for audio and video buttons if python-farstream is
 #. not installed
-#: ../src/chat_control.py:1759
+#: ../src/chat_control.py:1760
 #: ../src/command_system/implementation/standard.py:215
 msgid "Toggle audio session"
 msgstr "Переключить аудио сеанс"
 
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1761
 #: ../src/command_system/implementation/standard.py:225
 msgid "Toggle video session"
 msgstr "Переключить видео сеанс"
 
-#: ../src/chat_control.py:1762
+#: ../src/chat_control.py:1763
 msgid "Feature not available, see Help->Features"
 msgstr "Эта возможность отсутствует, смотрите Помощь->Возможности"
 
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1767
 msgid "Feature not supported by remote client"
 msgstr "Клиент на другой стороне не поддерживает данную возможность"
 
-#: ../src/chat_control.py:1779
+#: ../src/chat_control.py:1780
 msgid "Send files"
 msgstr "Отправить файлы"
 
-#: ../src/chat_control.py:1784
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Этот контакт не поддерживает передачу файлов."
 
-#: ../src/chat_control.py:1787
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей "
 "файл."
 
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s состояние : %(state)s, причина: %(reason)s"
 
-#: ../src/chat_control.py:2097
+#: ../src/chat_control.py:2098
 #, 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:2228 ../src/dialogs.py:5194
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
 msgid "No OpenPGP key assigned"
 msgstr "Ключ OpenPGP не присвоен"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2230
 msgid ""
 "No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
 "with OpenPGP."
@@ -3187,50 +3187,50 @@ msgstr ""
 "Этому контакту не присвоен ключ OpenPGP, поэтому вы не можете зашифровать "
 "сообщения с помощью OpenPGP."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2239
 msgid "OpenPGP encryption disabled"
 msgstr "OpenPGP шифрование выключено"
 
-#: ../src/chat_control.py:2264
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Для сеанса БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:2266
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
 
 #. encryption %s active
-#: ../src/chat_control.py:2283
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "было"
 
-#: ../src/chat_control.py:2283
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "НЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2285
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "будет"
 
-#: ../src/chat_control.py:2285
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "НЕ будет"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2289
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "и заверено"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2293
+#: ../src/chat_control.py:2294
 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:2300
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3239,31 +3239,31 @@ msgstr ""
 "%(type)s шифрование %(status)s включено %(authenticated)s.\n"
 "Для сеанса %(logged)s сохранена история сообщений."
 
-#: ../src/chat_control.py:2438
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Установление сеанса отменено"
 
-#: ../src/chat_control.py:2448
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "История сеанса БУДЕТ сохранена на сервере"
 
-#: ../src/chat_control.py:2450
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "История сеанса НЕ БУДЕТ сохранена на сервере"
 
-#: ../src/chat_control.py:2459
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Сеанс зашифрован"
 
-#: ../src/chat_control.py:2462
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " и БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:2464
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:2469
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3271,25 +3271,25 @@ msgstr ""
 "Личность удаленного контакта не подтверждена. Нажмите на кнопку со щитом для "
 "подробностей."
 
-#: ../src/chat_control.py:2471
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: ../src/chat_control.py:2519 ../src/chat_control.py:2533
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
 
-#: ../src/chat_control.py:2525
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Последнее сообщение зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2796
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Получено новое сообщение от «%s»"
 
-#: ../src/chat_control.py:2798
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3297,14 +3297,14 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/chat_control.py:2966 ../src/common/connection_handlers_events.py:913
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
 #: ../src/common/connection_handlers.py:1145
 #: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
 #: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: ../src/chat_control.py:2967
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3313,7 +3313,7 @@ msgstr ""
 "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
 "или удалить (вся история будет утеряна)."
 
-#: ../src/chat_control.py:3204 ../src/gui_interface.py:1161
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3322,52 +3322,52 @@ msgstr ""
 "Не удалось расшифровать сообщение от %s\n"
 "Возможно, оно было испорчено."
 
-#: ../src/chat_control.py:3261
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s теперь %(status)s"
 
-#: ../src/chat_control.py:3320
+#: ../src/chat_control.py:3321
 msgid "File transfer"
 msgstr "Передача файлов"
 
-#: ../src/chat_control.py:3323
+#: ../src/chat_control.py:3324
 msgid "Size"
 msgstr "Размер"
 
-#: ../src/chat_control.py:3325
+#: ../src/chat_control.py:3326
 msgid "_Accept"
 msgstr "_Принять"
 
-#: ../src/chat_control.py:3346 ../src/filetransfers_window.py:211
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/chat_control.py:3382 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
 #: ../src/gui_interface.py:646 ../src/notify.py:278
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/chat_control.py:3404 ../src/gui_interface.py:1019
-#: ../src/roster_window.py:1993
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
 msgid "Remote contact stopped transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: ../src/chat_control.py:3406 ../src/gui_interface.py:1022
-#: ../src/roster_window.py:1995
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
 msgid "Error opening file"
 msgstr "Ошибка открытия файла"
 
-#: ../src/chat_control.py:3408 ../src/filetransfers_window.py:247
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
 msgid "File transfer stopped"
 msgstr "Передача файла остановлена"
 
-#: ../src/chat_control.py:3411 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:233
 msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:234
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
@@ -3712,8 +3712,8 @@ msgstr "Выберите конференции, которые вы хотит�
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:216 ../src/common/contacts.py:131
 #: ../src/common/helpers.py:67 ../src/roster_window.py:824
-#: ../src/roster_window.py:1738 ../src/roster_window.py:1740
-#: ../src/roster_window.py:2623 ../src/roster_window.py:5716
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Комнаты"
 
@@ -3885,7 +3885,7 @@ msgstr ""
 #. sorted alphanum
 #: ../src/common/config.py:117 ../src/common/config.py:533
 #: ../src/common/optparser.py:295 ../src/common/optparser.py:491
-#: ../src/common/optparser.py:525 ../src/gui_interface.py:2790
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "По_умолчанию"
 
@@ -4982,90 +4982,90 @@ msgstr "Было получено сообщение от неверного JID
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: ../src/common/connection_handlers_events.py:1298
+#: ../src/common/connection_handlers_events.py:1307
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/common/connection_handlers_events.py:1599
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестная ошибка SSL: %d"
 
-#: ../src/common/connection_handlers_events.py:2202 ../src/dialogs.py:2917
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
 #: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
-#: ../src/common/connection_handlers_events.py:2204
+#: ../src/common/connection_handlers_events.py:2213
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2208 ../src/dialogs.py:2918
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
 #: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/common/connection_handlers_events.py:2210
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новое личное сообщение из комнаты %s"
 
-#: ../src/common/connection_handlers_events.py:2213
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/connection_handlers_events.py:2216
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2220 ../src/dialogs.py:2917
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
 #: ../src/notify.py:266
 msgid "New Message"
 msgstr "Новое сообщение"
 
-#: ../src/common/connection_handlers_events.py:2222
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2366
+#: ../src/common/connection_handlers_events.py:2375
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
-#: ../src/common/connection_handlers_events.py:2368
+#: ../src/common/connection_handlers_events.py:2377
 #: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
 #: ../src/history_window.py:455
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
 
-#: ../src/common/connection_handlers_events.py:2372 ../src/dialogs.py:2929
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
 #: ../src/notify.py:280
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: ../src/common/connection_handlers_events.py:2374
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключается"
 
 #. default value
-#: ../src/common/connection_handlers_events.py:2378 ../src/dialogs.py:2913
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
 #: ../src/notify.py:262
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: ../src/common/connection_handlers_events.py:2380
+#: ../src/common/connection_handlers_events.py:2389
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключается"
 
-#: ../src/common/connection_handlers_events.py:2384 ../src/dialogs.py:2915
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
 #: ../src/notify.py:264
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
@@ -5109,7 +5109,7 @@ msgstr "Невидимость не поддерживается"
 msgid "Account %s doesn't support invisibility."
 msgstr "Учетная запись %s не поддерживает невидимость."
 
-#: ../src/common/connection_handlers.py:1945
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
@@ -5424,9 +5424,9 @@ msgstr "Наблюдатели"
 #: ../src/common/contacts.py:133 ../src/common/contacts.py:361
 #: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
 #: ../src/disco.py:1554 ../src/roster_window.py:863
-#: ../src/roster_window.py:1616 ../src/roster_window.py:1730
-#: ../src/roster_window.py:1732 ../src/roster_window.py:1894
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Транспорты"
 
@@ -6065,8 +6065,8 @@ msgstr "Система X Window (без Xv)"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:203
-#: ../src/gtkgui_helpers.py:219
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
@@ -7425,14 +7425,14 @@ msgstr "Получено сообщение в комнате"
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
-#: ../src/conversation_textview.py:474 ../src/conversation_textview.py:492
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
 #, fuzzy, python-format
 msgid ""
 "<b>Message was corrected. Last message was:</b>\n"
 "  %s"
 msgstr "С момента последней отправки сообщения"
 
-#: ../src/conversation_textview.py:645
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -7442,7 +7442,7 @@ msgstr ""
 "Если иконка не пропадает долгое время,\n"
 "это означает, что сообщение потеряно."
 
-#: ../src/conversation_textview.py:664
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -7450,44 +7450,44 @@ msgstr ""
 "Текст под этой линией был сказан после того,\n"
 "как вы последний раз заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Цитировать"
 
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для «%s»"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:809
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
-#: ../src/conversation_textview.py:826
+#: ../src/conversation_textview.py:835
 #, 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:839
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "В URL Web-поиска отсутствует «%s»"
 
-#: ../src/conversation_textview.py:842
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:848
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Открыть как _ссылку"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1377
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7496,7 +7496,7 @@ msgstr[1] "%(nb_days)i  дня назад"
 msgstr[2] "%(nb_days)i  дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1427 ../src/history_window.py:488
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -7695,8 +7695,8 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка "
 "%s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/dialogs.py:1845 ../src/gui_interface.py:1444
-#: ../src/gui_interface.py:1486
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
@@ -7713,8 +7713,8 @@ msgstr ""
 "подключения не рекомендуется.\n"
 "Вы действительно хотите это сделать?"
 
-#: ../src/dialogs.py:1852 ../src/gui_interface.py:1448
-#: ../src/gui_interface.py:1489
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
@@ -7723,10 +7723,10 @@ msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
 #: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
-#: ../src/gui_interface.py:706 ../src/gui_interface.py:1449
-#: ../src/gui_interface.py:1490 ../src/message_window.py:222
-#: ../src/roster_window.py:3050 ../src/roster_window.py:3730
-#: ../src/roster_window.py:4558
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
 msgid "_Do not ask me again"
 msgstr "Не _спрашивать меня снова"
 
@@ -7753,7 +7753,7 @@ msgstr "Запрос на подписку для учетной записи %(
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:2364 ../src/gui_interface.py:2054
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
@@ -7804,11 +7804,11 @@ msgstr "В Jabber ID комнаты или сервера содержатся �
 msgid "The group chat Jabber ID contains invalid characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:2036
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:2629 ../src/gui_interface.py:2037
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
@@ -8315,6 +8315,11 @@ msgstr ""
 msgid "View cert..."
 msgstr "Просмотреть журнал"
 
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Сертификат владельца"
+
 #: ../src/disco.py:120
 msgid "Others"
 msgstr "Другие"
@@ -8402,20 +8407,20 @@ msgstr "Описание"
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1877 ../src/gui_interface.py:2572
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/disco.py:1878 ../src/gui_interface.py:2573
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната «%s» уже есть в ваших закладках."
 
-#: ../src/disco.py:1887 ../src/gui_interface.py:2587
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/disco.py:1888 ../src/gui_interface.py:2588
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
 
@@ -8760,34 +8765,34 @@ msgstr "Нет доступа к файлу"
 msgid "This file is being used by another process."
 msgstr "Файл занят другим процессом."
 
-#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл «%s»"
 
-#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
-#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:418 ../src/gtkgui_helpers.py:862
+#: ../src/filetransfers_window.py:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папка «%s» не доступна для записи"
 
-#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
@@ -9498,7 +9503,7 @@ msgid "Room is now fully-anonymous"
 msgstr "Конференция полностью анонимна"
 
 #: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
-#: ../src/gui_interface.py:605 ../src/roster_window.py:3325
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s был приглашен в комнату"
@@ -9647,12 +9652,12 @@ msgstr "Можете указать альтернативную комнату:
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2742
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2741
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -9677,47 +9682,47 @@ msgstr "_Сообщить об ошибке"
 msgid "Details"
 msgstr "Детали"
 
-#: ../src/gtkgui_helpers.py:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:392
+#: ../src/gtkgui_helpers.py:393
 #, 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:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не является основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Вы хотите сделать Gajim основным jabber-клиентом?"
 
-#: ../src/gtkgui_helpers.py:768
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
@@ -10031,11 +10036,16 @@ msgstr ""
 msgid "Ignore this error for this certificate."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: ../src/gui_interface.py:1372
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Подтверждение SSL сертификата"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Ошибка SSL сертификата"
 
-#: ../src/gui_interface.py:1373
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -10051,7 +10061,7 @@ msgstr ""
 "Новый отпечаток: %(new)s\n"
 "Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
 
-#: ../src/gui_interface.py:1445
+#: ../src/gui_interface.py:1447
 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?"
@@ -10059,24 +10069,24 @@ msgstr ""
 "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
 "(Установите PyOpenSSL, чтобы этого не происходило.)"
 
-#: ../src/gui_interface.py:1487
+#: ../src/gui_interface.py:1489
 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:1993 ../src/gui_interface.py:2016
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Смайлики выключены"
 
-#: ../src/gui_interface.py:1994
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Тема смайликов не найдена, они будут отключены."
 
-#: ../src/gui_interface.py:2017
+#: ../src/gui_interface.py:2019
 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 "
@@ -10085,30 +10095,30 @@ msgstr ""
 "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
 "emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2061 ../src/roster_window.py:3897
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2448
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gui_interface.py:3038
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: ../src/gui_interface.py:3039
+#: ../src/gui_interface.py:3044
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введите пароль для OpenPGP ключа %(keyid)s (аккаунт %(account)s)."
 
-#: ../src/gui_interface.py:3053
+#: ../src/gui_interface.py:3058
 msgid "OpenPGP key expired"
 msgstr "Срок действия ключа OpenPGP истёк"
 
-#: ../src/gui_interface.py:3054
+#: ../src/gui_interface.py:3059
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -10117,11 +10127,11 @@ msgstr ""
 "использования OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3063
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: ../src/gui_interface.py:3064
+#: ../src/gui_interface.py:3069
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Введите парольную фразу для OpenPGP еще раз или нажмите «Отмена»."
 
@@ -10129,7 +10139,7 @@ msgstr "Введите парольную фразу для OpenPGP еще ра�
 msgid "_New Group Chat"
 msgstr "В _новую комнату"
 
-#: ../src/gui_menu_builder.py:435
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
 
@@ -10302,35 +10312,35 @@ msgstr "Игнорировать"
 msgid "Plugin"
 msgstr "Модуль"
 
-#: ../src/plugins/gui.py:149
+#: ../src/plugins/gui.py:151
 #, python-format
 msgid "Warning: %s"
 msgstr "Предупреждение:  %s"
 
-#: ../src/plugins/gui.py:207
+#: ../src/plugins/gui.py:209
 msgid "Plugin failed"
 msgstr "Ошибка в модуле"
 
-#: ../src/plugins/gui.py:252
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr "Невозможно правильно удалить модуль"
 
 #. members not safe
-#: ../src/plugins/gui.py:260 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
 #: ../src/plugins/pluginmanager.py:534
 msgid "Archive is malformed"
 msgstr "Формат архива не поддерживается"
 
-#: ../src/plugins/gui.py:284 ../src/plugins/gui.py:292
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
 #: ../src/plugins/pluginmanager.py:542
 msgid "Plugin already exists"
 msgstr "Модуль уже существует"
 
-#: ../src/plugins/gui.py:284
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr "Перезаписать?"
 
-#: ../src/plugins/gui.py:314
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "Конфигурация"
 
@@ -10348,18 +10358,18 @@ msgstr "Архив пуст"
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:129 ../src/roster_window.py:3194
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: ../src/profile_window.py:132 ../src/roster_window.py:3197
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Файл не существует"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:146 ../src/profile_window.py:163
-#: ../src/roster_window.py:3199 ../src/roster_window.py:3210
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
@@ -10402,47 +10412,47 @@ msgstr ""
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:2061
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:2062
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: ../src/roster_window.py:2085
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:2086
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:2100
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:2101
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:2126
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP использовать невозможно"
 
-#: ../src/roster_window.py:2129
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
-#: ../src/roster_window.py:2336 ../src/roster_window.py:3827
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2337 ../src/roster_window.py:3828
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10450,37 +10460,37 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2363
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Закрыть Gajim?"
 
-#: ../src/roster_window.py:2430
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: ../src/roster_window.py:2431
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: ../src/roster_window.py:2521
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "Идет передача файлов"
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "Если выйти сейчас, передача файла остановится. Выйти?"
 
-#: ../src/roster_window.py:2553 ../src/roster_window.py:2990
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2554
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10488,16 +10498,16 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2991
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:2994
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: ../src/roster_window.py:2995
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10505,11 +10515,11 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:2998
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:3003
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10518,11 +10528,11 @@ msgstr ""
 "У вас больше не будет возможности приема и отправки сообщений через эти "
 "транспорты:%s."
 
-#: ../src/roster_window.py:3045
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы точно хотите заблокировать контакт?"
 
-#: ../src/roster_window.py:3047
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10531,57 +10541,57 @@ msgstr ""
 "него сообщения."
 
 #. it's jid
-#: ../src/roster_window.py:3086
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:3087
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:3094
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:3095
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:3140
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:3141
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:3181
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Назначить ключ OpenPGP"
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:3637
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» будет удален из вашего ростера"
 
-#: ../src/roster_window.py:3639
+#: ../src/roster_window.py:3637
 #, 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:3644
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10590,11 +10600,11 @@ msgstr ""
 "не сможет видеть ваш статус."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3650
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: ../src/roster_window.py:3654
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10602,16 +10612,16 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:3657
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3661
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:3666
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10621,12 +10631,12 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: ../src/roster_window.py:3724
+#: ../src/roster_window.py:3722
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Вы точно хотите послать другой статус?"
 
-#: ../src/roster_window.py:3726
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10636,20 +10646,20 @@ msgstr ""
 "вы не измените свой глобальный статус. Тогда этому контакту станет виден "
 "глобальный статус."
 
-#: ../src/roster_window.py:3745
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:3746
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:4458
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:4460
+#: ../src/roster_window.py:4458
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -10657,12 +10667,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Эта информация не будет "
 "сохранена при следующем подключении."
 
-#: ../src/roster_window.py:4552
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:4554
+#: ../src/roster_window.py:4552
 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 "
@@ -10672,11 +10682,11 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: ../src/roster_window.py:4675
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: ../src/roster_window.py:4687
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10684,17 +10694,17 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: ../src/roster_window.py:4822
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Отправить %s контакту %s"
 
-#: ../src/roster_window.py:4833
+#: ../src/roster_window.py:4831
 #, python-format
 msgid "Make %s first contact"
 msgstr "Сделать %s первым контактом"
 
-#: ../src/roster_window.py:4836
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
@@ -10704,129 +10714,129 @@ msgstr "Обьединить %s и %s в метаконтакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5296 ../src/roster_window.py:5350
-#: ../src/roster_window.py:5359 ../src/statusicon.py:277
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
 #: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
 #. add
-#: ../src/roster_window.py:5366
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:5371
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:5410 ../src/statusicon.py:340
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Управление _закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5430
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:5471
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:5531 ../src/roster_window.py:5639
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:5564
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: ../src/roster_window.py:5566
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "Отправлять Местоположение"
 
-#: ../src/roster_window.py:5569
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Настроить Сервисы..."
 
-#: ../src/roster_window.py:5717
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
-#: ../src/roster_window.py:5727 ../src/roster_window.py:5900
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:5735
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:5739
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5920
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5929
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Редактировать _группы"
 
 #. Send single message
-#: ../src/roster_window.py:5984
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
 #. Execute Command
-#: ../src/roster_window.py:6031
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:6041
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:6050
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
 #. Rename
-#: ../src/roster_window.py:6060
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:6120
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: ../src/roster_window.py:6129
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Переподсоединиться"
 
-#: ../src/roster_window.py:6136
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Выйти"
 
 #. History manager
-#: ../src/roster_window.py:6230
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:6245
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: ../src/roster_window.py:6473
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
diff --git a/po/sk.po b/po/sk.po
index 542ea6148..f2da75ac8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,15 +4,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -22,308 +18,298 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Stav"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Osobné udalosti"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Začať rozhovor..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "_Pripojiť sa k diskusnej skupine..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Pridať kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Vykonať príkaz..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Upraviť účet"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Otvoriť Gmail Inbox"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Osobné udalosti"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Začať rozhovor..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Stav"
+msgid "_Modify Account"
+msgstr "_Upraviť účet"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Pomocník - Tvorba účtu"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Pripája sa k serveru</b>\n"
-"\n"
-"Prosím počkajte..."
+"Potrebujete mať účet, aby ste sa mohli pripojiť\n"
+"do siete Jabber."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Chcem si za_registrovať nový účet"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prosím, vyberte jednu z možností dole:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Prosím, vyplňte údaje vášho existujúceho účtu</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Prosím, vyberte server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Heslo:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Uložiť hes_lo"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_ymná autentifikácia"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Pripojiť, keď stlačím Dokončiť"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Pomocník - Tvorba účtu"
+msgid "Anon_ymous authentication"
+msgstr "Anon_ymná autentifikácia"
 
 #: ../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ť"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Prosím, vyberte server</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Spravovať..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Použiť vlastný názov hostiteľa/portu"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Hostname:"
+msgstr "Názov _hostiteľa:"
 
 #: ../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"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Pokročilé"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Potrebujete mať účet, aby ste sa mohli pripojiť\n"
-"do siete Jabber."
+"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:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Pokročilé"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Dokončiť"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Názov _hostiteľa:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Pripája sa k serveru</b>\n"
+"\n"
+"Prosím počkajte..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "Pripojiť, keď stlačím Dokončiť"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Heslo:"
+msgid "Set my profile when I connect"
+msgstr "Nastaviť môj profil, keď som pripojený"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Dokončiť"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Rôzne</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Žiadny"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Účty"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Osobné informácie</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Pridať"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Odstrániť"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "_Upraviť  na stav"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Preme_novať"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Účet"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Povoliť"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Účty"
+msgid "Anonymous authentication"
+msgstr "Anonymná autentifikácia"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administrátorské operácie"
+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 ""
+"Zdroj je odoslaný na Jabber server, aby bolo možné odlíšiť rovnaké JID v "
+"dvoch alebo viacerých častiach závislých na čísle klientov pripojených na "
+"rovnaký server s rovnakým účtom. Takže môžete byť pripojený na rovnaký účet "
+"so zdrojmi ako 'Doma' alebo 'V práci', v rovnakom čase. Zdroj z najvyššou "
+"prioritou získava udalosti (viď nižšie)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonymná autentifikácia"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automaticky pripojiť, keď zlyhá spojenie"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Synchronizovať kontakty"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Prehliadať"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Kliknite pre požiadavku autorizácie pre všetky kontakty z iného účtu"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Prip_ojiť sa pri štarte programu Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "Zme_niť heslo"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Kliknite pre zmenu hesla účtu"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Zaškrtnite toto, ak sa má Gajim pýtať pred poslaním vášho hesla cez "
-"nezabezpečené spojenie."
+msgid "Administration operations"
+msgstr "Administrátorské operácie"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Vyberte súbor na odoslanie..."
+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 ""
+"Priorita v Jabberovi určuje, kto obdrží udalosť od jabber servera, keď je "
+"pripojených dvaja alebo viac klientov prostredníctvom jedného účtu; Klient s "
+"najvyššou priritou obdrží udalosť"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Vybrať _kľúč..."
+msgid "A_djust to status"
+msgstr "_Upraviť  na stav"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Kliknite pre zmenu hesla účtu"
+msgid "Priority will change automatically according to your status."
+msgstr "Priorita sa zmení automatický podľa stavu."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Kliknite pre požiadavku autorizácie pre všetky kontakty z iného účtu"
+msgid "Priori_ty:"
+msgstr "Priori_ta:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Certifikát podpísaný sám sebou"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Prip_ojiť sa pri štarte programu Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Spojenie"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Prvé meno:"
+msgid "Resour_ce:"
+msgstr "Z_droj:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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é"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Prehliadať"
 
 #: ../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 ""
-"Ak je zaškrtnuté, Gajim bude rozosielať informácie aj na niekoľko ďalších IP "
-"adries okrem vašej, takže je vyššia šanca, že prenos súborov bude fungovať."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certifikát odmietnutý"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Ak je zaškrtnuté, Gajim bude získavať heslo z GPG agenta podobného ako "
-"seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Certifikát podpísaný sám sebou"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Účet"
 
 #: ../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 ""
-"Ak je zaškrtnuté, Gajim bude posielať pakety na udržiavanie spojenia na "
-"zamedzenie straty spojenia, ktoré vyústi do odpojenia"
+msgid "C_onnect on Gajim startup"
+msgstr "Prip_ojiť sa pri štarte programu Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -334,6 +320,18 @@ msgstr ""
 "tento účet"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automaticky pripojiť, keď zlyhá spojenie"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synch_ronizovať stav účtu s globálnym stavom"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -342,176 +340,206 @@ msgstr ""
 "Ak je zaškrtnuté, každá zmena globálneho stavu (realizovaná rozbaľovacím "
 "menu na spodku zoznamu) spôsobí zmenu stavu aj v tomto účte"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ak vám nevyhovuje predvolený port na príjem správ, tu si môžete zvoliť "
-"vlastný.\n"
-"Zoberte v úvahu aj prípadné nastavenie firewallu."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgid "Use file transfer proxies"
+msgstr "Použiť proxy pre prenos súborov"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Posledné meno:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ak je zaškrtnuté, Gajim bude rozosielať informácie aj na niekoľko ďalších IP "
+"adries okrem vašej, takže je vyššia šanca, že prenos súborov bude fungovať."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Z_lúčiť účty"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Všeobecné"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Žiadny kľúč nie je vybraný"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "po_užiť premennú prostredia HTTP__PROXY"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Osobné informácie"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Spravovať..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_ta:"
+msgid "_Warn before using an insecure connection"
+msgstr "V_arovať pred použitím nezabezpečeného spojenia"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Priorita v Jabberovi určuje, kto obdrží udalosť od jabber servera, keď je "
-"pripojených dvaja alebo viac klientov prostredníctvom jedného účtu; Klient s "
-"najvyššou priritou obdrží udalosť"
+"Zaškrtnite toto, ak sa má Gajim pýtať pred poslaním vášho hesla cez "
+"nezabezpečené spojenie."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Priorita sa zmení automatický podľa stavu."
+msgid "Send _keep-alive packets"
+msgstr "Poslať pa_kety na udržiavanie spojenia"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Preme_novať"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Ak je zaškrtnuté, Gajim bude posielať pakety na udržiavanie spojenia na "
+"zamedzenie straty spojenia, ktoré vyústi do odpojenia"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Z_droj:"
+msgid "Use cust_om hostname/port"
+msgstr "Použiť vlastný názov h_ostiteľa/portu"
 
 #: ../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 ""
-"Zdroj je odoslaný na Jabber server, aby bolo možné odlíšiť rovnaké JID v "
-"dvoch alebo viacerých častiach závislých na čísle klientov pripojených na "
-"rovnaký server s rovnakým účtom. Takže môžete byť pripojený na rovnaký účet "
-"so zdrojmi ako 'Doma' alebo 'V práci', v rovnakom čase. Zdroj z najvyššou "
-"prioritou získava udalosti (viď nižšie)"
+msgid "_Hostname: "
+msgstr "Názov _hostiteľa: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Rôzne</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Poslať pa_kety na udržiavanie spojenia"
+msgid "Connection"
+msgstr "Spojenie"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synch_ronizovať stav účtu s globálnym stavom"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Žiadny kľúč nie je vybraný"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synchroni_zovať stav účtu s globálnym stavom"
+msgid "Choose _Key..."
+msgstr "Vybrať _kľúč..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronizovať kontakty"
+msgid "Use G_PG Agent"
+msgstr "Použit G_PG agenta"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
+"Ak je zaškrtnuté, Gajim bude získavať heslo z GPG agenta podobného ako "
+"seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Použit G_PG agenta"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Použiť vlastný názov h_ostiteľa/portu"
+msgid "_Edit Personal Information..."
+msgstr "_Upraviť osobné informácie..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Použiť vlastný p_ort:"
+msgid "Information about you, as stored in the server"
+msgstr "Informácie o vás sú uložené na serveri"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Použiť proxy pre prenos súborov"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Osobné informácie</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Osobné informácie"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Upraviť osobné informácie..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Prip_ojiť sa pri štarte programu Gajim"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Povoliť"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Synchroni_zovať stav účtu s globálnym stavom"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "Názov _hostiteľa: "
+msgid "Use cust_om port:"
+msgstr "Použiť vlastný p_ort:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Spravovať..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Ak vám nevyhovuje predvolený port na príjem správ, tu si môžete zvoliť "
+"vlastný.\n"
+"Zoberte v úvahu aj prípadné nastavenie firewallu."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Prvé meno:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Posledné meno:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "V_arovať pred použitím nezabezpečeného spojenia"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-mail:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "po_užiť premennú prostredia HTTP__PROXY"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Z_lúčiť účty"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "Úč_et:"
+msgid "Add New Contact"
+msgstr "Pridať nový kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "P_ovoliť tomuto kontaktu vidieť môj stav"
+msgid "A_ccount:"
+msgstr "Úč_et:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Pridať nový kontakt"
+msgid "_Protocol:"
+msgstr "_Protokol:"
 
-#: ../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 "Chcem si vás pridať do môjho zoznamu kontaktov."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Používateľské ID:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Prezývka:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Skupina:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "P_ovoliť tomuto kontaktu vidieť môj stav"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Požiadavky"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -522,7 +550,11 @@ msgstr ""
 "aby ste mohli pridať kontakt z tohto protokolu. \n"
 "Pre pokračocanie kliknite na tlačidlo registrovať."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registrácia"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -530,709 +562,506 @@ msgstr ""
 "Musíte byť pripojený k transportu, aby ste mohli\n"
 "pridať kontakt s použitím tohoto protokolu."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Skupina:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Prezývka:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registrácia"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Požiadavky"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Používateľské ID:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Vyskytla sa chyba:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc príkazy - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Vyberte príkaz na vykonanie:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Prosím počkajte, prebieha získavanie zoznamu príkazov..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc príkazy - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Vyberte príkaz na vykonanie:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Skontrolovať ešte raz"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Popis chyby..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Prosím počkajte, prebieha odosielanie príkazu..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Dokončiť"
+msgid "Please wait..."
+msgstr "Prosím čakajte..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Prosím počkajte, prebieha získavanie zoznamu príkazov..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Táto jabber entita neposkytuje žiadny príkaz."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Prosím počkajte, prebieha odosielanie príkazu..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Vyskytla sa chyba:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Prosím čakajte..."
+msgid "Error description..."
+msgstr "Popis chyby..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Táto jabber entita neposkytuje žiadny príkaz."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Dokončiť"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Popis</b>"
+msgid "Advanced Configuration Editor"
+msgstr "Editor rozšírenej konfigurácie"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>POZNÁMKA:</b> Musíte reštartovať Gajim, aby boli použité zmeny"
+msgid "Filter:"
+msgstr "Filter:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor rozšírenej konfigurácie"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Popis</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>POZNÁMKA:</b> Musíte reštartovať Gajim, aby boli použité zmeny"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Náv_rat k pôvodnému nastaveniu farieb"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Odstrániť správu dňa"
+msgid "Show _XML Console"
+msgstr "Zobraziť _XML konzolu"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "_Upraviť súkromné zoznamy..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrátor"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Poslať serverovú správu..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Nastaviť správu dňa..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Nastavovať správu dňa"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Zobraziť _XML konzolu"
+msgid "Set MOTD..."
+msgstr "Nastaviť správu dňa..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Aktualizovať správu dňa..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Aktualizovať správu dňa..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrátor"
+msgid "Delete MOTD"
+msgstr "Odstrániť správu dňa"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Poslať serverovú správu..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "okno/karta bola otvorená s týmto kontaktom "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Akcie</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Podmienky</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Zvuky</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Pokročilé akcie"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Pokročilé nastavenie oznámení"
-
-#: ../data/gui/advanced_notifications_window.ui.h: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:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Preč"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Zaneprázdnený"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt zmenil stav"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt odpojený"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Nemá "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Prenos súborov"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Požiadavka na prenos súboru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Prenos súboru zastavený"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Zvýraznenie správ v diskusnej skupine"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Prijatá správa - diskusná skupina"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Má"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Neviditeľný"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Vykonať príkaz"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Neprítomný"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Jeden alebo viac špeciálnych stavov..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Prítomný / Mám čas na debatu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Prehrať zvuk"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nová súkromná správa"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kedy"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktivovať vlastnosť urgentného upozornenia - okno v zozname úloh bude blikať"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "Z_akázať automatické otváranie diskusných okien"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "Z_akázať existujúce vyskakovacie okná"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "Z_akázať zvuky pre túto udalosť"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "Z_akázať zobrazovanie udalostí v zozname"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informovať ma pomocou vyskakovacieho okna"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Otvoriť okno rozhovoru s používateľom"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Zobraziť udalosť v zozname"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Zobraziť udalosť v zozname"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "a ja"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontakty"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "pre "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Skupiny"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "keď som v"
+msgid "Deletes Message of the Day"
+msgstr "Odstráni správu dňa"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Žiadny"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Predvoľby"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Automaticky pripojiť"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Žiadny"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Predvoľby"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Automaticky pripojiť"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Záznam:"
+msgid "New entry received"
+msgstr "Prijatý nový záznam"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Dostali ste novú položku:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Názov kanálu:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Záznam:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Posledná zmena:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Prijatý nový záznam"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Dostali ste novú položku:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Odblokovať"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Správa:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Nastaviť aktivitu"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Nastaviť aktivitu"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Správa:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Správa:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Nálada:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Správa:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Vložte ešte raz pre potvrdenie:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Vložte nové heslo:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Vložte ešte raz pre potvrdenie:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Zadajte vašu novú správu o stave</b>"
+msgid "Save as Preset..."
+msgstr "Uložiť ako prednastavené..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivita:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Nálada:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivita:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Prednastavené správy:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Uložiť ako prednastavené..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Zadajte vašu novú správu o stave</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "_Pripojiť sa k diskusnej skupine"
+msgid "_Copy Link Location"
+msgstr "_Kopírovať umiestnenie odkazu"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Pridať do zoznamu..."
+msgid "_Open Link in Browser"
+msgstr "_Otvoriť odkaz v prehliadači"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopírovať JID/e-mailovú adresu"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopírovať umiestnenie odkazu"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Otvoriť tvorbu E-mailu"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otvoriť odkaz v prehliadači"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "_Pripojiť sa k diskusnej skupine"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Pridať do zoznamu..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Pridať tento kontakt do zoznamu (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozvať kontakty do rozhovoru (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Pozvať kontakty do rozhovoru (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Prehliadať históriu rozhovoru (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Zobraziť ponuku pokročilých funkcií (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Poslať správu"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Poslať"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr "9"
 
-#: ../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ť"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Poz_vať"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozvať priateľov!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC server"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Prosím, zvolte MUC server."
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
+msgid "MUC server"
+msgstr "MUC server"
+
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Poz_vať"
 
 #: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "P_ožiadať jeho/ju o súhlas k zobrazeniu stavu"
+msgid "Start _Chat"
+msgstr "Začať _rozhovor"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Pridať špeciálne oz_námenie..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Poslať krátku _správu..."
 
 #: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Prideliť Open_PGP kľúč..."
-
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "Vy_konať príkaz..."
-
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Upraviť _skupiny..."
+msgid "Send _File..."
+msgstr "Poslať _súbor..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Poz_vať do"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Pozvať _kontakty"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "O_dstrániť"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Prepnúť Open_PGP šifrovanie"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Prepnúť na End to End šifrovanie"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Poslať vlas_tný stav"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "Vy_konať príkaz..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Poslať krátku _správu..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "S_pravovať kontakt"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Poslať _súbor..."
+msgid "_Rename..."
+msgstr "_Premenovať..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Nastaviť vlastný _avatar..."
+msgid "Edit _Groups..."
+msgstr "Upraviť _skupiny..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Začať _rozhovor"
+msgid "Assign Open_PGP Key..."
+msgstr "Prideliť Open_PGP kľúč..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Prepnúť na End to End šifrovanie"
+msgid "Set Custom _Avatar..."
+msgstr "Nastaviť vlastný _avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Prepnúť Open_PGP šifrovanie"
+msgid "Add Special _Notification..."
+msgstr "Pridať špeciálne oz_námenie..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Požiadavky"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Povoliť jemu/jej vidieť môj stav"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "P_ovoliť tomuto kontaktu vidieť môj stav"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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ť"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "P_ožiadať jeho/ju o súhlas k zobrazeniu stavu"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_História"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorovať"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blokovať"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "S_pravovať kontakt"
+msgid "_Unignore"
+msgstr "_Neignorovať"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Premenovať..."
+msgid "_Ignore"
+msgstr "_Ignorovať"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Požiadavky"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "O_dstrániť"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Neignorovať"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_História"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Vyplňte formulár."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfigurácia miestnosti"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Vyplňte formulár."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Upraviť skupiny"
@@ -1245,56 +1074,47 @@ msgstr "(<b>ESession</b> informácie)"
 msgid "_Verify"
 msgstr "O_veriť"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Funkcie"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Zoznam možných funkcií v Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Funkcie"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
+msgid "File Transfers"
+msgstr "Prenos súborov"
 
 #: ../data/gui/filetransfers.ui.h:2
-#, fuzzy
-msgid "Cancel file transfer"
-msgstr "Zrušiť prenos vybraných súborov"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Zobraziť zoznam prenosov súborov medzi vami a ostatnými"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Zrušiť prenos vybraných súborov"
+msgid "file transfers list"
+msgstr "zoznam prenosu súborov"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Zrušiť prenos vybraných súborov a odstrániť nekompletné súbory"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Vyč_istiť"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Upozorniť ma, keď sa dokončí prenos"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Prenos súborov"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Skrývanie okien"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Odstráni dokončené, zrušené a zlyhané prenosy súborov zo zoznamu"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Odstrániť prenos súboru zo zoznamu."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Odstráni dokončené, zrušené a zlyhané prenosy súborov zo zoznamu"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Zobraziť zoznam prenosov súborov medzi vami a ostatnými"
-
-#: ../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"
@@ -1302,82 +1122,109 @@ msgstr ""
 "Táto akcia odstráni jeden prenos súborov zo zoznamu. Ak je prenos aktívny, "
 "je najskôr zastavený a potom odstránený"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Vyč_istiť"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pozastaviť"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Zrušiť prenos vybraných súborov a odstrániť nekompletné súbory"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Pokračovať"
+#: ../data/gui/filetransfers.ui.h:13
+#, fuzzy
+msgid "Cancel file transfer"
+msgstr "Zrušiť prenos vybraných súborov"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Upozorniť ma, keď sa dokončí prenos"
+msgid "Cancels the selected file transfer"
+msgstr "Zrušiť prenos vybraných súborov"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Otvoriť priečinok s obsahom"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Skrývanie okien"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pozastaviť"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Pokračovať"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "zoznam prenosu súborov"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Otvoriť priečinok s obsahom"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Farby kariet diskusného okna</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Účet"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Tučné"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Skupina"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Píše správu"
+msgid "Gajim Themes Customization"
+msgstr "Úprava tém programu Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "Farba _textu:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Štýl fontu:"
+msgid "_Background:"
+msgstr "_Pozadie:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Úprava tém programu Gajim"
+msgid "Text _font:"
+msgstr "Farba _písma:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Minulé"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Skupina"
+msgid "Font style:"
+msgstr "Štýl fontu:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktívny"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Tučné"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kurzíva"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pozastavené"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Píše správu"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Neaktívny"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Farby kariet diskusného okna</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Minulé"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1385,7 +1232,7 @@ msgstr ""
 "MUC\n"
 "Správy"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1393,106 +1240,100 @@ msgstr ""
 "MUC prichádzajúce\n"
 "správy"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pozastavené"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Farba _textu:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Farba _písma:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Pozadie:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Zmeniť p_rezývku..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "S_pravovať miestnosť"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Zmeniť _predmet..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Nastaviť _miestnosť..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "Zálož_ky"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Zničiť miestnosť"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "S_pravovať miestnosť"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimalizovať pri zavretí"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Hlas"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "Zálož_ky"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derátor"
+msgid "_Send Private Message"
+msgstr "_Poslať súkromnú správu"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Poslať _súbor"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "Pokročilé akcie"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Poslať _súbor"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Pridať do zoznamu"
+msgid "_Voice"
+msgstr "_Hlas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derátor"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Člen"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Zakázať"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Vlastník"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Vykopnúť"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Člen"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Vlastník"
+msgid "_Ban"
+msgstr "_Zakázať"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Poslať súkromnú správu"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Hlas"
+msgid "_Add to Roster"
+msgstr "_Pridať do zoznamu"
 
-#: ../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:2 ../src/chat_control.py:1723
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Zmeniť vašu prezývku (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Zazáložkovať túto miestosť (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1504,40 +1345,19 @@ msgid "From:"
 msgstr "Od:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Predmet:"
 
 #: ../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."
-msgstr ""
-"<b>UPOZORNENIE:</b>\n"
-"Ak plánujete rozsiahlejšie odstraňovanie, uistite sa prosím, že Gajim "
-"nebeží. Spravidla sa vyvarujte odstraňovaniu v kontaktoch, s ktorými "
-"prebieha rozhovor."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim - správca histórie"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Odstrániť"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Exportovať"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim - správca histórie"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1551,172 +1371,199 @@ msgstr ""
 "Použite tento program k odstráneniu alebo exportovaniu záznamov. Môžete "
 "vybrať záznam z ľava a/alebo dole hľadať v databáze."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>UPOZORNENIE:</b>\n"
+"Ak plánujete rozsiahlejšie odstraňovanie, uistite sa prosím, že Gajim "
+"nebeží. Spravidla sa vyvarujte odstraňovaniu v kontaktoch, s ktorými "
+"prebieha rozhovor."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Hľadať v databáze"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Všetky stavy"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "História konverzácie"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Exportovať"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Meno kontaktu"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Diskuné skupiny"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Všetky stavy"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "História konverzácie"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Hľadať:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Zaznamenávať históriu k_onverzácie"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Zaznamenať zmenu stavu kontaktu"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "ostatné"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "ostatné"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Prihlásiť sa do miestnosti automaticky, keď sa pripojím"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Miestnosť:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Prezývka:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Posledné:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Posledné:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Prihlásiť sa do miestnosti automaticky, keď sa pripojím"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Miestnosť:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Zazáložkovať túto miestnosť"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Zazáložkovať túto miestnosť"
+msgid "Bro_wse Rooms"
+msgstr "_Prehliadať"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Pripojiť"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automaticky pripojiť"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Ak je zaškrtnuté, Gajim sa pripojí do diskusnej skupiny pri štarte"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Spravovať záložky"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimalizovať pri automatickom pripojení"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titulok:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Vypísať stav:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automaticky pripojiť"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Ak je zaškrtnuté, Gajim sa pripojí do diskusnej skupiny pri štarte"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titulok:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimalizovať pri automatickom pripojení"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1727,97 +1574,100 @@ msgid "_Configure"
 msgstr "_Nastavovať"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Predvoľby</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Pripojený"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Nastavenia</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Pripojený"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Spravovať Proxy profily"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Typ:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "He_slo:"
+msgid "_Name:"
+msgstr "_Názov:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "_Hostiteľ proxy:"
+msgid "<b>Properties</b>"
+msgstr "<b>Predvoľby</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "_Port proxy:"
+msgid "Use HTTP prox_y"
+msgstr "Použiť HTTP prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Použiť HTTP prox_y"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Použiť proxy aut_entifikáciu"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Používateľské meno:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "He_slo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Názov:"
+msgid "Proxy _Host:"
+msgstr "_Hostiteľ proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Typ:"
+msgid "Proxy _Port:"
+msgstr "_Port proxy:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Používateľské meno:"
+msgid "<b>Settings</b>"
+msgstr "<b>Nastavenia</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Spravovať účty"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passfráza"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torizovať"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Prítomný"
+msgid "Version:"
+msgstr "Verzia GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Nastavovať"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Popis:"
+msgid "Authors:"
+msgstr "Au_torizovať"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1825,38 +1675,31 @@ msgid "Homepage:"
 msgstr "<b>Domovská stránka:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
-msgid "Installed"
-msgstr ""
+#, fuzzy
+msgid "Description:"
+msgstr "Popis:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Nastavovať"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
+msgid "Installed"
 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"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1870,214 +1713,292 @@ msgid "Event desc"
 msgstr "Udalosť"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor rozšírenej konfigurácie</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Vždy použiť štandartné aplikácie OS/X"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikácie</b>"
+msgid "Custom"
+msgstr "Vlastný"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Zvuk</b>"
+#, fuzzy
+msgid "All chat states"
+msgstr "Všetky stavy"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatický stav</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Píše správu"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Vzhľad rozhovoru</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Zakázané"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Farby riadku rozhovoru</b>"
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Oznámenia stavu rozhovoru</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikdy\n"
+"Len ak čakajú udalosti\n"
+"Vždy"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Pripojenie</b>"
+#, fuzzy
+msgid "Always"
+msgstr "Preč"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr ""
 
-#. 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>Vlastné</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Písmo</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Zobraziť udalosť v zozname"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Nastavenia GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Vrátiť pôvodnú správu o stave</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Súkromie</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Vzhľad zoznamu</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Posledný stav: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Správy o stave</b>"
+msgid "Preferences"
+msgstr "Predvoľby"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Témy</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Zobraziť a_vatary v zozname kontaktov"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+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:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Vizuálne oznámenie</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(príklad: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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:23
-msgid "Advanced"
-msgstr "Pokročilé"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Zobraziť _pozíciu kontaktov v zozname"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Pokročilé..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Všetky stavy"
+msgid "Sort contacts by status"
+msgstr "Usporiadať kontakty podľa stavu"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Povoliť _odosielanie informácie o operačnom systéme"
+#, fuzzy
+msgid "in _roster"
+msgstr "Nie je v zozname"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Povoliť _odosielanie informácie o operačnom systéme"
+msgid "in _group chats"
+msgstr "v _diskusných skupiných"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Povoliť vyskakovacie okná/oznámenia v stavoch _preč/nedostupný/zamestnaný/"
-"neviditeľný"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Vzhľad zoznamu</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Povoliť zvuk keď som zane_prázdnený"
+msgid "_Window behavior:"
+msgstr "_Správanie okna:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Preč"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ak nie je zakázané, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
+"grafickým obrázkom"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Vyžiadať správu o stave, keď som:"
+msgid "_Emoticons:"
+msgstr "_Emotikony:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr "Zvuk / Video"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Zmeniť okno správ na _kompaktné"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "Vstupné zariadenie zvuku"
+msgid "Hide all buttons in chat windows"
+msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "Výstupné zariadenie zvuku"
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorovať rozšírený obsah prichádzajúcich správ"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Správa rozhovoru:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Kontrolovať pri spustení, či je Gajim pre_dvoleným Jabber klientom"
+msgid "_Highlight misspelled words"
+msgstr "_Zvýrazniť zle napísané slová"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Píše správu"
+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 ""
+"Ak je zaškrtnuté, Gajim bude zvýrazňovať pravopisné chyby vo vstupných "
+"poliach okna rozhovoru. Ak nie je výlučne nastavený žiadny jazyk, kliknite "
+"pravým na vstupné pole, predvolený jazyk bude použitý pre tento kontakt "
+"alebo diskusnú skupinu."
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Nastavovať farbu a písmo rozhrania"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Zobraziť _zoznam"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "Správa kontaktu:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "Prezývka kontaktu:"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Vlastný"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Vzhľad rozhovoru</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Keď nastane nová udalosť:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Zakázané"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Povoliť vyskakovacie okná/oznámenia v stavoch _preč/nedostupný/zamestnaný/"
+"neviditeľný"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Zobraziť _aktivitu kontaktov v zozname kontaktov"
+msgid "Notify on new _GMail email"
+msgstr "Upozorniť keď príde na _Gmail e-mail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Zobraziť ďalši_e podrobnosti o e-maile"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Ak je zaškrtnuté, Gajim zobrazí oznámenie, keď bude prijatý nový e-mail cez "
+"GMail"
 
 #: ../data/gui/preferences_window.ui.h:49
-msgid "Display _location of contacts in roster"
-msgstr "Zobraziť _pozíciu kontaktov v zozname"
+msgid "Display _extra email details"
+msgstr "Zobraziť ďalši_e podrobnosti o e-maile"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Zobraziť _hudbu kontaktov v zozname kontaktov"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of 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:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Zobraziť a_vatary v zozname kontaktov"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Nastavenia GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Zobraziť _náladu kontaktov v zozname kontaktov"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizuálne oznámenie</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Prehrať _zvuky"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "_Spravovať..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Povoliť zvuk keď som zane_prázdnený"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Zvuky</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Oznámenia"
+
+#: ../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 "
@@ -2087,7 +2008,11 @@ msgstr ""
 "inou osobou. Tu môžete vybrať stavy, ktoré majú byť zobrazované v diskusnom "
 "okne."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "Zo_braziť oznámenia o stave rozhovoru:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2097,804 +2022,733 @@ 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: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 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:58
-msgid "Hide all buttons in chat windows"
-msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
-"používate"
-
-#: ../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: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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
-"používaný počítač."
+msgid "_Send chat state notifications:"
+msgstr "Odo_slať oznámenia o stave rozhovoru:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname kontaktov a v "
-"oknách s diskusnými skupinami."
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Oznámenia stavu rozhovoru</b>"
 
 #: ../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 ""
-"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"
+msgid "Personal Events"
+msgstr "Osobné udalosti"
 
 #: ../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."
+msgid "_Away after:"
+msgstr "_Preč po:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so zoznamom "
-"kontaktovi."
+"Ak je zaškrtnuté, Gajim zmení stav na Preč, keď nebude používaný počítač."
 
 #: ../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."
+msgid "_Not available after:"
+msgstr "_Neprítomný po:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Ak je zaškrtnuté, Gajim bude zobrazovať hudbu kontaktov v okne so zoznamom "
-"kontaktov"
+"Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
+"používaný počítač."
 
 #: ../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 ""
-"Ak je zaškrtnuté, Gajim bude zvýrazňovať pravopisné chyby vo vstupných "
-"poliach okna rozhovoru. Ak nie je výlučne nastavený žiadny jazyk, kliknite "
-"pravým na vstupné pole, predvolený jazyk bude použitý pre tento kontakt "
-"alebo diskusnú skupinu."
+msgid "minutes"
+msgstr "minút"
 
 #: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
 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 ""
-"Ak je zaškrtnuté, Gajim bude ignorovať prichádzajúce udalosti od "
-"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: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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Ak je zaškrtnuté, Gajim zobrazí oznámenie, keď bude prijatý nový e-mail cez "
-"GMail"
+"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:73
+#, fuzzy
 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 ""
-"Ak je zaškrtnuté, Gajim bude používať ikonky špecifické pre protokol. (napr. "
-"kontakt z MSN bude mať ekvivalentné ikonky pre stavy prítomný, preč, "
-"zaneprázdnený, atď...)"
-
-#: ../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 ""
-"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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Ak nie je zakázané, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
-"grafickým obrázkom"
+"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:76
-msgid "Log _encrypted chat session"
-msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatický stav</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Zmeniť okno správ na _kompaktné"
+msgid "Ask status message when I:"
+msgstr "Vyžiadať správu o stave, keď som:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "_Spravovať..."
+msgid "Sign _in"
+msgstr "Prihlás_il sa"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "Server"
+msgid "Sign _out"
+msgstr "_Odhlásil sa"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Oznámenia"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Správy o stave</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Vrátiť pôvodnú správu o stave</b>"
 
-#: ../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:83 ../src/config.py:398
+msgid "Status"
+msgstr "Stav"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Upozorniť keď príde na _Gmail e-mail"
+msgid "Use system _default"
+msgstr "Použiť systémové _nastavenia"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Nikdy\n"
-"Len ak čakajú udalosti\n"
-"Vždy"
+msgid "Chat message:"
+msgstr "Správa rozhovoru:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Osobné udalosti"
+msgid "<b>Font</b>"
+msgstr "<b>Písmo</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Prehrať _zvuky"
+msgid "Use _transports icons"
+msgstr "Použiť ikony _transportov"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 msgstr ""
+"Ak je zaškrtnuté, Gajim bude používať ikonky špecifické pre protokol. (napr. "
+"kontakt z MSN bude mať ekvivalentné ikonky pre stavy prítomný, preč, "
+"zaneprázdnený, atď...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Predvoľby"
+msgid "Status _iconset:"
+msgstr "Zostava stavových _ikôn:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Nastavovať farbu a písmo rozhrania"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "_Téma:"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "STUN server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Témy</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-#, fuzzy
-msgid "Show notification area icon:"
-msgstr "Notification-daemon"
+msgid "Contact's nickname:"
+msgstr "Prezývka kontaktu:"
 
 #: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
-msgid "Show only in roster"
-msgstr "_Zobraziť udalosť v zozname"
+msgid "Your nickname:"
+msgstr "Vaša prezývka:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Prihlás_il sa"
+msgid "_Status message:"
+msgstr "_Správa o stave:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Odhlásil sa"
+msgid "_URL highlight:"
+msgstr "Zvýrazňovanie _URL:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "Náv_rat k pôvodnému nastaveniu farieb"
 
 #: ../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 ""
-"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."
+msgid "Contact's message:"
+msgstr "Správa kontaktu:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Usporiadať kontakty podľa stavu"
+msgid "Your message:"
+msgstr "Vaša správa:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Stav"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Zvýraznenie správ v diskusnej skupine"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Zostava stavových _ikôn:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Farby riadku rozhovoru</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Štýl"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Téma:"
+msgid "Audio input device"
+msgstr "Vstupné zariadenie zvuku"
 
 #: ../data/gui/preferences_window.ui.h:104
-#, fuzzy
-msgid ""
-"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 ""
-"Automatická správa pre stav preč. Ak je prázdna, Gajim nebude meniť súčasnú "
-"stavovú správu o stave"
+msgid "Audio output device"
+msgstr "Výstupné zariadenie zvuku"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "<b>Audio</b>"
+msgstr "<b>Zvuk</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
+msgstr "Vstupné zariadenie videa"
 
 #: ../data/gui/preferences_window.ui.h:107
+msgid "Video output device"
+msgstr "Výstupné zariadenie videa"
+
+#: ../data/gui/preferences_window.ui.h:108
 #, fuzzy
-msgid ""
-"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 ""
-"Automatická správa pre stav neprítomný. Ak je prázdna, Gajim nebude meniť "
-"súčasnú správu o stave"
+msgid "Video framerate"
+msgstr "Video test"
+
+#: ../data/gui/preferences_window.ui.h:109
+#, fuzzy
+msgid "Video size"
+msgstr "Video test"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Použiť ikony _transportov"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-#, fuzzy
-msgid "Use default applications"
-msgstr "Vždy použiť štandartné aplikácie OS/X"
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Použiť systémové _nastavenia"
+msgid "STUN server:"
+msgstr "STUN server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-#, fuzzy
-msgid "Video framerate"
-msgstr "Video test"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(príklad: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr "Vstupné zariadenie videa"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
-msgstr "Výstupné zariadenie videa"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-#, fuzzy
-msgid "Video size"
-msgstr "Video test"
+msgid "<b>Connection</b>"
+msgstr "<b>Pripojenie</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "Keď nastane nová udalosť:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Zvuk / Video"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "Vaša správa:"
+msgid "_File manager:"
+msgstr "_Správca súborov:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "Vaša prezývka:"
+msgid "_Mail client:"
+msgstr "_E-mailový klient:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Preč po:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Prehliadač:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Zo_braziť oznámenia o stave rozhovoru:"
+msgid "<b>Custom</b>"
+msgstr "<b>Vlastné</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emotikony:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikácie</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Správca súborov:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Zvýrazniť zle napísané slová"
+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 ""
+"Ak je zaškrtnuté, Gajim bude ignorovať prichádzajúce udalosti od "
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Povoliť _odosielanie informácie o operačnom systéme"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorovať rozšírený obsah prichádzajúcich správ"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
+"používate"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Zaznamenať zmenu stavu kontaktu"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Povoliť _odosielanie informácie o operačnom systéme"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_E-mailový klient:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
+"používate"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Neprítomný po:"
+msgid "Log _encrypted chat session"
+msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Otvoriť..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "Náv_rat k pôvodnému nastaveniu farieb"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Povoliť _odosielanie informácie o operačnom systéme"
 
 #: ../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:134
-msgid "_Status message:"
-msgstr "_Správa o stave:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "Zvýrazňovanie _URL:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Súkromie</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Správanie okna:"
+msgid "_Log status changes of contacts"
+msgstr "_Zaznamenať zmenu stavu kontaktu"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "v _diskusných skupiných"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _roster"
-msgstr "Nie je v zozname"
+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:139
-msgid "minutes"
-msgstr "minút"
+msgid "_Open..."
+msgstr "_Otvoriť..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor rozšírenej konfigurácie</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Pokročilé"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Súkromné zoznamy:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Pridať / zmeniť pravidlo</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Súkromný zoznam"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Zoznam pravidiel</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Súkromný zoznam</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktívne pre toto sedenie"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktivovať pri každom spustení"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Zoznam pravidiel</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Všetko"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Pridať / zmeniť pravidlo</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "všetko podľa podpisu"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Povoliť"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Zakázať"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "všetko v skupine"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Poradie:"
+msgid "all by subscription"
+msgstr "všetko podľa podpisu"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Súkromný zoznam"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Všetko"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "všetko podľa podpisu"
+msgid "to send me messages"
+msgstr "poslať mi správu"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "všetko v skupine"
+msgid "to send me queries"
+msgstr "poslať mi požiadavky"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Oba"
+msgid "to view my status"
+msgstr "vidieť môj stav"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Od"
+msgid "to send me status"
+msgstr "poslať mi stav"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "jeden"
+msgid "All (including subscription)"
+msgstr "všetko podľa podpisu"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dva"
+msgid "Order:"
+msgstr "Poradie:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "poslať mi správu"
+#, fuzzy
+msgid "none"
+msgstr "jeden"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "poslať mi požiadavky"
+#, fuzzy
+msgid "both"
+msgstr "Oba"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "poslať mi stav"
+#, fuzzy
+msgid "from"
+msgstr "Od"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "vidieť môj stav"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresa</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "dva"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Narodeniny:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Mesto:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Priezvisko:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Spoločnosť:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Krajina:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Druhé meno:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Oddelenie:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Titul pred:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Ďaľšia adresa:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Krstné meno:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Priezvisko:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Titul za:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Celé meno</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Ulica:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Krstné meno:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Mesto:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Domovská stránka:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Štát:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Ďaľšia adresa:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Druhé meno:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>PSČ:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Meno:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Krajina:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Prezývka:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresa</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefónne č.:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Domovská stránka:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Pozícia:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Meno:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>PSČ:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Prezývka:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefónne č.:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Titul pred:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Formát: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Úloha:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Narodeniny:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Štát:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Ulica:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Kliknite pre výber avataru"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Titul za:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Osobné informácie"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Spoločnosť:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "O mne"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Pozícia:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Kliknite pre výber avataru"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Oddelenie:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formát: YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Úloha:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Osobné informácie"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Práca"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Čo si prajete vykonať?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "O mne"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 #, fuzzy
 msgid "Remove account _only from Gajim"
 msgstr "Odstrániť iba z programu Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstrániť účet z Gajim aj zo _serveru"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Čo si prajete vykonať?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "O_dstrániť"
 
 #: ../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."
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Pridať k_ontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "Fu_nkcie"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Akcie"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Prenos _súborov"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Pridať k_ontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Často kladené otázky (online)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Upraviť"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Pomocník online"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "Úč_ty"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, a_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Zobraziť"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Zobraziť _odhlásené kontakty"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Zobraziť len _aktívne kontakty"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Zobraziť trans_porty"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Zobraziť _odhlásené kontakty"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "Úč_ty"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Prenos _súborov"
 
-#. 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 "_Akcie"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Pomocník"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "Ob_sah"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Upraviť"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Pomocník online"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "Často k_ladené otázky"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Pomocník"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Poslať krátku _správu..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Často kladené otázky (online)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Zobraziť"
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fu_nkcie"
 
 #: ../data/gui/search_window.ui.h:1
+msgid "Search"
+msgstr "Hľadať"
+
+#: ../data/gui/search_window.ui.h:2
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Prosím počkajte, prebieha získavanie zoznamu príkazov..."
 
-#: ../data/gui/search_window.ui.h:2
-msgid "Search"
-msgstr "Hľadať"
-
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Pridať kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Informácie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Hľadať"
 
@@ -2914,41 +2768,37 @@ msgstr "Registrovaný na"
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Odpoveď na túto správu"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Pre:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Poš_li"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Poslať správu"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Poslať správu a zatvoriť okno"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Odpovedať"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Pre:"
+msgid "Reply to this message"
+msgstr "Odpoveď na túto správu"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Odpovedať"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Poslať a zatvoriť"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Poslať správu a zatvoriť okno"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torizovať"
+msgid "Subscription Request"
+msgstr "Požiadavka o zapísanie"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
+msgid "_Deny"
+msgstr "_Zakázať"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2956,263 +2806,275 @@ msgid ""
 "connected"
 msgstr ""
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Požiadavka o zapísanie"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torizovať"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Zakázať"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Synchronizovať kontakty"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Zvoľte účet, s ktorým sa chcete synchronizovať"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Vyberte kontakty, ktoré chcete synchronizovať"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronizovať: vyberte kontakty"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Stlmiť zvuky"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Poslať krátku _správu"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Zobraziť všetky čakajúce _udalosti"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Vyberte kontakty, ktoré chcete synchronizovať"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Diskusná skupina"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Požiadavka:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Poslať krátku _správu"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klient:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Štát:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Stlmiť zvuky"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontaktné informácie"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Zdroj:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Stav:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Podpis:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klient:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Systém:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentáre"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Štát:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Nastavovaný avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Podpis:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kontaktné informácie"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Požiadavka:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Viac"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Používa avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Písmo</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentáre"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber prevádzka</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML vstup</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Požiadavka"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Písmo</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Požiadavka"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Prítomnosť"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Správa"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Prítomnosť"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML vstup</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Upraviť účet"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Miestne jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Osobné"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klient"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Osobné"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim - internetový komunikátor"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klient"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Zrušiť potvrdenie"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neplatná miestnosť"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Služba zmenila identifikátor relácie."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc príkazy - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktivovaná"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Deaktivovaná"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Logický"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Celočíselný"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Farba"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Názov vlastnosti"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Žiadny)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Skryté"
 
@@ -3224,270 +3086,214 @@ msgstr[0] "Dostali ste novú položku:"
 msgstr[1] "Dostali ste novú položku:"
 msgstr[2] "Dostali ste novú položku:"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Angličtina"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Bieloruština"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulharčina"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretónčina"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Čeština"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Nemčina"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Gréčtina"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Britština"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Španielčina"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Baskičtina"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francúzština"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Chorvátčina"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Taliančina"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Nórčina (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandština"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Nórčina"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Poľština"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugalčina"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazílska portugalčina"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruština"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Srbština"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovenčina"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Švédčina"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Čínština (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Jazyk používaný pri kontrole pravopisu"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Chyba."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Podčiarknuté"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Preškrtnuté"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Písmo"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Vymazať formátovanie"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Skutočne poslať súbor?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "Povolené GPG šifrovanie"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Tento kontakt nepodporuje prenos súborov."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Prepnúť zvukovú reláciu"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Prepnúť video reláciu"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Funkcia nie je dostupná pod Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Poslať _súbor"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Tento kontakt nepodporuje prenos súborov."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Nie je priradený GPG kľúč"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
+"K tomuto kontaktu nie je priradený GPG kľúč. Preto nemôžete šifrovať správy."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "Zakázané GPG šifrovanie"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Relácia BUDE zaznamenaná"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Relácia NEBUDE zaznamenaná"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NIE je"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NEbude"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "a overený"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Relácia NEBUDE zaznamenaná"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Táto relácia je šifrovaná"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " a BUDE zaznamenaná"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " a NEBUDE zaznamenaná"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3495,38 +3301,39 @@ msgstr ""
 "Identita vzdialeného kontaktu nie je overená. Pre viac podrobností kliknite "
 "na tlačidlo v tvare štítu."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Nasledujúca správa NEbola šifrovaná"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, 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:2567
+#: ../src/chat_control.py:2799
 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: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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3535,227 +3342,584 @@ 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Prenos súborov"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Veľkosť: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Prijať"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Prenos súboru dokončený"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Pozvánka do diskusnej skupiny"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Vzdialený kontakt zastavil prenos"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Chyba otvárania súboru"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Prenos súboru bol zastavený"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Prenos súboru bol zrušený"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Spojenie s druhou stranou nie je možné nadviazať."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Použitie: /%s, skryje tlačidlá rozhovoru."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Použitie: /%s, pošle správu kontaktu"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nenájdený"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Preč"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Prítomný"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Použitie: /%s, vyčistí textové okno."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Prepnúť Open_PGP šifrovanie"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Použitie: /%s, pošle ping kontaktu"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Pripojenie nie je dostupné"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Pripojenie nie je dostupné"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Zmeniť vašu prezývku (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Neplatná prezývka"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
+"používateľom."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Prezývka nenájdená: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
+"používateľom."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Spýtať sa pred zatvorením okna/záložky pre diskusnú skupinu."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Poslať %s do %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Ste pozvaný do diskusnej skupiny"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Neplatný server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "príslušnosť zmenená"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Chýbajúci argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "vytváram priečinok %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Zmeniť informáciu o stave"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Zmeniť stav"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Prítomný"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Nerušiť"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Odhlásený - odpojený"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr ""
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Stav bol zmenený."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Opustiť diskusnú skupinu"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s v %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Neboli ste prihlásený do diskusnej skupiny."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Diskuné skupiny"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Opustili ste nasledujúce diskusné skupiny:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Preposlať neprečítané správy"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Všetky neprečítané správy budú preposlané."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Preposlať neprečítané správy"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Prehrať zvuk keď je používateľ zaneprázdnený"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Použiť D-Bus a Notification-Daemon pre zobrazenie oznámení"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minútach, po ktorých sa zmení stav na preč."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Preč ako výsledok nečinnosti viac ako $T minút)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minútach, po ktorých sa zmení stav na neprítomný."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Neprítomný ako výsledok nečinnosti viac ako $T minút)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Farba prichádzajúcej prezývky."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Farba odchádzajúcej prezývky."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Farba prichádzajúceho textu."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Farba odchádzajúceho textu."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Farba textu stavovej správy."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Zobraziť udalosť v zozname"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Zobraziť udalosť v zozname"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Predbežné zobrazenie nových správ vo vyskakovacom oznámení?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Požiadavka na prenos súboru"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Prenos súboru bol zrušený"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Pozvánka do diskusnej skupiny"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Písmo prichádzajúcej prezývky."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Písmo odchádzajúcej prezývky."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Písmo prichádzajúceho textu."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Písmo odchádzajúceho textu."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Písmo textu stavovej správy."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "predvolená"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Jazyk pre kontrolu pravopisu"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3765,25 +3929,25 @@ msgstr ""
 "'sometimes' - zobraziť každých print_ichat_every_foo_minutes minút.\n"
 "'never' - nezobrazovať čas."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3794,7 +3958,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Ak to chcete používať, "
 "nainštalujte docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3802,7 +3966,7 @@ msgstr ""
 "Znak použitý za prezývkou, keď sa používa automatické dopĺňanie (tab) v "
 "diskusnej skupine."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3810,57 +3974,73 @@ msgstr ""
 "Vaša prezývka sa zhoduje s inou prezývkou v diskusnej miestnosti aj po "
 "pripojení znaku."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky zobrazené za prezývkou v konverzáciách"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky zobrazené pred prezývkou v konverzáciách"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude karta/okno "
 "znovu otvorená."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Z koľkých minút majú byť riadky s predchádzajúcej konverzácie."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3868,11 +4048,11 @@ msgstr ""
 "Poslať správu pri stlačení Ctrl+Enter a pri Enter spraviť nový riadok "
 "(chovanie podobné ako Mirabilis ICQ klient)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koľko riadkov posunúť pri stlačení Ctrl+KP_hore."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3881,12 +4061,12 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ak je zaškrtnuté, Gajim môže byť ovládaný na diaľku s použitím gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3897,20 +4077,20 @@ msgstr ""
 "účtov (nie je nutné, aby listen_to_network_manager bolo nastavené na False) "
 "podľa stavu sieťového pripojenia."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3918,60 +4098,68 @@ msgstr ""
 "Pokiaľ sa čas pri každej správe (print_time==sometimes), vypíše sa každých x "
 "minút."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre diskusnú skupinu."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Vždy sa spýtať pred zatvorením okna/záložky diskusnej skupiny, ktorej meno "
 "je uvedené v zozname diskusných JID."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nikdy sa nepýtať pred zatvorením karty/okna pre diskusnú skupinu, ktorej "
 "meno je uvedené v zozname JID."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 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
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, 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
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať kartu len ak prebieha konverzácia?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -3979,16 +4167,16 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Predbežné zobrazenie nových správ vo vyskakovacom oznámení?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "Bodkočiarkou oddelený zoznam slov bude zvýraznený v diskusnej skupine."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -3997,14 +4185,14 @@ msgstr ""
 "Ak je pravda, Gajim skončí keď bude X tlačidlo vo Window manažéri stlačené. "
 "Toto nastavenie je použíté, len v prípade, že sa používa trayikona."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ak je pravda, Gajim bude kontrolovať pri každom štarte, či je štandartný "
 "klient."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4012,7 +4200,7 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
 "správy. Závisí na téme, ikonka môže byť animovaná."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4020,11 +4208,11 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí stavovú správu v zozname kontaktov, za "
 "predpokladu, že táto správa nie je prázdna."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4032,7 +4220,7 @@ msgstr ""
 "Ak je pravda, Gajim si vyžiada avatara, pre každý kontakt, ktorý nemá "
 "avatara z posledného spojenia, alebo ak nie je cache príliš zastaralá."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4040,37 +4228,41 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť informáciu o zmene stavu kontaktu a jeho/"
 "jej stavovú správu"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Farba pozadia použitá pri prihlásení kontaktu."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Farba pozadia použitá pri odhlásení kontaktu."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "Ak je pravda, obnovené správy budú zobrazené menším písmom."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazovať avatarov pre transport."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazovať zoznam v paneli úloh."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4080,7 +4272,7 @@ msgstr ""
 "2.8, potom bude okno blikať (bežné správanie pre väčšinu okenných "
 "manažérov), keď sa udeje nejaká udalosť."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4091,7 +4283,8 @@ msgstr ""
 "informácie o prítomnosti v diskusnej skupine."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4099,7 +4292,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Ovládanie okna, kde je umiestnená nová správa.\n"
@@ -4111,31 +4304,39 @@ msgstr ""
 "'pertype' - Každý typ správy (napr., rozhovory proti diskusiám) sú odoslané "
 "do špecifikovaného okna."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ak je pravda, stlačením Esc klávesy zatvoríte kartu/okno."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Skývať tlačidlá v okne rozhovoru."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Skrývanie titulku v okne s diskusnou skupinou"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryť titulok v okne s diskusiou dvoch osôb."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skrývanie zoznamu účastníkov v okne s diskusnou skupinou."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4143,15 +4344,15 @@ msgstr ""
 "V rozhovore sa zobrazí prezývka na začiatku riadku, len v prípade, že "
 "predchádzajúca správa prišla od inej osoby."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4159,13 +4360,13 @@ msgstr ""
 "Zoznam farieb, oddelené \":\", ktoré budú použité na zafarbenie prezývok v "
 "diskusnej skupine."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab vás presunie na ďalšiu kartu, pokiaľ už nie sú žiadne neprečítané "
 "správy."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4173,7 +4374,7 @@ msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4182,7 +4383,7 @@ msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4191,7 +4392,7 @@ msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4201,7 +4402,7 @@ msgstr ""
 "účtov. BUĎTE OPATRNÝ, keď sa prihlásite s zápornou prioritou, tak nebudete "
 "dostávať ŽIADNE správy z vášho servera."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4209,7 +4410,7 @@ msgstr ""
 "Ak je pravda, Gajim bude používať Správca zväzku kľúčov (ak je prítomný) na "
 "ukladanie hesiel."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4217,7 +4418,7 @@ msgstr ""
 "Ak je true, Gajim bude používať KDE Wallet (ak je prítomný kwalletcli) na "
 "ukladanie hesiel."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4225,13 +4426,13 @@ msgstr ""
 "Ak je pravda, Gajim bude zobrazovať počet prítomných a všetkých kontaktov v "
 "riadku účtu a skupiny."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4239,17 +4440,11 @@ msgstr ""
 "Ak je pravda, Gajim naroluje a označí kontakt, ktorý poslal poslednú správu, "
 "ak nie je práve otvorené okno rozhovoru."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Doba neaktivity potrebná na zmenenie stavu na zatvoril okno."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4257,69 +4452,92 @@ msgstr ""
 "Maximálny počet riadkov zobrazených v rozhovore. Najstaršie riadky budú "
 "zmazané."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
+"použitá predvolená špecifikovaná správa."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4327,85 +4545,99 @@ msgstr ""
 "Priorita sa zmení automaticky vzhľadom k vášmu stavu. Priority sú definované "
 "v premenných autopriority_* nastaveniach."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Ak je povolené, obnoví sa naposledy použitý stav."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Povoliť šifrovanie ESessions pre tento účet."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má Gajim automaticky spúšťať šifrovanú reláciu keď je to možné?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobraziť upozornenie pred použitím štandardnej SSL knižnice."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Medzerami oddelený zoznam ssl chýb, ktoré ignorovať."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4413,34 +4645,85 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
 "premennej file_transfer_proxies na prenos súborov."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
+"používate"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s vám chce poslať súbor."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonymná autentifikácia"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_ymná autentifikácia"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Má tento kontakt k dispozícii OpenPGP?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4448,134 +4731,291 @@ msgstr ""
 "Mal by sa Gajim spúšťať automaticky so šifrovanou reláciou pre tento kontakt "
 "keď je to možné?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "všetky alebo medzerou oddelené stavy"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'áno', 'nie', alebo 'oboje'"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Pre"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "požiadavka na odhlásenie od %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Chyba pri zápise na disk"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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úbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť (pozrite http://"
+"trac.gajim.org/wiki/DatabaseBackup) alebo ho odstrániť (všetko v histórii "
+"bude stratené)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Miestnosť bola zničená"
+
+#: ../src/common/connection_handlers_events.py:943
+#, 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_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Nesprávné Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Neznáma chyba SSL: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nová krátka správa"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nová správa od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nová súkromná správa"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nová súkromná správa od diskusnej skupiny %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nová správa"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Správa od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s zmenil stav"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je teraz %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt zmenil stav"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s sa prihlásil"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt sa prihlasil"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s sa odhlásil"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt sa odhlásil"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nie je možné nahrať idle modul"
@@ -4585,20 +5025,20 @@ msgstr "Nie je možné nahrať idle modul"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registrácia úspešná"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrácia pomocou agenta %s bola úspešná"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registrácia zlyhala"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, fuzzy, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4606,193 +5046,168 @@ msgstr ""
 "Registrácia pomocou agenta %(agent)s zlyhala s chybou %(error)s: "
 "%(error_msg)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 "Chyba pri zápise na disk"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditeľnosť."
 
-#: ../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: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 ""
-"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úbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť (pozrite http://"
-"trac.gajim.org/wiki/DatabaseBackup) alebo ho odstrániť (všetko v histórii "
-"bude stratené)."
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Chcem si vás pridať do môjho zoznamu."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Nepodarilo sa získať problematický certfikát"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Nepodarilo sa získať certifikát CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodarilo sa dešifrovať podpis certifikátu"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodarilo sa dešifrovať CRL podpis"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Podpísanie certifikátu zlyhalo"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Zlyhanie CRL podpisu"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Certifikát vypršal"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL vypršal"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodarilo sa získať lokálny problematický certifikát"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Nepodarilo sa overiť prvý certifikát"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Reťazec certifikátu je príliš dlhý"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certifikát nie je dôverný"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certifikát odmietnutý"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Zlyhalo overenie aplikácie"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Táto správa je *šifrovaná* (Pozrite :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4801,78 +5216,79 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Neznáma chyba SSL: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Nie je možné pripojiť sa k \"%s\""
+
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpovedal: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie je možné pripojiť sa k účtu %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4881,7 +5297,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4890,24 +5306,33 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Nie je možné pripojiť sa k \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4916,68 +5341,68 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslať kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Poslať kontakty:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 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:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Odstránenie účtu zlyhalo"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Registrácia pomocou agenta %(agent)s zlyhala s chybou %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Nie je v zozname"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python väzby chýbajú na tomto počítači"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus nebeží korektne na tomto stroji"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus nebeží korektne na tomto stroji"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus nebeží korektne na tomto stroji"
@@ -4992,7 +5417,7 @@ msgstr ""
 "Služba nie je dostupná: Gajim nebeží alebo ovládanie vzdialeného programu "
 "Gajim vrátilo False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nie je prítomný na tomto stroji alebo chýba modul pre python"
 
@@ -5177,224 +5602,232 @@ msgstr "Koniec týždňa"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v názve účtu."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Nepovolený znak v názve hostiteľa."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Neprítomný"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "P_reč"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Neviditeľný"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5402,22 +5835,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " z miestnosti %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " od používateľa %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5425,21 +5858,40 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Vypršal čas nahrávania obrázku"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Obrázok je príliš veľký"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "GPG je nepoužitelný"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Vypršal čas nahrávania obrázku"
+
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s konfiguračná chyba"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5451,110 +5903,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Chybová správa: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "zvukový vstup"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "zvukový výstup"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "video vstup"
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "video výstup"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Chyba pri vykonávaní \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr " Predvolené zariadenie"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Zvukový test"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "Automatická detekcia"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Súbor: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Video test"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zelená"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "video výstup"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X Window System (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X Window System (bez Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "chyba: nie je možné otvoriť %s na čítanie"
+msgid "Error: cannot open %s for reading"
+msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "azúrová"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -6191,19 +6658,115 @@ msgstr "Študujem"
 msgid "Writing"
 msgstr "Píšem"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "predvolená"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "námornícka"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Hrám skrývačku"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Účet"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Účet"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Popis"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Chyba"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "jeden"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "miestnosť"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Neznámy umelec"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Neznámy titulok"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Neznámy zdroj"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6212,21 +6775,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Nie je možné použiť port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-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:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6234,11 +6784,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:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6247,44 +6797,43 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 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:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Nie je možné spustiť lokálnu službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie je možné použiť port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Prosím skontrolujte, či je spustený program avahi-daemon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 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:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6297,24 +6846,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Chyba pri pridávaní služby. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Predvolená správa"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pre jazyk %s nie je k dispozícii"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6324,215 +6873,216 @@ msgstr ""
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "text správy o stave"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Neprečítané udalosti"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Prečítať všetky správy pred odstránením tohoto účtu."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Máte otvorený rozhovor pod účtom %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený na server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "Pre zmenu názvu účtu, musíte mať prečítané všetky čakajúce správy."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už použitý"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tento názov je už použitý jedným z vašich účtov. Prosím, zvoľte si iný názov."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Premenovať účet"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadať nový názov pre účet %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Nie je tu tajný OpenPGP kľúč k dispozícii."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Server nepodporuje Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 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:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Pre zakázanie účtu, musíte byť odpojený."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6540,11 +7090,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6552,11 +7102,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6564,17 +7114,17 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6590,109 +7140,106 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emotikony zakázané"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Pripojenie k serveru %s zlyhalo"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "Odstrániť iba z programu Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:None"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
 "odstráňte túto záložku."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Neplatná prezývka"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Znak nie je povolený"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Neplatná miestnosť"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6702,32 +7249,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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol úspešne vytvorený"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 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:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6742,7 +7289,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6753,79 +7300,96 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Nastavovať"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Prvá prijatá správa"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Ďalšia prijatá správa zameraná"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Ďalšia prijatá správa nezameraná"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt pripojený"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Prijatý GMail e-mail"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6833,237 +7397,238 @@ msgstr ""
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text, ktorý je pod čiarou"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Ǔvodzovky"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _slovníku"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, python-format
+#: ../src/conversation_textview.py:1386
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Pred %i dňami"
 msgstr[1] "Včera"
 msgstr[2] "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nie je možné nahrať idle modul"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber Id je už v zozname"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "nové@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nové%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktné meno: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Meno kontaktu"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Nastaviť náladu"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s správa o stave"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Prepísať správu o stave?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG číslo:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ číslo:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ jabber klient"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Verzia GTK+:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Verzia PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Súčasní vývojári:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Pavol Klačanský <pavol@klacansky.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7072,100 +7637,154 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Nezabezpečené spojenie"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+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/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Znovu sa už _nepýtať"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už ste v diskusnej skupine %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Nesprávna uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Toto nie je diskusná skupina"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Neplatný účet"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 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:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Toto nie je diskusná skupina"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie je názov diskusnej skupiny."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Tento účet nie je pripojený k serveru"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7174,165 +7793,135 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Nesprávne JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie je možné spracovať \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt sa prihlasil"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nová správa"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nová súkromná správa"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../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:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt zmenil stav"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Krátku správu"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "pridať"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "upraviť"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "zmazať"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7340,189 +7929,187 @@ msgid ""
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Upraviť"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Skupiny"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
-#, python-format
-msgid "Added  %s contacts"
-msgstr "Pridaných %s kontaktov"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Pridaných %s kontaktov"
+msgstr[1] "Pridaných %s kontaktov"
+msgstr[2] "Pridaných %s kontaktov"
 
-#: ../src/dialogs.py:3393
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "Odstránených %s kontaktov"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Odstránených %s kontaktov"
+msgstr[1] "Odstránených %s kontaktov"
+msgstr[2] "Odstránených %s kontaktov"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Neplatný názov servera"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Služba vrátila chybu"
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Súkromný zoznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Poradie: %(order)s, akcia: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upraviť pravidlo</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Pridať pravidlo</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Súkromné zoznamy pre %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Nesprávny názov zoznamu"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete prijať pozvanie?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vybrať obrázok"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne oznámenie pre %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Podmienka"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "keď som "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7530,38 +8117,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Identitu tohto kontaktu ste už overili."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu overená"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Overiť znovu..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NEoverená"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Overiť..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Overili ste identitu kontaktu?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7571,81 +8158,124 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
+"Tento kontakt má priradený GPG kľúč a vy ho považujete za dôveryhodný, "
+"správy budú šifrované."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "Tento kontakt má priradený GPG kľúč a vy ho považujete za dôveryhodný, "
 "správy budú šifrované."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "zvuk a video"
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "zvuk"
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "video"
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "pre účet %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Certifikát podpísaný sám sebou"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Ostatný"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehliadať dostupné služby"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Prehliadanie služieb"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7653,231 +8283,246 @@ msgstr ""
 "Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Neplatný názov servera"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prehliadanie %(address)s s použitím účtu %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Prehliadať"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky na prehliadanie."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Vykonať príkaz"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Prieskúmava sa %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, 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:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Prihlásiť"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nová správa"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Validácia SSL certifikátu"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Knižnica používaná k overeniu serverových certifikátov, kvôli zaisteniu "
 "bezpečného pripojenia."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Vyžaduje python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Vyžaduje python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Vyžaduje pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Príkazový riadok"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Skript na ovládanie programu Gajim cez príkazový riadok."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Vyžaduje 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Funkcia nie je dostupná pod Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Šifrovanie správy pomocou OpenGPG"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Šifrovanie správ rozhovoru pomocou gpg kľúčov."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Vyžaduje gpg a python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Automaticky zistí stav siete."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Vyžaduje gnome-network-manager a python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Správa sedenia"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Sedenie Gajim bude uložené pri odhlásení a obnovené pri prihlásení."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Vyžaduje python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Šifrovanie heslom"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Heslá môžu byť bezpečne uložené a nie sú v obyčajnom texte."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Požaduje gnome-keyring a python-gnome2-desktop, alebo kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Schopnosť pripojiť sa k serverom, ktoré používajú SRV protokoly."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Vyžaduje dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Vyžaduje nslookup k použitiu SRV protokolov."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Kontrola pravopisu"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Kontrolovať pravopis vo vytvorených správach."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Vyžaduje libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Vyžaduje libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Oznámenie"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Nereagujúce vyskakovacie upozornenia pre nové udalosti."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7885,66 +8530,40 @@ msgstr ""
 "Vyžaduje python-notify alebo instead python-dbus v spojení s notification-"
 "daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatický stav"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Schopnosť odhadnúť čas nečinnosti v nastavení poradia automatických stavov."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Požaduje knižnicu libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Vyžaduje python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-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 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 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."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Šifrovanie správy pomocou End to End"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Šifrovanie správ rozhovorov."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Vyžaduje python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST generátor"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7952,172 +8571,201 @@ msgstr ""
 "Generuje XHTML z výstupu RST kódu (pozrite http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Vyžaduje python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "Požaduje python-farsight."
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "Vyžaduje python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Vyžaduje python-dbus."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Prítomný"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Funkcia"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Súbor"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Stav"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Názov súboru: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Príjemca: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uložené do: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Prenos súboru dokončený"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Prenos súboru bol zrušený"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Spojenie s druhou stranou nie je možné nadviazať."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Príjemca: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová správa: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Prenos súboru bol zastavený"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Vyberte súbor na odoslanie..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemôže pristupovať k tomuto súboru"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Tento súbor je používaný iným procesom."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Súbor: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Typ: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Popis: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-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:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, 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:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Uložiť súbor ako..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Súbor: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Typ: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Popis: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s vám chce poslať súbor:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Odosielanie profilu..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Chyba pri prenose súboru"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8125,65 +8773,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Nesprávny súbor"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Súbor:"
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Meno: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "Správa:"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Emotikony:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "_Zobraziť udalosť v zozname"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor rozšírenej konfigurácie"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s konfiguračná chyba"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim potrebuje X server k behu. Ukončujem..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importovanie PyGTK zlyhalo: %s"
 
-#: ../src/gajim.py:186
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim potrebuje PyGTK 2.16 alebo vyššie"
 
-#: ../src/gajim.py:187
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim potrebuje PyGTK 2.16 alebo vyššie k behu. Ukončujem..."
 
-#: ../src/gajim.py:189
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim potrebuje GTK 2.16 alebo vyššie"
 
-#: ../src/gajim.py:190
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim potrebuje GTK 2.16 alebo vyššie k behu. Ukončujem..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vyžaduje pywin32 na spustenie"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8192,12 +8881,11 @@ msgstr ""
 "Prosím, uistite sa, že Pywin32 je nainštalovaný na vašom systéme. Môžete ho "
 "získať na %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim už beží"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8205,28 +8893,28 @@ msgstr ""
 "Pravdepodobne už jeden program Gajim beží\n"
 "Želáte si aj napriek tomu spustiť Gajim?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Zobrazí pomocníka pre daný príkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "príkaz"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "ukáž pomocníka pre príkaz"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Zobraziť alebo skryť okno so zoznamom"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8234,53 +8922,57 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "účet"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "stav"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
 "neviditeľný"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "správa"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "správa o stave"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8288,20 +8980,45 @@ 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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Zmení prioritu účtu alebo účtov"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priorita"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "priorita, ktorú chcete udeliť účtu"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8311,35 +9028,30 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8349,135 +9061,132 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "predmet"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "predmet správy"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Získať podrobné informácie o účte"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "súbor"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Odstrániť položku predvoľby"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "kľúč"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Pridá kontakt do zoznamu"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 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
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvorí dialóg 'Začiatok diskusie'"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 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
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Odoslať vlastné XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML na odoslanie"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8485,44 +9194,91 @@ 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
+#: ../src/gajim-remote.py:269
+msgid "Change the avatar"
+msgstr "Zmeniť avatar"
+
+#: ../src/gajim-remote.py:271
+msgid "Picture to use"
+msgstr "Obrázok, ktorý sa použije"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
+"všetkým účtom"
+
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Účet ktorý chcete ovládať"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Obsah správy"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Pripojiť MUC miestnosť"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "miestnosť"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "JID miestnosti"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "prezývka"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Prezývka na používanie"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "heslo"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Heslo pre vstup do miestnosti"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Zobraziť alebo skryť okno ipython"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8531,159 +9287,44 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Použitie: %s %s %s \n"
-"\t %s"
+"Použitie: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Nesprávna 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 ""
-"jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
-"neviditeľný"
-
-#: ../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: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 ""
-"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"
-msgstr "Zmeniť avatar"
-
-#: ../src/gajim-remote.py:270
-msgid "Picture to use"
-msgstr "Obrázok, ktorý sa použije"
-
-#: ../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 ""
-"Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
-"všetkým účtom"
-
-#: ../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 "Účet ktorý chcete ovládať"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Obsah správy"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "JID miestnosti"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Prezývka na používanie"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Heslo pre vstup do miestnosti"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Použitie: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8692,7 +9333,7 @@ msgstr ""
 "Príliš veľa argumentov. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8701,10 +9342,14 @@ msgstr ""
 "Argument \"%(arg)s\" nie je špecifikovaný. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Nesprávna uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Téma"
@@ -8727,199 +9372,235 @@ msgid "You cannot delete your current theme"
 msgstr "Nemôžete odstrániť súčastnú tému"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Prosím, vyberte najskôr inú tému ako sučastnú."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s má nastavený predmet na %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Miestnosť práve zobrazuje nedostupného člena"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "Miestnosť práve zobrazuje nedostupného člena"
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Zaznamenávanie miestnosti je teraz povolené"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Zaznamenávanie miestnosti je teraz zakázané"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Miestnosť je teraz neanonymná"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Miestnosť je teraz poloanonymná"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Miestnosť je teraz anonymná"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Zaznamenávanie miestosti je povolené"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "nastavenie miestnosti sa zmenilo na len členovia"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "vypnutie systému"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Ničí sa %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Môžete dole špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
@@ -8944,64 +9625,58 @@ msgstr "Sp_ráva o chybe"
 msgid "Details"
 msgstr "Podrobnosti"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie je štandartným Jabber klientom"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete, aby bol Gajim štandartným Jabber klientom?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Rozšírenie nie je podporované"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9009,94 +9684,88 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Prijať túto požiadavku?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Dostali ste ban z diskusnej skupiny %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Požiadavka o zapísanie"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9104,98 +9773,93 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Nezapísaný"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Miestnosť práve zobrazuje nedostupného člena"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "Zaznamenávanie miestnosti je teraz povolené"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Zaznamenávanie miestnosti je teraz zakázané"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Miestnosť je teraz neanonymná"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Miestnosť je teraz poloanonymná"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Miestnosť je teraz anonymná"
-
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Nesprávne OpenGPG heslo"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Certifikát vypršal"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG kľúč nie je dôveryhodný"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový e-mail %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9203,7 +9867,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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9218,78 +9882,65 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "Vzdialený kontakt zastavil prenos"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Chyba otvárania súboru"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Prenos súborov"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Nepodarilo sa dešifrovať správu"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Chyba."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9298,20 +9949,20 @@ msgstr ""
 "zdroj"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce začať hlasový rozhovor."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9319,15 +9970,20 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Chyba SSL certifikátu"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9344,27 +10000,7 @@ msgstr ""
 "\n"
 "Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"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: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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9372,7 +10008,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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9382,18 +10018,18 @@ msgstr ""
 "že to chcete urobiť?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Emotikony zakázané"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 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:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9403,90 +10039,93 @@ msgstr ""
 "aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
 "trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG kľúč vypršal"
 
-#: ../src/gui_interface.py:3427
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Nová diskusná skupina"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Chcem si vás pridať do svojho zoznamu"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "vytváram priečinok %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Nie je možné nájsť databázu so záznamami o histórii"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakty"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Dátum"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Prezývka"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Správa"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Predmet"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Skutočne si želáte vyčistiť databázu? (SILNE SA NEODPORÚČA, KEĎ BEŽÍ GAJIM)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9500,95 +10139,109 @@ msgstr ""
 "\n"
 "V prípade, že zvolite Áno, prosíme o strpenie..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Chyba databázy"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exportovanie záznamov histórie..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o %(time)s povedal: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
-msgstr[1] "Skutočne chcete odstrániť záznamy vybraného kontaktu?"
-msgstr[2] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Skutočne si želáte zmazať vybraných správ?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Toto je nevratná operácia."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Zrušiť potvrdenie"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Skutočne si želáte zmazať vybraných správ?"
 msgstr[1] "Skutočne si želáte zmazať vybranú správu?"
 msgstr[2] "Skutočne si želáte zmazať vybrané správy?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Vypršal čas nahrávania obrázku"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Kódim"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Obrázok je príliš veľký"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Chystáte sa zavrieť niekoľko kariet"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Naozaj chcete zavrieť všetky?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Diskusné skupiny"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Správy"
 
@@ -9600,100 +10253,111 @@ msgstr "- správy budú zaznamenané"
 msgid "- messages will not be logged"
 msgstr "- správy nebudú zaznamenané"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s zmenil stav"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignorovať"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s sa prihlásil"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s sa odhlásil"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Zakazujem %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nová správa od %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registrácia zlyhala"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nová súkromná správa od diskusnej skupiny %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Tento súbor už existuje"
+
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
 msgstr ""
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Správa od %(nickname)s"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfigurácia miestnosti"
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorovať"
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Súbor je prázdny"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Získava sa profil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Súbor je prázdny"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktné informácie"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formát: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informácie prijaté"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Odosielanie profilu..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informácie neboli zverejnené"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9701,52 +10365,53 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, 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:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG je nepoužitelný"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete pripojený k %s bez OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 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:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9755,37 +10420,37 @@ msgstr ""
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Naozaj ukončiť program Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ste si istý, že chcete ukončiť program Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Vždy zavrieť Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "Prebiehajú u vás prenosy súborov"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9793,16 +10458,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:2720
+#: ../src/roster_window.py:2989
 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:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9810,11 +10475,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9823,69 +10488,69 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9894,11 +10559,11 @@ msgstr ""
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9906,16 +10571,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9925,61 +10590,62 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Chystáte sa poslať vlastnú správu o stave. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
 "informácie nebudú uložené pri ďalšom prihlásení."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9987,12 +10653,17 @@ 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Poslať %s do %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Poslať súbor kontaktu"
+
+#: ../src/roster_window.py:4834
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Poslať súbor kontaktu"
@@ -10002,129 +10673,129 @@ msgstr "Poslať súbor kontaktu"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Spravovať záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "Publikovať umiestnenie"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Nastavovať služby..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Upraviť _skupiny"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Poslať krátku správu"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "Znovu p_ripojiť"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Zmeniť správu o stave..."
 
@@ -10141,31 +10812,21 @@ msgstr ""
 msgid "No result"
 msgstr "Žiadny výsledok"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Chyba pri zápise na disk"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Predmet: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Potvrdiť tieto voľby relácie"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10180,147 +10841,152 @@ msgstr ""
 "\n"
 "Pokračovať s reláciou?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Má tento kontakt k dispozícii OpenPGP?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _zozname kontaktov"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tejto diskusnej skupiny"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blokovaný]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Posledný stav: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Pripojený"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Odpojený"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Zápis: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Nálada:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivita:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Pieseň:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Umiestnenie:"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Nahrať"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Dokončený"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?stav prenosu:Pozastavené"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10328,32 +10994,32 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Čas: Neznámy"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10361,7 +11027,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:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10369,12 +11035,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:361
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10382,18 +11048,389 @@ 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:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Nie sú tu žiadne čakajúce požiadavky o zapísanie."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Vyberte súbor na odoslanie..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "okno/karta bola otvorená s týmto kontaktom "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Akcie</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Podmienky</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Pokročilé akcie"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Pokročilé nastavenie oznámení"
+
+#~ msgid "All statuses"
+#~ msgstr "Všetky stavy"
+
+#~ msgid "Busy "
+#~ msgstr "Zaneprázdnený"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt zmenil stav"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt odpojený"
+
+#~ msgid "Don't have "
+#~ msgstr "Nemá "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Prenos súboru zastavený"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Zvýraznenie správ v diskusnej skupine"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Prijatá správa - diskusná skupina"
+
+#~ msgid "Have "
+#~ msgstr "Má"
+
+#~ msgid "Launch a command"
+#~ msgstr "Vykonať príkaz"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Jeden alebo viac špeciálnych stavov..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Prítomný / Mám čas na debatu"
+
+#~ msgid "Play a sound"
+#~ msgstr "Prehrať zvuk"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nová súkromná správa"
+
+#~ msgid "When "
+#~ msgstr "Kedy"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktivovať vlastnosť urgentného upozornenia - okno v zozname úloh bude "
+#~ "blikať"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "Z_akázať automatické otváranie diskusných okien"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "Z_akázať existujúce vyskakovacie okná"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "Z_akázať zvuky pre túto udalosť"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "Z_akázať zobrazovanie udalostí v zozname"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "Z_akázať zobrazovanie udalostí v zozname"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informovať ma pomocou vyskakovacieho okna"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Otvoriť okno rozhovoru s používateľom"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Zobraziť udalosť v zozname"
+
+#~ msgid "and I "
+#~ msgstr "a ja"
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontakty"
+
+#~ msgid "for "
+#~ msgstr "pre "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Skupiny"
+
+#~ msgid "when I'm in"
+#~ msgstr "keď som v"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Zobraziť profil kontaktu (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Povoliť jemu/jej vidieť môj stav"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Popis:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Pokročilé..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Zobraziť _aktivitu kontaktov v zozname kontaktov"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Zobraziť _hudbu kontaktov v zozname kontaktov"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Zobraziť _náladu kontaktov v zozname kontaktov"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so "
+#~ "zoznamom kontaktovi."
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Poslať krátku _správu..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Používa avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim - internetový komunikátor"
+
+#~ msgid "English"
+#~ msgstr "Angličtina"
+
+#~ msgid "Belarusian"
+#~ msgstr "Bieloruština"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulharčina"
+
+#~ msgid "Breton"
+#~ msgstr "Bretónčina"
+
+#~ msgid "Czech"
+#~ msgstr "Čeština"
+
+#~ msgid "German"
+#~ msgstr "Nemčina"
+
+#~ msgid "Greek"
+#~ msgstr "Gréčtina"
+
+#~ msgid "British"
+#~ msgstr "Britština"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Španielčina"
+
+#~ msgid "Basque"
+#~ msgstr "Baskičtina"
+
+#~ msgid "French"
+#~ msgstr "Francúzština"
+
+#~ msgid "Croatian"
+#~ msgstr "Chorvátčina"
+
+#~ msgid "Italian"
+#~ msgstr "Taliančina"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Nórčina (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandština"
+
+#~ msgid "Norwegian"
+#~ msgstr "Nórčina"
+
+#~ msgid "Polish"
+#~ msgstr "Poľština"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugalčina"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazílska portugalčina"
+
+#~ msgid "Russian"
+#~ msgstr "Ruština"
+
+#~ msgid "Serbian"
+#~ msgstr "Srbština"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovenčina"
+
+#~ msgid "Swedish"
+#~ msgstr "Švédčina"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Čínština (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Jazyk používaný pri kontrole pravopisu"
+
+#~ msgid "all or space separated status"
+#~ msgstr "všetky alebo medzerou oddelené stavy"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'áno', 'nie', alebo 'oboje'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'áno', 'nie' alebo ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Chyba pri vykonávaní \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "chyba: nie je možné otvoriť %s na čítanie"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Nie je možné použiť port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Možno máte spustenú inú inštanciu programu Gajim. Prenos súboru bude "
+#~ "zrušený."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ jabber klient"
+
+#~ msgid "Condition"
+#~ msgstr "Podmienka"
+
+#~ msgid "when I am "
+#~ msgstr "keď som "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Vyžaduje pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Vyžaduje gpg a python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Prevádza LaTeX výrazy medzi $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "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."
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Požaduje python-farsight."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
+#~ "neviditeľný"
+
+#, 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)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Použitie: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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í"
+
+#, fuzzy
+#~ 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í"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakty"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Chyba pri zápise na disk"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Predmet: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Nálada:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivita:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10421,32 +11458,12 @@ msgstr " zdroj s prioritou "
 #~ 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:"
@@ -10559,9 +11576,6 @@ msgstr " zdroj s prioritou "
 #~ "História diskusných skupín\n"
 #~ "História všetkých rozhovorov"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Spravovať účty"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10683,9 +11697,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "_Outgoing message:"
 #~ msgstr "_Odchádzajúca správa:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Zobraziť _zoznam"
-
 #~ msgid "Add Special _Notification"
 #~ msgstr "Pridať špeciálne oz_námenie"
 
@@ -10699,12 +11710,6 @@ msgstr " zdroj s prioritou "
 #~ "%(title)s od %(artist)s\n"
 #~ "z %(source)s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Použitie: /%s, vyčistí textové okno."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Použitie: /%s, skryje tlačidlá rozhovoru."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10712,12 +11717,6 @@ msgstr " zdroj s prioritou "
 #~ "Použitie: /%(command)s <akcia>, odošle akciu pre aktuálnu diskusnú "
 #~ "skupinu. Použite tretiu osobu. (napr. /%(command)s explodoval.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Použitie: /%s, pošle ping kontaktu"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Použitie: /%s, pošle správu kontaktu"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Žiadne informácie s pomocou pre /%s"
 
@@ -10802,9 +11801,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
 
-#~ msgid "Nickname not found: %s"
-#~ msgstr "Prezývka nenájdená: %s"
-
 #~ msgid "This group chat has no subject"
 #~ msgstr "Diskusná skupina nemá nastavený predmet"
 
@@ -10823,13 +11819,6 @@ msgstr " zdroj s prioritou "
 #~ "prezývkach nie sú podporované."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
-#~ "používateľom."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10870,9 +11859,6 @@ msgstr " zdroj s prioritou "
 #~ msgstr ""
 #~ "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -10952,9 +11938,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "General:"
 #~ msgstr "Všeobecné:"
 
-#~ msgid "Message:"
-#~ msgstr "Správa:"
-
 #~ msgid "Specific:"
 #~ msgstr "Špecifické:"
 
@@ -10992,9 +11975,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "Start / Refresh OTR"
 #~ msgstr "Spustiť / obnoviť OTR"
 
-#~ msgid "Accept"
-#~ msgstr "Prijať"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Prijaté pozvanie"
 
diff --git a/po/sr.po b/po/sr.po
index ae1bafeec..079c62a35 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,15 +5,11 @@
 #
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -25,306 +21,297 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Статус"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Лични догађаји"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Започни разговор"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Прикључи се _групном разговору..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 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:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Откривање сервиса"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Изврши наредбу..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "Измени налог"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Отвори Гмаил долазну пошту"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Лични догађаји"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Започни разговор"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Статус"
+msgid "_Modify Account"
+msgstr "Измени налог"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Гајим: чаробњак за креирање налога"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Повезивање на сервер</b>\n"
-"\n"
-"Молимо причекајте..."
+"Морате поседовати рачун да бисте се могли повезати\n"
+"на џабер мрежу."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "I already have an account I want to _use"
+msgstr "Већ имам налог који желим да користим"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "Желим да региструјем нови налог"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Молимо одаберите једну од опција испод:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Молимо попуните податке за Ваш постојећи кориснички налог</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Молимо одаберите сервер</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Лозинка:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Додајте овај сертификат листи сертификата којима верујете\n"
-"SHA1 потпис сертификата:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Сними лозинку"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Анон_имно пријављивање"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Ако је означено, Гајим ће памтити лозинку за овај налог"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Повежи се када притиснем Заврши"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Џабер ИД:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Гајим: чаробњак за креирање налога"
+msgid "Anon_ymous authentication"
+msgstr "Анон_имно пријављивање"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "Већ имам налог који желим да користим"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Молимо одаберите сервер</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "Желим да региструјем нови налог"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../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 "Ако је означено, Гајим ће памтити лозинку за овај налог"
+msgid "Prox_y:"
+msgstr "Прок_си:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 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: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 "Ништа"
+msgid "Use custom hostname/port"
+msgstr "Користи Ваше одређено име хоста/порт "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Прок_си:"
+msgid "_Hostname:"
+msgstr "Име хоста:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Сними лозинку"
+msgid "_Port:"
+msgstr "_Порт:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Постави мој профил при повезивању"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Напредно"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Користи Ваше одређено име хоста/порт "
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Морате поседовати рачун да бисте се могли повезати\n"
-"на џабер мрежу."
+"Додајте овај сертификат листи сертификата којима верујете\n"
+"SHA1 потпис сертификата:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Заврши"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Име хоста:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Повезивање на сервер</b>\n"
+"\n"
+"Молимо причекајте..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Џабер ИД:"
+msgid "Connect when I press Finish"
+msgstr "Повежи се када притиснем Заврши"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Лозинка:"
+msgid "Set my profile when I connect"
+msgstr "Постави мој профил при повезивању"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "_Finish"
+msgstr "_Заврши"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Остало</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ништа"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Налози"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Личне информације</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Додате"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Прокси</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Обриши"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "По_деси према статусу"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Преи_менуј"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Налог"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Омогући"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Налози"
+msgid "Anonymous authentication"
+msgstr "Анонимно пријављивање"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Администраторске операције"
+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 ""
+"Ресурс се шаље Џабер серверу како би се разликовао исти џабер ИД код 2 или "
+"више клијената спојена у исто време на исти сервер са истим рачуном. Дакле, "
+"можете бити спојени са ресурсом 'Посао' или 'Кућа', клијент са највишим "
+"приоритетом ће добијати обавештења о догађајима"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Анонимно пријављивање"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Гајим"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Аутоматско повезивање када се веза изгуби"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Синхронизуј контакте"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Преглед"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Кликните да затражите ауторизацију свим контактима другог налога"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "По_вежи се приликом покретања Гајима"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "И_змени лозинку"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's 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 ""
-"Означите ово да Вас Гајим пита пре него што пошаљете лозинку преко несигурне "
-"везе."
+msgid "Administration operations"
+msgstr "Администраторске операције"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Одаберите датотеку за слање..."
+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 ""
+"Приоритет се у џаберу користи да одреди ко добија догађаје са сервера у "
+"случају да су два или више клијената повезана на њега; клијент са највећим "
+"приоритетомдобија догађаје"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Одаберите _Кључ"
+msgid "A_djust to status"
+msgstr "По_деси према статусу"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Кликните за измену лозинке Вашег налога"
+msgid "Priority will change automatically according to your status."
+msgstr "Приоритет ће бити аутоматски промењен према Вашем статусу."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Кликните да затражите ауторизацију свим контактима другог налога"
+msgid "Priori_ty:"
+msgstr "Приори_тет"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Самопотписани сертификат"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "По_вежи се приликом покретања Гајима"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Веза"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Е-мејл:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Име:"
+msgid "Resour_ce:"
+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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Гајим"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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:25
+#, fuzzy
+msgid "Browse..."
+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 ""
-"Ако је ово означено, Гајим ће одашиљати још неке ИП адресе поред Ваше,тако "
-"да пренос датотека има веће шансе да ће радити."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Сертификат одбачен"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ако је означено, Гајим ће узети лозинку од GPG агента"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Самопотписани сертификат"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Налог"
 
 #: ../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 ""
-"Ако је ово означено, Гајим ће слати поруке да је присутан како би спречио "
-"прекид везе због дуге неактивности"
+msgid "C_onnect on Gajim startup"
+msgstr "По_вежи се приликом покретања Гајима"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -335,6 +322,18 @@ msgstr ""
 "џабер користећи овај налог"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Аутоматско повезивање када се веза изгуби"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Сними дневник разговора за све контакте"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Синхронизирај статус налога са глобалним статусом"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -344,175 +343,204 @@ 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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ако је подразумевани порт који се користи за долазне поруке неодговарајући "
-"за Ваша подешавања, овде можете одабрати неки други.\n"
-"Могли бисте узети у обзир и могућност измене подешавања firewall-а."
-
-#: ../data/gui/accounts_window.ui.h:34
-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:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Џабер ИД:"
+msgid "Use file transfer proxies"
+msgstr "Користи прокси за пренос датотека"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Презиме:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ако је ово означено, Гајим ће одашиљати још неке ИП адресе поред Ваше,тако "
+"да пренос датотека има веће шансе да ће радити."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Опште"
 
-#: ../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:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "користи HTTP_PROXY променљив_у окружења"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Личне Информације"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Подеси..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Прокси</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Приори_тет"
+msgid "_Warn before using an insecure connection"
+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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Приоритет се у џаберу користи да одреди ко добија догађаје са сервера у "
-"случају да су два или више клијената повезана на њега; клијент са највећим "
-"приоритетомдобија догађаје"
+"Означите ово да Вас Гајим пита пре него што пошаљете лозинку преко несигурне "
+"везе."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Приоритет ће бити аутоматски промењен према Вашем статусу."
+msgid "Send _keep-alive packets"
+msgstr "Шаљи подат_ке о живости"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Преи_менуј"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Ако је ово означено, Гајим ће слати поруке да је присутан како би спречио "
+"прекид везе због дуге неактивности"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Ресур_с:"
+msgid "Use cust_om hostname/port"
+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 ""
-"Ресурс се шаље Џабер серверу како би се разликовао исти џабер ИД код 2 или "
-"више клијената спојена у исто време на исти сервер са истим рачуном. Дакле, "
-"можете бити спојени са ресурсом 'Посао' или 'Кућа', клијент са највишим "
-"приоритетом ће добијати обавештења о догађајима"
+msgid "_Hostname: "
+msgstr "Име _хоста:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Сними дневник разговора за све контакте"
+msgid "_Port: "
+msgstr "_Порт:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Остало</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Шаљи подат_ке о живости"
+msgid "Connection"
+msgstr "Веза"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Синхронизирај статус налога са глобалним статусом"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Није одабран ниједан кључ"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Синхрони_зуј статус налога са глобалним статусом"
+msgid "Choose _Key..."
+msgstr "Одаберите _Кључ"
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Синхронизуј контакте"
+msgid "Use G_PG Agent"
+msgstr "Користи G_PG агента"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Ако је означено, Гајим ће узети лозинку од GPG агента"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Користи G_PG агента"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "К_ористи Ваше одређено име хоста/порт "
+msgid "_Edit Personal Information..."
+msgstr "Изм_ени личне информације..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "К_ористи свој порт:"
+msgid "Information about you, as stored in the server"
+msgstr "Информације о Вама, како су ускладиштене на серверу"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Користи прокси за пренос датотека"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Личне информације</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Личне Информације"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "Изм_ени личне информације..."
+msgid "Co_nnect on Gajim startup"
+msgstr "По_вежи се приликом покретања Гајима"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Омогући"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Синхрони_зуј статус налога са глобалним статусом"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "Име _хоста:"
+msgid "Use cust_om port:"
+msgstr "К_ористи свој порт:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Подеси..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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"
+"Могли бисте узети у обзир и могућност измене подешавања firewall-а."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Име:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Порт:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Презиме:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "Упозори пре коришћења несигурне везе"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Е-мејл:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "користи HTTP_PROXY променљив_у окружења"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Џабер ИД:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Споји налоге"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Налог:"
+msgid "Add New Contact"
+msgstr "Додај нови контакт"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Дозво_ли овом контакту да види мој статус"
+msgid "A_ccount:"
+msgstr "_Налог:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Додај нови контакт"
+msgid "_Protocol:"
+msgstr "_Протокол:"
 
-#: ../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 "Желио бих да Вас додам на листу мојих контаката."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ИД корисника:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Надимак:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Група:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Дозво_ли овом контакту да види мој статус"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Претплата"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -524,7 +552,11 @@ msgstr ""
 "протокола. Кликните на дугме за регистрацију\n"
 "за наставак."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Регистрација"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -532,592 +564,373 @@ msgstr ""
 "Морате бити повезани на транспорт да бисте могли\n"
 "додавати контакте са овог протокола."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Група:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Надимак:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Протокол:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Регистрација"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Претплата"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ИД корисника:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Желио бих да Вас додам на листу мојих контаката."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Догодила се грешка:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ад-хок команде - Гајим"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Одаберите команду за извршење:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Молимо сачекајте док се добавља листа команди..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ад-хок команде - Гајим"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Одаберите команду за извршење:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Означите још једном"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Опис грешке"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Молимо сачекајте док се команда шаље..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Заврши"
+msgid "Please wait..."
+msgstr "Молимо сачекајте..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Молимо сачекајте док се добавља листа команди..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Овај џабер извор не излаже ниједну команду."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Молимо сачекајте док се команда шаље..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Догодила се грешка:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Молимо сачекајте..."
+msgid "Error description..."
+msgstr "Опис грешке"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Овај џабер извор не излаже ниједну команду."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Заврши"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Напредна измена конфигурације"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Филтер:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Опис</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>НАПОМЕНА:</b> Требало би да поново покренете Гајим да би неке измене "
 "подешавања постале примењене"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Напредна измена конфигурације"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Филтер:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Поново учитај подразумеване боје"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Избриши поруку дана"
+msgid "Show _XML Console"
+msgstr "Прикажи _XML Конзолу"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Измени листе _приватности..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Администратор"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "Шаље поруку тренутно повезаним корисницима овог сервера"
+msgid "_Send Server Message..."
+msgstr "_Пошаљи серверску поруку..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Постави поруку дана..."
+msgid "Sends a message to users currently connected to this server"
+msgstr "Шаље поруку тренутно повезаним корисницима овог сервера"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Поставља поруку дана"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Прикажи _XML Конзолу"
+msgid "Set MOTD..."
+msgstr "Постави поруку дана..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Освежи поруку дана..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Освежава поруку дана"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "Освежи поруку дана..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Администратор"
+msgid "Delete MOTD"
+msgstr "Избриши поруку дана"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Пошаљи серверску поруку..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " отварање прозора/језичка са тим контактом "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Акције</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Услови</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Звукови</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Напредне Акције"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Напредна контрола обавештавања"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Сви статуси"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Одсутан"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Запослен"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Контакт променио статус"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Контакт Отишао Са Везе"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Немам "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Преноси датотека"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Захтев за преносом датотеке"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Пренос датотеке заустављен"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Бојење Порука Са Групног Разговора"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Примљена Порука Са Групног Разговора"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Имам "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Невидљив"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Покрените команду"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Недоступан"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Један или више посебних статуса..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "На вези / Слободан за разговор"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Пуштање звукове"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Нова Приватна Порука"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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 "_Активирање управника прозора за бљескање прозора разговора у панелу"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Онемогући аутоматско отварање прозора за разговор"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Онемогући постојећи искачући прозор"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Онемогући постојећи звук за овај догађај"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Онемогући приказивање догађаја у листи контаката"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Онемогући приказивање догађаја у листи контаката"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Обавести ме искачућим прозором"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Отвори прозор за разговор са корисником"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Прикажи догађај у листи контаката"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Прикажи догађај у листи контаката"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "и ја "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Контакти"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "за"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Групе"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "када сам у"
+msgid "Deletes Message of the Day"
+msgstr "Брише поруку дана"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ништа"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Подешавања"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Аутоматско повезивање"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ништа"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Подешавања"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Аутоматско повезивање"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Унос:"
+msgid "New entry received"
+msgstr "Нов догађај примљен"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Примили сте нови унос:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Име теме:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Унос:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Задњи пут измењено:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Нов догађај примљен"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Примили сте нови унос:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Одблокирај"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Порука:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Постави активност"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Постави активност"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Порука:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Расположење:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Порука:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Измени лозинку"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Унесите поново као потврду:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Унесите нову лозинку:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Унесите поново као потврду:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Упишите Вашу нову статусну поруку</b>"
+msgid "Save as Preset..."
+msgstr "Сними као већ постављену..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Активност:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Расположење:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Активност:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Већ постављене поруке:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Сними као већ постављену..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Упишите Вашу нову статусну поруку</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Прикључи се _групном разговору"
+msgid "_Copy Link Location"
+msgstr "_Копирај локацију везе"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Додај на листу контаката..."
+msgid "_Open Link in Browser"
+msgstr "_Отвори везу у интернет прегледачу"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Копирај џабер ИД/е-мејл адресу"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Копирај локацију везе"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Отвори састављач е-мејла"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Отвори везу у интернет прегледачу"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Започни разговор"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Прикључи се _групном разговору"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Додај на листу контаката..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Прикажи листу смајлија (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Додај овај контакт на листу (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "О"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Позови контакте у конверзацију (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Позови контакте у конверзацију (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Прегледај историјат разговора (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Прикажи мени напредних функција (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Пошаљи"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "О"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Позо_ви"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Позови пријатеље!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Сервер групног разговора"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Молимо одаберите сервер групног разговора."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1125,119 +938,136 @@ msgstr ""
 "Започећете групни разговор.\n"
 "Одаберите контакте које желите да позовете"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Тражи његов/њен статус"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Молимо одаберите сервер групног разговора."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Додај посеб_но обавештење..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Сервер групног разговора"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Придружи Open_PGP Кључ..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Позо_ви"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "И_зврши наредбу..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Започни ра_зговор"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Измени _групе..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Пошаљи једну _поруку..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Пошаљи _датотеку..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Позови контакте"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "_Уклони"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Укључи/искључи Open_PGP енкрипцију"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Укључи/искључи енкрипцију с краја на крај"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Пошаљи кориснички дефинисан статус"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "И_зврши наредбу..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Пошаљи једну _поруку..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Управљање контактима"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Пошаљи _датотеку..."
+msgid "_Rename..."
+msgstr "_Преименуј..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Постави кориснички дефинисан аватар..."
+msgid "Edit _Groups..."
+msgstr "Измени _групе..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Започни ра_зговор"
+msgid "Assign Open_PGP Key..."
+msgstr "Придружи Open_PGP Кључ..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Укључи/искључи енкрипцију с краја на крај"
+msgid "Set Custom _Avatar..."
+msgstr "Постави кориснички дефинисан аватар..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Укључи/искључи Open_PGP енкрипцију"
+msgid "Add Special _Notification..."
+msgstr "Додај посеб_но обавештење..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Претплата"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Дозволи му/јој да види мој статус"
+#, fuzzy
+msgid "_Allow contact 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:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr "_Блокирај"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Тражи његов/њен статус"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:5755
-msgid "_History"
-msgstr "_Историјат"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Игнориши"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Блокирај"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Управљање контактима"
+msgid "_Unignore"
+msgstr "_Поништи игнрисање"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Преименуј..."
+msgid "_Ignore"
+msgstr "_Игнориши"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Претплата"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "_Уклони"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Поништи игнрисање"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Историјат"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Попуните формулар."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Конфигурација собе"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Попуните формулар."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Измени групе"
@@ -1250,55 +1080,47 @@ msgstr "(<b>ESession</b> инфо)"
 msgid "_Verify"
 msgstr "_Потврди"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Могућности"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Листа могућности Гајима:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Могућности"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Листа преноса активних, завршених и заустављених датотека"
+msgid "File Transfers"
+msgstr "Преноси датотека"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Прекини пренос датотеке"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Приказује листу преноса датотека између Вас и осталих"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Прекини пренос означене датотеке"
+msgid "file transfers list"
+msgstr "листа преноса датотека"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Прекини пренос означене датотеке и избриши недовршену датотеку"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Листа преноса активних, завршених и заустављених датотека"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Почисти"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Обавести ме када се заврши пренос датотеке"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Преноси датотека"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Сакрива прозор"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Уклони завршене, прекинуте и неуспеле преносе датотека из листе"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Уклони пренос датотека са листе"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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"
@@ -1306,82 +1128,108 @@ msgstr ""
 "Ова акција уклања пренос датотеке са листе. Ако је пренос активан, прво се "
 "зауставља, па онда уклања"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Почисти"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Паузирај"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Прекини пренос означене датотеке и избриши недовршену датотеку"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Настави"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Прекини пренос датотеке"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Обавести ме када се заврши пренос датотеке"
+msgid "Cancels the selected file transfer"
+msgstr "Прекини пренос означене датотеке"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Отвори садржавајућу фасциклу"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Сакрива прозор"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Паузирај"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Настави"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "листа преноса датотека"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Отвори садржавајућу фасциклу"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Боје језичака статуса разговора</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Налог"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Подебљано"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Група"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Контакт"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Састављање"
+msgid "Gajim Themes Customization"
+msgstr "Персонализација Гајим тема"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Контакт"
+msgid "Text _color:"
+msgstr "Боја текст_а:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Изглед фонта:"
+msgid "_Background:"
+msgstr "_Позадина:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Персонализација Гајим тема"
+msgid "Text _font:"
+msgstr "_Фонт текста:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Отишао"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Група"
+msgid "Font style:"
+msgstr "Изглед фонта:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Неактивно"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Подебљано"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Курзив"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Паузирано"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Састављање"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Неактивно"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Боје језичака статуса разговора</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Отишао"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1389,7 +1237,7 @@ msgstr ""
 "Поруке\n"
 "вишекорисничког разговора"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1397,105 +1245,98 @@ msgstr ""
 "Усмерене поруке\n"
 "вишекорисничког разговора"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Паузирано"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Боја текст_а:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Фонт текста:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Позадина:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Промени _надимак..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Управљање собама"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Промени _тему..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Подеси _собу..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Маркирај ову со_бу"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "Уништи собу"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Управљање собама"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "Умањи прозор на затварање"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Глас"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Маркирај ову со_бу"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Мо_дератор"
+msgid "_Send Private Message"
+msgstr "_Пошаљи приватну поруку"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "_Акције присутних"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Пошаљи _датотеку"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "_Акције присутних"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Додај на листу контаката"
+msgid "_Voice"
+msgstr "_Глас"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Мо_дератор"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Члан"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Админ"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Забрани"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Власник"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Избаци"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Члан"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Власник"
+msgid "_Ban"
+msgstr "_Забрани"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Пошаљи приватну поруку"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Глас"
+msgid "_Add to Roster"
+msgstr "_Додај на листу контаката"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Маркирај ову собу (Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Прикажи листу форматирања"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Промени надимак (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Маркирај ову собу (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1507,39 +1348,19 @@ msgid "From:"
 msgstr "Од:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 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."
-msgstr ""
-"<b>УПОЗОРЕЊЕ:</b>\n"
-"Ако планирате да радите већа уклањања, потрудите се да Гајим није покренут. "
-"Уопште, избегавакте уклањања контаката са којима тренутно разговорате."
+msgid "Gajim History Logs Manager"
+msgstr "Гајим менаџер дневника историјата"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Обриши"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Извези"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Гајим менаџер дневника историјата"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1553,173 +1374,199 @@ msgstr ""
 "Користите овај програм да обришете или извезете дневнике. Можете одабрати "
 "дневнике са леве стране и/или претражити базу испод."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>УПОЗОРЕЊЕ:</b>\n"
+"Ако планирате да радите већа уклањања, потрудите се да Гајим није покренут. "
+"Уопште, избегавакте уклањања контаката са којима тренутно разговорате."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Претражи базу података"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Сви статуси"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Историјат разговора"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Извези"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Име контакта"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Групни разговори"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Сви статуси"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Историјат разговора"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Претрага:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Записуј у дневник статусне промене контаката"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Наложен"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "џид"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Наложен"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Уђи у ову собу аутоматски када се повежем"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Соба:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Надимак:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Недавно:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Недавно:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Уђи у ову собу аутоматски када се повежем"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Соба:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Маркирај ову собу"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Сервер:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Маркирај ову собу"
+msgid "Bro_wse Rooms"
+msgstr "_Преглед"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Придружи се"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Аутоматско повезивање"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Ако је означено, Гајим ће се придружити овом групном разговору при покретању"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Подешавање маркера"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Умањи прозор на ауто повезивање"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Наслов:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Испис статуса:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Аутоматско повезивање"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Ако је означено, Гајим ће се придружити овом групном разговору при покретању"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Наслов:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Умањи прозор на ауто повезивање"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1730,100 +1577,103 @@ msgid "_Configure"
 msgstr "_Конфигуриши"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Карактеристике</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP спој\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Подешавања</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP спој\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Подешавање прокси профила"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "Врс_та:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Лозинка:"
+msgid "_Name:"
+msgstr "_Име:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Прокси _хост:"
+msgid "<b>Properties</b>"
+msgstr "<b>Карактеристике</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Прокси _порт:"
+msgid "Use HTTP prox_y"
+msgstr "Кор_исти HTTP прокси"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH адреса:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Кор_исти HTTP прокси"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Користи прокси пријављивање"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Корисничко име:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH адреса:"
+msgid "Pass_word:"
+msgstr "Лозинка:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Име:"
+msgid "Proxy _Host:"
+msgstr "Прокси _хост:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "Врс_та:"
+msgid "Proxy _Port:"
+msgstr "Прокси _порт:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Корисничко име:"
+msgid "<b>Settings</b>"
+msgstr "<b>Подешавања</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Подешавање налога"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Лозинка"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Одобри ауторизацију"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Доступан"
+msgid "Version:"
+msgstr "ГТК+ верзија:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Конфигуриши"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Опис:"
+msgid "Authors:"
+msgstr "_Одобри ауторизацију"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1831,39 +1681,32 @@ msgid "Homepage:"
 msgstr "<b>Лична страна:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Застој"
+msgid "Description:"
+msgstr "Опис:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+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 ""
+msgid "Installed"
+msgstr "Застој"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1877,220 +1720,291 @@ msgid "Event desc"
 msgstr "догађај"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Напредна измена конфигурације</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Увек користи апликацију коју оперативни систем нуди"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Апликације</b>"
+msgid "Custom"
+msgstr "Кориснички"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Акције</b>"
+msgid "All chat states"
+msgstr "Сви статуси"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Ауто статус</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Састављање"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Изглед разговора</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Онемогућено"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Боје линија разговора</b>"
+#, fuzzy
+msgid "Never"
+msgstr "Сервер"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Обавештења стања разговора</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Никад\n"
+"Само за догађаје на чекању\n"
+"Увек"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Услови</b>"
+msgid "Always"
+msgstr "Одсутан"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr ""
 
-#. 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>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Обавести ме о контактима који се _одјаве"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Фонт</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Прикажи догађај у листи контаката"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Гмаил Опције</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Већ постављене статусне поруке</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Приватност</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Изглед листе контаката</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Последњи статус: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Статусне поруке</b>"
+msgid "Preferences"
+msgstr "Подешавања"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Теме</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Прикажи _аватаре контаката на листи"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Средње име:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Ако је означена, Гајим ће приказивати аватаре контаката у листи контаката и "
+"у групним разговорима"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Визуална обавештења</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Прикажи статусне поруке контаката на листи"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
+"контакта у листи контаката и у групним разговорима"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Напредно"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Прикажи _расположења контаката на листи"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Напредно..."
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
 
 #: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Сви статуси"
+msgid "Sort contacts by status"
+msgstr "Сортирај контакте по статусу"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Дозволи слање података о ОС-у"
+msgid "in _roster"
+msgstr "у _листи контаката"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Дозволи слање података о ОС-у"
+msgid "in _group chats"
+msgstr "у _групним разговорима"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Омогући искачуће прозоре/обавештења када сам _одсутан/недоступан/запослен/"
-"невидљив"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Изглед листе контаката</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Доз_воли звукове када сам заузет"
+msgid "_Window behavior:"
+msgstr "Понашање прозора:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Одсутан"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ако није онемогућено, Гајим ће заменити ascii смајлије као нпр. ':)' са "
+"еквивалентним анимираним или статичним графичким смајлијима"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Питај за статусну поруку при:"
+msgid "_Emoticons:"
+msgstr "_Смајлији:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Начини прозор поруке компактним"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Сакриј сву дугмад у прозору разговора"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Игнориши богато форматирани садржај у пристиглим порукама"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Порука разговора:"
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Провери по стартовању да ли је Гајим подразумевани џабер клијент"
+msgid "_Highlight misspelled words"
+msgstr "_Обоји погрешно написане речи"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Састављање"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Конфигурисање боје и фонта интерфејса"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "_Прикажи листу контаката"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Порука разговора:"
+msgid "Show icon when your messages are received"
+msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Име контакта"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Кориснички"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Изглед разговора</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Када се прими нови догађај:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Обавести ме о контактима који се _пријаве"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Обавести ме о контактима који се _одјаве"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Гајим ће Вас обавестити о контактима који су се управо одјавили са искачућим "
+"прозором у доњем десном углу екрана"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Онемогућено"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Омогући искачуће прозоре/обавештења када сам _одсутан/недоступан/запослен/"
+"невидљив"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Прикажи активности контаката на листи"
+msgid "Notify on new _GMail email"
+msgstr "Обавести ме о новопристиглој Гмаил е-мејл пошти"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Прикажи додатне е-мејл детаље"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Ако је означена, Гајим ће приказати поруку када се прими нови е-мејл преко "
+"GMail-амејлова"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Прикажи _расположења контаката на листи"
+msgid "Display _extra email details"
+msgstr "Прикажи додатне е-мејл детаље"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Прикажи _песме контаката на листи"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Ако је означена, Гајим ће уједно укључити и информације о пошиљаоцу нових е-"
+"мејлова"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Прикажи _аватаре контаката на листи"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Гмаил Опције</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Прикажи _расположења контаката на листи"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Прикажи статусне поруке контаката на листи"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Визуална обавештења</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Пуштај звукове"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Поде_си..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Доз_воли звукове када сам заузет"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Звукови</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+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 "
@@ -2100,7 +2014,11 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се приказивати у "
 "прозорима разговора."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Приказана обавештења о стању разговора:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2110,688 +2028,629 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се слати другој "
 "особи."
 
-#: ../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 ""
-"Гајим ће Вас обавестити о контактима који су се управо одјавили са искачућим "
-"прозором у доњем десном углу екрана"
-
-#: ../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 ""
-"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
-"систем користите"
-
-#: ../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:61
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
-"Ако је означена, Гајим ће аутоматски променити статус у Одсутан када рачунар "
-"није у употреби."
-
 #: ../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 ""
-"Ако је означена, Гајим ће променити статус у Недоступан када рачунар још "
-"дуже није у употреби"
+msgid "_Send chat state notifications:"
+msgstr "Пошаљи обавештења о стању разговора:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Ако је означена, Гајим ће приказивати аватаре контаката у листи контаката и "
-"у групним разговорима"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Обавештења стања разговора</b>"
 
 #: ../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 ""
-"Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
-"контакта у листи контаката и у групним разговорима"
+msgid "Personal Events"
+msgstr "Лични догађаји"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Ако је означена, Гајим ће приказивати активности контаката у листи контаката"
+msgid "_Away after:"
+msgstr "Аутом_атски одсутан после:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
+"Ако је означена, Гајим ће аутоматски променити статус у Одсутан када рачунар "
+"није у употреби."
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
+msgid "_Not available after:"
+msgstr "Аутоматски _недоступан након:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"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: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 ""
-"Ако је означена, Гајим ће осветљавати грешке у куцању у пољима за унос "
-"прозора разговора. Ако се језик експлицитно не постави преко десног клика на "
-"поље за унос, подразумевани језик ће бити коришћен за овај контакт или "
-"групни разговор."
+msgid "minutes"
+msgstr "минута"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"Ако је означена, Гајим ће игнорисати све долазне догађајеКористите са "
-"опрезом, блокираће све поруке које долазе од људи ван Ваше листе контаката"
-
-#: ../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 ""
-"Ако је означена, Гајим ће држати дневнике шифрованих разговора. Приметити да "
-"када се користи E2E енкрипција, друга страна мора да се сложи са чувањем "
-"дневника, у супротном се поруке неће памтити."
-
-#: ../data/gui/preferences_window.ui.h:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Ако је означена, Гајим ће приказати поруку када се прими нови е-мејл преко "
-"GMail-амејлова"
+"Аутоматска статусна порука при одсутности. Ако је празно, Гајим неће "
+"изменити тренутну статусну поруку\n"
+"$S ће бити замењено претходном статусном поруком\n"
+"$T ће бити замењено са временом одсутности"
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Ако је означено, Гајим ће користити статусне иконе специфичне за протокол. "
-"(нпр. контакт са МСН-а ће имати мсн иконе за своје статусе)"
-
-#: ../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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Ако није онемогућено, Гајим ће заменити ascii смајлије као нпр. ':)' са "
-"еквивалентним анимираним или статичним графичким смајлијима"
+"Аутоматска статусна порука при недоступности. Ако је празно, Гајим неће "
+"изменити тренутну статусну поруку\n"
+"$S ће бити замењено претходном статусном поруком\n"
+"$T ће бити замењено са временом недоступности"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Уписуј у дневник шифроване сесије разговора"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Ауто статус</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Начини прозор поруке компактним"
+msgid "Ask status message when I:"
+msgstr "Питај за статусну поруку при:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Поде_си..."
+msgid "Sign _in"
+msgstr "Пријављивању"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "Сервер"
+msgid "Sign _out"
+msgstr "Одјављивању"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Обавештења"
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Обавести ме о контактима који се _пријаве"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Статусне поруке</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Обавести ме о контактима који се _одјаве"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Већ постављене статусне поруке</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "Обавести ме о контактима који се _одјаве"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Статус"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Обавести ме о новопристиглој Гмаил е-мејл пошти"
+msgid "Use system _default"
+msgstr "Користи системски подразумевано"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Никад\n"
-"Само за догађаје на чекању\n"
-"Увек"
+msgid "Chat message:"
+msgstr "Порука разговора:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Лични догађаји"
+msgid "<b>Font</b>"
+msgstr "<b>Фонт</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Пуштај звукове"
+msgid "Use _transports icons"
+msgstr "Користи иконе за _транспорте"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 msgstr ""
+"Ако је означено, Гајим ће користити статусне иконе специфичне за протокол. "
+"(нпр. контакт са МСН-а ће имати мсн иконе за своје статусе)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Подешавања"
+msgid "Status _iconset:"
+msgstr "Скуп статусних икона:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Конфигурисање боје и фонта интерфејса"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "Т_ема:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Сервер:"
+msgid "<b>Themes</b>"
+msgstr "<b>Теме</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Notification-daemon"
+msgid "Contact's nickname:"
+msgstr "Име контакта"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Прикажи догађај у листи контаката"
+msgid "Your nickname:"
+msgstr "Надимак:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Пријављивању"
+msgid "_Status message:"
+msgstr "_Статусна порука:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Одјављивању"
+msgid "_URL highlight:"
+msgstr "URL осветљавање:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Поново учитај подразумеване боје"
 
 #: ../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 ""
-"Неке поруке могу укључивати богати садржај (форматирање, боје итд.). Ако је "
-"означено, Гајим ће само приказивати сирови текст поруке."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Порука разговора:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Сортирај контакте по статусу"
+#, fuzzy
+msgid "Your message:"
+msgstr "Порука грешке: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Статус"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Бојење Порука Са Групног Разговора"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Скуп статусних икона:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Боје линија разговора</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стил"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "Т_ема:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Акције</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"Аутоматска статусна порука при одсутности. Ако је празно, Гајим неће "
-"изменити тренутну статусну поруку\n"
-"$S ће бити замењено претходном статусном поруком\n"
-"$T ће бити замењено са временом одсутности"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"Аутоматска статусна порука при недоступности. Ако је празно, Гајим неће "
-"изменити тренутну статусну поруку\n"
-"$S ће бити замењено претходном статусном поруком\n"
-"$T ће бити замењено са временом недоступности"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Користи иконе за _транспорте"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Увек користи апликацију коју оперативни систем нуди"
+msgid "<b>Video</b>"
+msgstr "<b>Средње име:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Користи системски подразумевано"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сервер:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Услови</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "Када се прими нови догађај:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Порука грешке: %s"
+msgid "_File manager:"
+msgstr "_Прегледач датотека:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Надимак:"
+msgid "_Mail client:"
+msgstr "_Е-мејл клијент:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "Аутом_атски одсутан после:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Интернет прегледач:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Приказана обавештења о стању разговора:"
+msgid "<b>Custom</b>"
+msgstr "<b>Персонални</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Смајлији:"
+msgid "<b>Applications</b>"
+msgstr "<b>Апликације</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Прегледач датотека:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Игнориши догађаје од контаката који нису на листи"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Обоји погрешно написане речи"
+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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Игнориши догађаје од контаката који нису на листи"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Дозволи слање података о ОС-у"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Игнориши богато форматирани садржај у пристиглим порукама"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
+"систем користите"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Записуј у дневник статусне промене контаката"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Дозволи слање података о ОС-у"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Е-мејл клијент:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
+"систем користите"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "Аутоматски _недоступан након:"
+msgid "Log _encrypted chat session"
+msgstr "Уписуј у дневник шифроване сесије разговора"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Отвори..."
+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 ""
+"Ако је означена, Гајим ће држати дневнике шифрованих разговора. Приметити да "
+"када се користи E2E енкрипција, друга страна мора да се сложи са чувањем "
+"дневника, у супротном се поруке неће памтити."
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "_Поново учитај подразумеване боје"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Дозволи слање података о ОС-у"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "Пошаљи обавештења о стању разговора:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Статусна порука:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "URL осветљавање:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Приватност</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "Понашање прозора:"
+msgid "_Log status changes of contacts"
+msgstr "_Записуј у дневник статусне промене контаката"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "у _групним разговорима"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "у _листи контаката"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Провери по стартовању да ли је Гајим подразумевани џабер клијент"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "минута"
+msgid "_Open..."
+msgstr "_Отвори..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Напредна измена конфигурације</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Напредно"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Листе приватности:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Додај / Измени правило</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Листа приватности"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Листа правила</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Листа приватности</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Активно за ову сесију"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Актовно по сваком покретању"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Листа правила</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Сви"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Додај / Измени правило</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Све (укључујући и претплате)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Дозволи"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Одбиј"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Џабер ИД"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "све у групи"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Поредак:"
+msgid "all by subscription"
+msgstr "све према претплати"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Листа приватности"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Сви"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "све према претплати"
+msgid "to send me messages"
+msgstr "да ми шаље поруке"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "све у групи"
+msgid "to send me queries"
+msgstr "да ми шаље упите"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Обоје"
+msgid "to view my status"
+msgstr "да види мој статус"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Од"
+msgid "to send me status"
+msgstr "да ми пошаље статус"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "један"
+msgid "All (including subscription)"
+msgstr "Све (укључујући и претплате)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "два"
+msgid "Order:"
+msgstr "Поредак:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "да ми шаље поруке"
+#, fuzzy
+msgid "none"
+msgstr "један"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "да ми шаље упите"
+#, fuzzy
+msgid "both"
+msgstr "Обоје"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "да ми пошаље статус"
+#, fuzzy
+msgid "from"
+msgstr "Од"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "да види мој статус"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Адреса</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Аватар:</b>"
+#, fuzzy
+msgid "to"
+msgstr "два"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Рођендан:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Град:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Презиме:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Фирма:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Држава:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Средње име:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Одсек:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>Е-мејл:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Префикс:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Додатна адреса:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Име:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Презиме:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Суфикс:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Пуно име</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Улица:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Име:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Град:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Лична страна:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Покрајина:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Додатна адреса:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Средње име:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Поштански број:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Име:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Држава:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Надимак:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Адреса</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Број телефона:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Лична страна:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Позиција:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Име:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Поштански број:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Надимак:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Број телефона:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Префикс:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Формат: ГГГГ-ММ-ДД"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Улога:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Рођендан:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Покрајина:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>Е-мејл:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Улица:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Аватар:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Кликните да бисте поставили Ваш аватар"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Суфикс:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Личне информације"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Фирма:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "О"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Позиција:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Кликните да бисте поставили Ваш аватар"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Одсек:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Формат: ГГГГ-ММ-ДД"
+msgid "<b>Role:</b>"
+msgstr "<b>Улога:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Личне информације"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Посао"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Шта желите да урадите?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "О"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Уклони налог само из Гајима"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Уклони налог и из Гајима и са сервера"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Шта желите да урадите?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Уклони"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Размена ставки контаката"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2799,115 +2658,112 @@ msgstr ""
 "<b>неко@домаћин.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 "Тело поруке <тренутно се не користи, па је подразумевано сакривено>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Размена ставки контаката"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_У реду"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Додај контакт..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "_Могућности"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Акције"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Преноси да_тотека"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Додај контакт..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Често постављана питања (интернет)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Измени"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Помоћ са интернета"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Налози"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Профил, А_ватар"
+
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Профил, А_ватар"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Приказ"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Прикажи контакте који нису на вези"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Прикажи само _активне контакте"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Прикажи транс_порте"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Прикажи контакте који нису на вези"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "_Прикажи листу контаката"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Налози"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+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:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Акције"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Помоћ"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Измени"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Помоћ са интернета"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_ЧПП"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Помоћ"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Пошаљи једну _поруку..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Често постављана питања (интернет)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Приказ"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Молимо сачекајте док се добавља формулар претраге..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Могућности"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Претрага"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Молимо сачекајте док се добавља формулар претраге..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Додај _контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "Информације"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Претрага"
 
@@ -2927,41 +2783,37 @@ msgstr "Региструј се на"
 msgid "_Cancel"
 msgstr "_Одустани"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Одговори на ову поруку"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "За:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "П_ошаљи"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Пошаљи поруку"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Пошаљи поруку и затвори прозор"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Одговор"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "За:"
+msgid "Reply to this message"
+msgstr "Одговори на ову поруку"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Одговор"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Пошаљи и затвори"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Пошаљи поруку и затвори прозор"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Одобри ауторизацију"
+msgid "Subscription Request"
+msgstr "Захтев за претплатом"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Одобри ауторизацију контакта тако да може да види када сте на вези"
+msgid "_Deny"
+msgstr "_Одбиј"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2969,262 +2821,274 @@ msgid ""
 "connected"
 msgstr "Одбиј ауторизацију тако да не може да види када сте на вези"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Захтев за претплатом"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Одобри ауторизацију"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Одбиј"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Одобри ауторизацију контакта тако да може да види када сте на вези"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Синхронизуј контакте"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Одаберите налог са којим желите да се синхронизујете"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Одаберите контакте које желите да синхронизујете"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхронизација: одаберите контакте"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Угаси звукове"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Пошаљи _једну поруку"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Прикажи св_е догађаје на чекању"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Одаберите контакте које желите да синхронизујете"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Ста_тус"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Групни разговор"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Ауторизација:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Пошаљи _једну поруку"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Клијент:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Прикажи св_е догађаје на чекању"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Време контакта на вези:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Угаси звукове"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Информације контакта"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Џабер ИД:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Статус:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Пријава:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Клијент:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Систем:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Коментари"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Време контакта на вези:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Аватар:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Конфигурисани аватар:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Контакт"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Пријава:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Информације контакта"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Ауторизација:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Још"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Кориснички аватар:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Контакт"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Фонт</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Коментари"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Џабер саобраћај</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Унос</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Инфо/Упит"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Фонт</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_ИУ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Инфо/Упит"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Присутност"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Присутност"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Унос</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Измени налог..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Локални џабер ИД:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Лично"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Џабер клијент"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Лично"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Гајим Брзе Поруке"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Џабер IM Клијент"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Џабер клијент"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Поништи одобравање"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Тренутно извршавате команду. Да ли желите да је прекинете?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Неисправна соба"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Сервис је послао лоше податке"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Сервис је изменио идентификатор сесије."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ад-хок команде - Гајим"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Сервис је вратио грешку."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Активирано"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Деактивирано"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Да/Не"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Цео број"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Боја"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Име поставке"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Вредност"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(ништа)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Скривен"
 
@@ -3236,240 +3100,183 @@ msgstr[0] "Примили сте нове уносе (%(count)d није при�
 msgstr[1] "Примили сте нове уносе (%(count)d није приказано):"
 msgstr[2] "Примили сте нове уносе (%(count)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)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Енглески"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Белоруски"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Бугарски"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Бретански"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Чешки"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Немачки"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Грчки"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Британски"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Есперанто"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Шпански"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Баскијски"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Француски"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Хрватски"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Италијански"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Норвешки (б)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Холандски"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Норвешки"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Пољски"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Португалски"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Бразилски португалски"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Руски"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Српски"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Словачки"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Пинг?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Шведски"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Кинески (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Понг! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Језик за правопис"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Грешка."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Веза није доступна"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Подвучено"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Прецртано"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Фонт"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Очисти форматирање"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Стварно пошаљи датотеку?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG енкрипција омогућена"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Овак контакт не подржава пренос датотека."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Није на листи контаката"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Могућност није доступна под Виндоуз системом."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Пошаљи _датотеку"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Овак контакт не подржава пренос датотека."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Морате знати прави џабер ИД контакта да бисте му/јој послали датотеку."
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Нема додељеног GPG кључа"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Ниједан GPG кључ није додаљен овом контакту. Не можете шифровати поруке са "
 "GPG-ом."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG енкрипција онемогућена"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Сесија ЋЕ бити памћена"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Сесија НЕЋЕ бити памћена"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "је"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "НИЈЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "ће"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "НЕЋЕ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "и пријављени"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3478,57 +3285,57 @@ msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Сесија НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Ова сесија је шифрована"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "и БИЋЕ памћена"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "и НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Следећа порука НИЈЕ била шифрована"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Следећа порука је била шифрована"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3536,13 +3343,14 @@ 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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3551,169 +3359,471 @@ msgstr ""
 "Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
 "уклоните (сав историјат порука ће бити изгубљен)."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Не могу да дешифрујем поруку од контакта %s\n"
+"Можда је промењена."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Преноси датотека"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Величина: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "_Налози"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Пренос датотеке завршен"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Позив на групни разговор"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Удаљени контакт је прекинуо пренос"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Грешка при отварању датотеке"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Пренос датотеке заустављен"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Пренос датотеке прекинут"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Није могуће успоставити везу са другом страном."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Начин коришћења: /%s, сакрива дугмад."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Начин коришћења: /%s, шаље поруку контакту"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s није пронађен"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Одсутан"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Доступан"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Начин коришћења: /%s, празни текстуални прозор"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Укључи/искључи Open_PGP енкрипцију"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Начин коришћења: /%s, шаље пинк контакту"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Команда није подржана за zeroconf  налог."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s није исправан ниво логовања"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Веза није доступна"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Веза није доступна"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Промени надимак (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Неисправан надимак"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr "Начин коришћења: /%s <надимак>, отвара приватни разговор са учесником."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Надимак није пронађен: %s "
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr "Начин коришћења: /%s <надимак>, отвара приватни разговор са учесником."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Питај пре затварања прозора/језичка групног разговора."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Пошаљи %s за %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Позвани сте у групни разговор"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Неисправан сервер"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "везаност измењена"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Начин коришћења: /%s , приказује имена учесника у групном разговору."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Недостаје аргумент \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "креирам базу дневника"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Гајим ће се сада завршити"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "креирам фасциклу %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Измени статусне информације"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Измени статус"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Постави тип присутности и опис"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "На вези"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Дуже одсутан"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Не сметај"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Није на вези"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Опис присутности:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Статус се променио."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Напусти групне разговоре"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Ппридружили сте се групном разговору."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Групни разговори"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Напустили сте следеће групне разговоре:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Проследи непрочитане поруке"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Све непрочитане поруке су прослеђене."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Проследи непрочитане поруке"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Пусти звук када је корисник заузет"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Користи ДБус и демон обавештења за приказивање обавештења"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Прикажи у листи само контакте који су на вези и слободни за ћаскање."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време у минутама, наком кога ће се Ваш статус промеити у Одсутан."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Одсутан, као последица мировања више од $T мин.)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом одсутности."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време у минутама, наком кога ће се Ваш статус промеити у Није доступан."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Није доступан, као последица мировања више од $T мин.)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом "
 "недоступности"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
@@ -3721,64 +3831,120 @@ msgstr ""
 "Када приказати иконицу у системској касети. Може бити 'never', 'on_event', "
 "'always'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Боја за долазни надимак."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Боја за одлазни надимак."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Боја долазног текста."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Боја одлазног текста."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Боја текста статусне поруке."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Прикажи догађај у листи контаката"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Прикажи догађај у листи контаката"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Прегледај нове поруке у искачућим обавештењима?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Захтев за преносом датотеке"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Пренос датотеке прекинут"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Позив на групни разговор"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Фонт долазног надимка."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Фонт одлазног надимка."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Фонт долазног текста."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Фонт одлазног текста."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Фонт текста статусне поруке."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 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:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "подразумевано"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Језик који користи правопис"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3788,7 +3954,7 @@ msgstr ""
 "'понекад' - исписуј време сваких print_ichat_every_foo_minutes минута.\n"
 "'никад' - никад не исписуј време."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3799,18 +3965,18 @@ msgstr ""
 "најнепрецизнији. Ово се користи само уколико је приказивање_времена "
 "поставњено на 'понекад'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Сматрај * / _ парове као знакове за форматирање."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако је истинито, не уклањај */_ . Тако ће *абв* бити подебљано, али "
 "иокружено са * *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3821,7 +3987,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ако желите да користите ово, инсталирајте "
 "docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3829,7 +3995,7 @@ msgstr ""
 "Карактер за додавање после надимка када се користи довршавање надимка "
 "(тастером tab) у групном разговору"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3837,7 +4003,13 @@ msgstr ""
 "Карактер који желите додати после жељеног надимка уколико је жељени надимак "
 "у групном разговору већ употребљен"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3848,44 +4020,51 @@ msgstr ""
 "документацију за strftime, за пуну документацију: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Карактери који ће бити приказани пре надимка у разговору"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Карактери који ће бити приказани после надимка у разговору"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Додај * и [n] у наслов листе контаката?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Колико линија претходног разговора памтити када се прозор/језичак  за "
 "разговор поново отвори."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колико минута да трају линије претходног разговора."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "Колико линија тражити од сервера при уласку на групни разговор."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "Од пре колико минута тражити дневнике при уласку на групни разговор."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3893,7 +4072,12 @@ msgstr ""
 "Колико секунди чекати пре поновног аутоматског придруживања соби са које сте "
 "раскачени. Ставити 0 да онемогућите поновно аутоматско придруживање."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3901,11 +4085,11 @@ msgstr ""
 "Пошаљи поруку са Ctrl+Enter, а са Enter прави нову линију. (Подразумевано "
 "понашање Миралабисовог ICQ клијента)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колико линија сачувати са Ctrl+KeyUP"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3914,11 +4098,11 @@ msgstr ""
 "Или Ваш специфицирани УРЛ са %s у њему где је %s реч или фраза или 'ВИКИ-"
 "РЕЧНИК' што значи коришћење вики-речника."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ако је означено, Гајим се може контролисати коришћењем gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3929,14 +4113,14 @@ msgstr ""
 "рачуна (ако немају listen_to_network_manager постављен на неистинито и "
 "синхронизуј са глобалним статусом) у зависности од статуса мрежне конекције."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3944,7 +4128,7 @@ msgstr ""
 "Приказана обавештења о стању разговора у прозору за разговор. Може бити "
 "једно од 'сви', 'само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3952,36 +4136,39 @@ msgstr ""
 "Ако се не исписује време за сваку поруку (print_time==понекад), исписати га "
 "сваких x минута"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питај пре затварања прозора/језичка групног разговора."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Увек питај пре затварања језичка/прозора када је у питању ова листа одвојена "
 "бланко карактерима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Никад не питај пре затварања језичка/прозора групног разговора када је у "
 "питању ова листаодовојена бланко знацима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Питај пре затварања језичка ћаскања ако постоји контрола која може изгубити "
 "податке (ћаскање, приватно ћаскање, групни разговор који неће бити "
 "минимизован)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3989,28 +4176,34 @@ msgstr ""
 "Листа хостова одвојена зарезима, коју шаљемо, уз локалне интерефејсе, за "
 "трансфер датотека, у случају прослеђивања порта/НАТовања."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандард дефинише КiБ = 1024 бајтова, КБ = 1000 бајтова"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Обавести ме о свим догађајима у икони системске касете."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Прикажи језичак иако је само један разговор?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Прикаши границу свеске у прозорима разговора?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4021,18 +4214,18 @@ msgstr ""
 "приоритет, одвојени зарезима. Валидне групе су 1, 2, 5, 14, 15, 16, 17 и 18. "
 "Вишљи бројеви су сугурнији, али тада треба више времена за почетак сесије."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Прегледај нове поруке у искачућим обавештењима?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Листа речи одвојена бланко карактерима које ће бити обојене у групним "
 "разговорима"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4041,14 +4234,14 @@ msgstr ""
 "Ако је истинито, Гајим се завршава када се притисне X дугме. Ово подешавање "
 "се користи само ако је икона системске касете у употреби."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ако је истинито, Гајим проверава да ли је подразумевани џабер клијент на "
 "сваком стартовању."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4056,7 +4249,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати икону на сваком језичку који садржи "
 "непрочитане поруке. У зависности од теме, икона може бити и анимирана."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4064,12 +4257,12 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати статусну поруку (ако није празна) за "
 "сваки контакт у листи контаката"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Дефинишите позицију аватара у листи контаката. Може бити лево или десно"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4077,7 +4270,7 @@ msgstr ""
 "Ако је истинито, Гајим ће послати упит за аватар за сваки контакт који "
 "прошлог пута није  имао аватар или је онај у меморији престар"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4085,9 +4278,10 @@ msgstr ""
 "Ако је неистинито, више нећете видети статусну порукуу разговорима када "
 "контакт промени свој статус и/или статусну поруку."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4099,30 +4293,34 @@ msgstr ""
 "све статусне поруке. Ако је \"in_and_out\". Гајим ће приказивати само поруке "
 "типа тај и тај је ушао/изашао у/из собе."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Боја позадине контакта када тек дођу на везу."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Боја позадине контакта када тек оду са везе."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ако је истинито, враћене поруке из историјата ће бити мањег фонта од "
 "подразумеваног."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Не приказуј аватар за сам транспорт."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Не приказуј листу контаката у системској касети."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4132,7 +4330,7 @@ msgstr ""
 "прозор бљеска (подразумевано понашање у већини менаџера прозора) при новим "
 "догађајима."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4143,7 +4341,8 @@ msgstr ""
 "у групним разговорима"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4151,7 +4350,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Контролише прозор где се смештају нове поруке.\n"
@@ -4162,31 +4361,39 @@ msgstr ""
 "'pertype' - Поруке истог типа (нпр., разговори и групни разговори) се шаљу у "
 "исти прозор."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ако је истинито, притисак на тастер 'esc' затвара језичак/прозор."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Сакрива дугмад у прозорима разговора."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Сакрива банер у прозору разговора две особе"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Сакрива листу учесника у прозору групног разговора"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4194,15 +4401,15 @@ msgstr ""
 "У разговору, прикажи надимак на почетку новог реда само када се не ради о "
 "истој особи која је причала и у прошлој поруци."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Увлачење при коришћењу спајања узастопних надимака."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Глатко скроловање у прозору разговора"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4210,11 +4417,11 @@ msgstr ""
 "Листа боја одвојена са \":\" које ће бити коришћене за бојење надимака у "
 "групним разговорима."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab иде на следећи језичак када нема непрочитаних језичака"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4222,7 +4429,7 @@ msgstr ""
 "Треба ли питати за потврду стварања псеудоконтакта или не? Празна ниска "
 "значи да никада не приказујемо дијалог."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4230,7 +4437,7 @@ msgstr ""
 "Треба ли приказивати дијалог за потврду блокирања контакта? Празна ниста "
 "значи да никада не приказујемо дијалог."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4238,7 +4445,7 @@ msgstr ""
 "Треба ли приказивати дијалог за потврду прилагођеног статуса? Празна ниска "
 "значи да никада не приказујемо дијалог."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4248,7 +4455,7 @@ msgstr ""
 "налог у прозору за измену подешавања налога. БУДИТЕ ОПРЕЗНИ, када сте "
 "повезани са негативним приоритетом НЕЋЕТЕ примати никакве поруке од сервера."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4256,7 +4463,7 @@ msgstr ""
 "Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4264,7 +4471,7 @@ msgstr ""
 "Ако је истинито, Гајим ће користити КДЕ Новчаник (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4272,7 +4479,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати укупан број корисника и број коринсика "
 "на вези у групним редовима."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4280,7 +4487,7 @@ msgstr ""
 "Може бити празно, 'chat' или 'normal'. Ако није празно, третира све долазне "
 "поруке као поруке постављеног типа"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4288,19 +4495,11 @@ msgstr ""
 "Ако је истинито, Гајим ће скроловати и означити контакт који Вам је последњи "
 "послао поруку, ако прозор разговора није отворен."
 
-#: ../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 ""
-"Ако је истинито, Гајим ће конвертовати све карактер између $$ и $$ у слику "
-"користећи dvips у ибацити је у прозор разговора."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Време неактивности после кога се прозор за измену статуса затвара."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4308,7 +4507,7 @@ msgstr ""
 "Максимум порука које се приказују у разоговору. Најстарије линије се "
 "склањају."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4317,18 +4516,12 @@ msgstr ""
 "Ако је истинито, прозор обавештења од сервиса обавештења ће бити закачен за "
 "системску касету."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 "Промените вредност да промените величину Латекс формула. Више је веће."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4336,21 +4529,22 @@ msgstr ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
 "uri. (mailto и xmpp се обрађују засебно)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Питај за статусне поруке ван везе за све контакте који нису на вези када се "
 "успостави веза са налогом. УПОЗОРЕЊЕ: ово ће послати много захтева серверу!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Ако је True, допуњавање у групним разговорима ће бити као допуњавање у "
 "конзоли"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4358,31 +4552,60 @@ msgstr ""
 "Када се приказује сопствени контакт. Може бити \"always\", "
 "\"when_other_resource\" or \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
+"подразумевана порука ће бити коришћена."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4390,7 +4613,7 @@ msgstr ""
 "Приоритет ће се аутоматски променити у зависности од Вашег статуса. "
 "Приоритети су дефинсани у autopriority_* подешавањима."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4399,39 +4622,39 @@ msgstr ""
 "dnd, invisible. ПАЖЊА: ова опција се користи само ако је "
 "restore_last_status  онемогућена."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Ако је омогућено, постави последњи коришћени статус."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Ако је True, контакти који траже ауторизацију ће аутоматски бити прихваћени."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Ако је False, налог ће бити онемогућен и неће се приказивати у листи "
 "контаката."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ако је онемогућено, не потписуј присуство са GPG кључем, чак иако је GPG "
 "конфигурисан."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Омогући ESessions енкрипцију за овај налог."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Да ли ће Гајим аутоматски стартовати шифровану сесију ако је могуће?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4439,49 +4662,64 @@ msgstr ""
 "Уређена листа (одвојена зарезима) типова конекције за пробу. Може садржати "
 "tls, ssl или plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Прикажи прозор упозорења пре коришћења стандардне SSL библиотеке."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Слање белина после неактивности"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "Слање XMPP пинга после неактивности"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Колико секунди чекати на одговор о пакетима о живости пре него што покушамо "
 "поновно успостављање везе."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 привремено решење"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4489,15 +4727,34 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Одговор на захтев примања"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Послати захтев примања"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
+"систем користите"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s Вам жели послати датотеку."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4505,20 +4762,52 @@ msgstr ""
 "Када се успоставља шифрована сесија, да ли Гајим треба да претпостави да "
 "желите да чувате поруке у дневнику?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Анонимно пријављивање"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Анон_имно пријављивање"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4526,108 +4815,108 @@ msgstr ""
 "Да ли Гајим треба аутоматски да започне шифровану везу са овим контактом "
 "када је могуће?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "све или размаком одвојен статус"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'да', 'не', или 'обоје'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Колико линија тражити од сервера при уласку на групни разговор."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Од пре колико минута тражити дневнике при уласку на групни разговор."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Једем"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Радим."
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Радим."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Напољу"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4636,27 +4925,185 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "намирнице"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "људска"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "За"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "захтев за укидање претплате од контакта %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Грешка при упису на диск"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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) или  уклоните (сав "
+"историјат порука ће бити изгубљен)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Соба групног разговора је уништена"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Можете се прикључити соби %s уместо ове"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Неисправан џабер ИД"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Порука од неисправног џабер ИД-а, игнорисана је."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "грешка приликом слања %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Непозната SSL грешка: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Нова Самостална Порука"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Нова самостална порука од контакта %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Нова Приватна Порука"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Нова приватна порука са групног разговора %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Нова порука од %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Нова Порука"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Нова порука од %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s је променио статус"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s је тренутно %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Контакт променио статус"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s је на вези"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Контакт је на вези"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s је отишао"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Контакт је отишао са везе"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Није могуће учитавање модула idle"
@@ -4666,213 +5113,188 @@ msgstr "Није могуће учитавање модула idle"
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Регистрација успешна"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрација са агентом %s успешна"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Регистрација неуспела"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, 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: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
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Невидљивост није подржана"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 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 "Неисправан џабер ИД"
-
-#: ../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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Желео бих да те додам на моју листу контаката."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Нисам успео да узмем CRL сертификата"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Нисам успео да дешифрујем потпис сертификата"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Нисам успео да дешифрујем CRL сертификата"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Нисам успео да декодирам јавни кључ издавача"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Грешка у потпису сертификата"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Грешка у CRL сертификата"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Сертификат још није валидан"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL није још валидан"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL је истекао"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка у формату сертифаковог поља од када је валидан"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка у формату сертифаковог поља до када је валидан"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Грешка у формату CRL-овогпоља последњег ажурирања"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Грешка у формату CRL-овогпоља следећег ажурирања"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Немам више меморије"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Самопотписани сертификат"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопотписани сертификат у ланцу сертификата"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "У немогућности да узмем сертификат локалног издавача"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "У немогућности да верификујем први сертификат"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Ланац сертификата предугачак"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Сертификат повучен"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Неисправан сертификат сертификационог тела (CA)"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Прекорачена дужина путање"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Неподржана сврха сертификата"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Сертификату се не верује"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Сертификат одбачен"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Погрешна тема издавача сертификата"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификатор кључа ауторизатора и теме се не поклапају"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серијски број ауторизатора и издавача се не поклапају"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Употреба кључа не укључује потписивање сертификата"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Није могуће послати поруку за %s, овај џабер ИД није исправан."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нити је удаљено присуство потписано, нити је кључ додељен."
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4881,76 +5303,77 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Непозната SSL грешка: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Неисправан одговор"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, python-format
 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:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Веза са \"%s\" није могућа"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер је одговорио: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, 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:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са налогом %s. Покушајте поново да се конектујете."
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4959,7 +5382,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4968,24 +5391,33 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Проверите Вашу конекцију или покушајте касније"
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Веза са \"%s\" није могућа"
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Пријављивање са \"%s\" неуспешно"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4994,66 +5426,66 @@ msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Послати контакти: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Послати контакти:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Одјава регистрације неуспела"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Преноси"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Није у листи контаката"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На овом рачунару недостају python везивања за D-Bus"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus могућности Гајима се не могу користити"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus не ради исправно на овом рачунару"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus не ради исправно на овом рачунару"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus не ради исправно на овом рачунару"
@@ -5068,7 +5500,7 @@ msgstr ""
 "Сервис није доступан: Гајим није покренут или је ставка подешавања "
 "remote_control неистинита"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus не постоји на овом рачунару или нема python модула."
 
@@ -5253,224 +5685,232 @@ msgstr "Крај недеље"
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Неисправан карактер у корисничком имену."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Неисправан карактер у имену хоста."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Потребна је адреса сервера."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Недоступан"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?статус преноса:Паузиран"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?статус преноса:Паузиран"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Није на вези"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Невидљив"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Од"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Обоје"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Учесници"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Учесник"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Члан"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "пише поруку..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5478,22 +5918,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " из собе %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " од корисника %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " од %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5501,21 +5941,40 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Истекло време за учитавање слике"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Слика је превелика"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL није још валидан"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Истекло време за учитавање слике"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Конфигурација собе"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5527,111 +5986,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Порука грешке: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Грешка приликом извршавања \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s није исправан ниво логовања"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Подразумевана порука"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Величина: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Датотека: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "зелена"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "грешка: не могу отворити %s за читање"
+msgid "Error: cannot open %s for reading"
+msgstr "Грешка: није могуће отворити %s за читање"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "цијан"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
@@ -6268,19 +6741,115 @@ msgstr "Учи"
 msgid "Writing"
 msgstr "Пише"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "подразумевано"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "морска"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Крије се"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Налог"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Налог"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Опис"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Грешка"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "један"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "соба"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Непознат извођач"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Непознат наслов"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Непознат извор"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6289,32 +6858,19 @@ msgstr ""
 "<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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 ""
-"Можда већ имате покренуту инстанцу Гајима. Пренос датотека ће бити прекинут."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Ово је део шифроване сесије. Уколико видите ово, нешто је пошло наопако.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Авахи грешка"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6323,44 +6879,43 @@ msgstr ""
 "%s\n"
 "Поруке локалне мреже можда неће радити како треба."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Није могуће покренути локални сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу се повезати на порт %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Молимо проверите да ли је avahi-демон покренут."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Није могуће променити статус рачуна \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Ваша порука није могла бити послата."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт није на вези. Вашу поруку није могуће послати."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6372,24 +6927,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка приликом додавања сервиса. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Подразумевана порука"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Омогућен"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Речник за језик %s није доступан"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6398,214 +6953,215 @@ msgstr ""
 "Морате инсталирати %s речник како бисте могли користити проверу правописа, "
 "или одаберите други језик поставком speller_language опције."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "текст статусне поруке"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP није могуће користити на овом рачунару"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Непрочитани догађаји"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Отворили сте разговор у рачуну %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "За промену имена налога, морате отићи са везе."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Да бисте променили име налога, морате прво прочитати све догађаје на чекању."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Име Налога Већ У Употреби"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ово име већ користи један од Ваших налога. Молимо Вас, одаберите друго име."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Неисправно име налога"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Име налога не може бити празно."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Преименуј налог"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Унесите ново име за налог%s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Џабер ИД мора бити облика \"корисник@сервер\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Нема доступних OpenPGP тајних кључева."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Није доступан такав налог"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Ваш сервер не подржава Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Да бисте онемогућили налог, морате бити раскачени."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Листа забрана"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Листа чланова"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Листа власника"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Листа администратора"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "ЏИД"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Разлог"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Надимак"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Улога"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Забрана..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6613,11 +7169,11 @@ msgstr ""
 "<b>Кога желите забранити?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Додавање члана..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6625,11 +7181,11 @@ msgstr ""
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6637,11 +7193,11 @@ msgstr ""
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6649,7 +7205,7 @@ msgstr ""
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6665,109 +7221,106 @@ msgstr ""
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Шта желите да урадите?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Уклони налог само из Гајима"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Неисправан надимак"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Карактер није дозвољен"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Неисправан сервер"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Неисправна соба"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6776,32 +7329,32 @@ msgstr ""
 "Можете поставити напредна подешавања налога притиском на дугме Напредно, или "
 "касније, кликом на ставку менија Налози под менијем Уреди из главног прозора."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Ваш нови налог је успешно направљен"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Неисправно корисничко име"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Молимо одредите сервер на коме желите да се региструјете."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6816,7 +7369,7 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6827,72 +7380,89 @@ msgstr ""
 "SHA1 отисак овог сертификата:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP чвор није уклоњен"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Конфигуриши"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Активно"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "догађај"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Примљена Прва Порука"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Примљена Прва Порука"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Следећа Примљена Порука Фокусирана"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Следећа Примљена Порука Нефокусирана"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Контакт На Вези"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Контакт Отишао Са Везе"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Порука Послата"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Примљен Гмаил е-мејл"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6902,7 +7472,7 @@ msgstr ""
 "стигла на други крај. Ако ова икона остане овако \n"
 "дуго времена, вероватно је да се порука изгубила."
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6910,237 +7480,238 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Цитат"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Јуче"
 msgstr[1] "Јуче"
 msgstr[2] "Јуче"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Није могуће учитавање модула idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Невидљивост није подржана"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Џабер ID већ у листи контаката"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Џабер ID који сте унели је већ на листи. Одаберите неки други."
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Џабер ИД: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "У групи"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ИД Кључа"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Име контакта"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Постави расположење"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Статусна порука"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Статусна порука"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Препиши статусну поруку?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Сними као већ постављену статусну поруку"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "АИМ адреса:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "ГГ Број:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Број:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN адреса:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адреса:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати на налог %s"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "ГТК+ џабер клијент"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Џабер клијент"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "ГТК+ верзија:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyГТК верзија:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Тренутни програмери:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Прошли програмери:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "ЗАХВАЛНИЦЕ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7153,100 +7724,154 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Несигурна веза"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
+"PyOpenSSL да спречите ово. Да ли желите да наставите?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Да, заиста желим да се конектујем несигурном везом"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Не питај ме више"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Већ сте у групном разговору %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Придружите се групном разговору преко налога %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Лош uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Ово није групни разговор"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Неисправан налог"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Морате одабрати налог са кога желите да уђете у собу."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s није име групног разговора."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започни разговор са разуном %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7255,168 +7880,138 @@ msgstr ""
 "послати поруку:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Није могуће разложити \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Контакт је на вези"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Контакт је отишао са везе"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Нова Порука"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Нова Самостална Порука"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Нова Приватна Порука"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Позив на групни разговор"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Контакт променио статус"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Самостална Порука"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Конзола"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Тужан"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Измените"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Уклони"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7424,189 +8019,187 @@ msgid ""
 msgstr "<b>%s</b> жели да <b>%s</b> неке контакте у листу ваших контаката."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Измените"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Џабер ИД"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Групе"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s је предложио да вас додам у листу мојих контаката."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Додај _контакт"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Додај _контакт"
+msgstr[1] "Додај _контакт"
+msgstr[2] "Додај _контакт"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Уклања контакт са листе"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Уклања контакт са листе"
+msgstr[1] "Уклања контакт са листе"
+msgstr[2] "Уклања контакт са листе"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Неисправано име сервера"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Сервис је вратио грешку."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Услов"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "када сам "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7617,19 +8210,19 @@ msgstr ""
 "\n"
 "Кратка Аутентикациона Ниска ове сесије је: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Већ сте потврдили идентитет овог контакта."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Идентитет контакта потврђен"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Потврдите поново..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7639,19 +8232,19 @@ msgstr ""
 "поруке или да Вам шаљу поруке, морате потврдити њихов идентитет кликајући "
 "дугме испод."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Идентитет контакта НИЈЕ потврђен"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Потврди..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Да ли сте проверили идентитет контакта?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7665,84 +8258,125 @@ msgstr ""
 "да ли и он има исту кратку Аутентикациону ниску као ви.\n"
 "Кратка Аутентикациона Ниска ове сесије: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Да ли сте разговарали са контактом и потврдили КАН?"
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG кључ је додељен контакту, али Ви <b>не верујете</b> овом кључу, тако да "
 "поруке <b>не могу</b> бити шифроване. Употребите Вашег GPG клијента да дате "
 "поверење овом кључу."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG кључ је додељен овом контакту и Ви верујете овом кључу тако да ће поруке "
 "бити шифроване."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "за налог %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Самопотписани сертификат"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Остали"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Конференција"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Без успостављене везе, не можете разгледати доступне услуге"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откривање услуга са налога %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Откривање Услуга"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Услуга не може бити нађена"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7750,233 +8384,248 @@ msgstr ""
 "На наведеној адреси нема усуга, или нема одговора. Проверите адресу и "
 "покушајте поново."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Услуге нису претраживе"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Овај тип услуге не садржи елементе за претрагу"
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Неисправано име сервера"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Претражујем %(address)s користећи налог %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Преглед"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Ова услуга не садржи елементе за претрагу"
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Изврши наредбу"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Ре_гистрација"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Скенирање %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Корисници"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Идентификација"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Маркер је већ постављен"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групни разговор \"%s\" је већ маркиран."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Маркер успешно додат"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
 "контаката."
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Претплаћен"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Чвор"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Нова објава"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Валидација SSL сертификата"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Захтева python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Разговор без сервера са аутодетекцијом клијената у локалној мрежи."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Захтева python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Захтева pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Командна линија"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипта за контролу Гајима из командне линије."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Могућност није доступна под Виндоуз системом."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Шифровање OpenPGP поруке"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Шифрујем поруке разговора са gpg кључевима."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Захтева gpg и python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Аутодетекција статуса мреже."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Захтева gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Менаџмент сесија"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Гајим сесија је сачувана на прекиду везе и учитана по логовању."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Захтева python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Шифровање лозинком"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Лозинке се могу сачувати и поузданије од обичног текста."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Захтева gnome-keyring and python-gnome2-desktop, или kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Даје могућност конекције на сервере који користе SRV записе."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Захтева dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Захтева nslookup да бисте користили SRV записе."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Провера правописа"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Провера правописа састављених порука."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Захтева libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Захтева libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Обавештење"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Пасивна искачућа обавештења о новим догађајима."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7984,67 +8633,41 @@ msgstr ""
 "Захтева python-notify или, уместо тога python-dbus у спрези са notification-"
 "daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Аутоматски статус"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Даје могућност мерења времена када се ништа не дешава, да се одреди ауто "
 "статус."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Захтева libxss библиотеку."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Захтева python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Претвара LaTeX изразе између $$ $$."
-
-#: ../src/features_window.py:95
-#, 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
-#, 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"
 msgstr "Шифровање поруке с краја на крај"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Шифрујем поруке разговора."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Захтева python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "РСТ генератор"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8052,172 +8675,200 @@ 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:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Захтева python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Захтева python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Захтева python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Захтева python-dbus."
+
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Доступан"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Могућност"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Датотека"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Време"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Напредак"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Име датотеке: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Ви"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Примаоц: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сачувано у: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Пренос датотеке завршен"
-
-#: ../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
-msgid "Connection with peer cannot be established."
-msgstr "Није могуће успоставити везу са другом страном."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Примаоц: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Порука грешке: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Пренос датотеке заустављен"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Одаберите датотеку за слање..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Опис:"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Гајим не може приступити овој датотеци"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Ову датотеку користи неки други процес."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Датотека: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tip: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Опис: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s Вам жели послати датотеку:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Сними датотеку као..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Датотека: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tip: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Опис: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s Вам жели послати датотеку:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Слање профила..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Грешка при преносу датотеке"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8225,69 +8876,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Неисправна датотека"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Датотека: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "порука"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Смајлији:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Прикажи догађај у листи контаката"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Напредна измена конфигурације"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Конфигурација собе"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Гајиму треба X сервер да би се покренуо. Завршавам..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "неуспело увожење PyGTK модула: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Гајиму треба pyGTK 2.12 или већа верзија"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Гајиму треба pyGTK 2.12 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Гајиму треба GTK 2.12 или већа верзија"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Гајиму треба GTK 2.12 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Гајиму треба pywin32 за покретање"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8296,12 +8984,11 @@ msgstr ""
 "Молимо осигурајте се да је Pywin32 инсталиран на Вашем систему. Можете га "
 "наћи на %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Гајим је већ покренут"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8309,28 +8996,28 @@ msgstr ""
 "Једна инстанца Гајима изгледа већ ради\n"
 "Свеједно желите покренути?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Приказује помоћ за одређену наредбу"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "наредба"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "прикажи помоћ за команду"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Приказује или скрива прозор листе контаката "
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8338,53 +9025,57 @@ 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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "налог"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "приказује само контакте са овог налога"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Исписује листу регистрованих налога"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Мења статус једног или више налога"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "статус"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "порука"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "статусна порука"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8393,20 +9084,44 @@ msgstr ""
 "свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
 "\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Мења статус једног или више налога"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "приоритет"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "приоритет који желите да дате овом налогу"
+
+#: ../src/gajim-remote.py:122
+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:128
 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.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "садржај поруке. Налог мора бити назначен или \"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8416,34 +9131,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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.py:146 ../src/gajim-remote.py:160
 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.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8453,134 +9163,131 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тема поруке"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "датотека"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Брише ставку подешавања"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "кључ"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "име ставке подешавања које ће се брисати"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Уклања контакт са листе"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Додаје контакт на листу"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Додаје нови контакт овом рачуну"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:243
 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-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Враћа број непрочитаних порука"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отвара дијалог за започињање разговора"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Започиње разговор, користећи овај налог"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Шаље кориснички дефинисан XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML за слање"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8588,44 +9295,93 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Измени статус"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Надимак за коришћење"
+
+#: ../src/gajim-remote.py:272
+#, 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:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI за управљање"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Налог у коме желите да управљате њиме"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Садржај поруке"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Придружи се новој соби"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "соба"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Џабер ID собе:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "надимак"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Надимак за коришћење"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "лозинка"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Лозинка за улазак у собу"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Налог са кога желите да уђете у собу"
+
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Приказује или скрива ipython прозор"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8634,156 +9390,44 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"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-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\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
-#, 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 "Налог у коме желите да управљате њиме"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Садржај поруке"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Џабер ID собе:"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8792,7 +9436,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8801,10 +9445,14 @@ msgstr ""
 "Аргумент \"%(arg)s\" није наведен. \n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Лош uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тема"
@@ -8827,180 +9475,218 @@ msgid "You cannot delete your current theme"
 msgstr "Не можете избрисати Вашу тренутну тему"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Молимо Вас да прво одаберете неку другу тему."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s је од сада познат као %(new_nick)s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s је поставио тему на %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Соба сада приказује недоступне чланове"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "соба сада не приказује недоступне чланове"
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Десила се промена у конфигурацији собе (напомена: не утиче на приватност "
+"корисника)"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Логовање у соби је сада омогућено"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Логовање у соби је сада онемогућено"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Соба сада више није анонимна"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Соба је сада полу анонимна"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Соба је сада потпуно анонимна"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s је избачен из собе (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на \"само чланови\""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: ../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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Џабер ИД групног разговора има недозвољене знаке."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9008,22 +9694,22 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
@@ -9046,65 +9732,59 @@ msgstr "_Пријави грешку"
 msgid "Details"
 msgstr "Детаљи"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Грешка при читању датотеке:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Грешка при учитавању датотеке"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Гајим није Ваш подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Желите ли да Вам Гајим постане подразумевани Гајим клијент?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Увек на стартовању проверавај да ли је Гајим подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Екстензија није подржана"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Сними слику као..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9115,92 +9795,86 @@ msgstr ""
 "регистрован од стране неког од учесника.\n"
 "Молимо одредите други надимак испод:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Увек користи надимак када постоји конфликт"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Достигнут највећи број корисника за %s"
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Забрањен Вам је приступ овом групном разговору %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Групни разговор.%s не постоји."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Захтев за претплатом"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9208,102 +9882,96 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Укинута претплата"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Контакт са \"%s\" се не може успоставити"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s је поставио тему на %(subject)s"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr "Соба сада приказује недоступне чланове"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "соба сада не приказује недоступне чланове"
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
-"Десила се промена у конфигурацији собе (напомена: не утиче на приватност "
-"корисника)"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "Логовање у соби је сада омогућено"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Логовање у соби је сада онемогућено"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Соба сада више није анонимна"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Соба је сада полу анонимна"
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Соба је сада потпуно анонимна"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
 "ради или је вратио лошу фразу лозинке.\n"
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Тренутно сте повезани без OpenPGP кључа."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Ваша лозинка није тачна"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG лозинка није тачна"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Сертификат је истекао"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG кључ није од поверења"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "GPG кључ који се користи за шифровање није од поверења. Да ли заиста желите "
 "да шифрујете ову поруку?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Gnome Keyring је инсталиран, али није \t\t\t\tправилно покренут (променљиве "
 "окружења вероватно нису \t\t\tправилно подешене)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нови е-мејл за %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9311,7 +9979,7 @@ msgstr[0] "Имате %d нови е-мејл разговор"
 msgstr[1] "Имате %d нова е-мејл разговора"
 msgstr[2] "Имате %d нових е-мејл разговора"
 
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9326,80 +9994,65 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "Удаљени контакт је прекинуо пренос"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Грешка при отварању датотеке"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Преноси датотека"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Не могу да дешифрујем поруку од контакта %s\n"
-"Можда је промењена."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Не могу да дешифрујем поруку"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Пинг?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Понг! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Грешка."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9408,21 +10061,21 @@ msgstr ""
 "ново име ресурса"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9433,15 +10086,20 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Грешка SSL сертификата"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Грешка SSL сертификата"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9458,27 +10116,7 @@ msgstr ""
 "\n"
 "Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-msgid "Insecure connection"
-msgstr "Несигурна веза"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-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:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr "Да, заиста желим да се конектујем несигурном везом"
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9486,7 +10124,7 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9496,17 +10134,17 @@ msgstr ""
 "желите то да урадите?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9516,90 +10154,93 @@ msgstr ""
 "emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
 "више детаља."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG кључ истекао"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш GPG кључ је истекао, бићете повезани са %s без OpenPGP-а."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Нови групни разговор"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Желео бих Вас додати на моју листу контаката"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "креирам фасциклу %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Није могуће пронаћи дневник историјата базе података"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Контакти"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Датум"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Надимак"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Порука"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Желите ли почистити базу података? (НЕ ПРЕПОРУЧУЈЕ СЕ АКО ЈЕ ГАЈИМ ПОКРЕНУТ)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9613,97 +10254,109 @@ msgstr ""
 "\n"
 "Уколико притисните Да, молимо сачекајте..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Грешка са базом података"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Извожење дневника историјата..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s у %(time)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[2] ""
-"Да ли заиста желите избрисати дневнике разговора означених контаката?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Да ли заиста желите да избришете означену поруку?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Да ли заиста желите избрисати дневник разговора означеног контакта?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Ова операција је неповратна."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Поништи одобравање"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Да ли заиста желите да избришете означену поруку?"
 msgstr[1] "Да ли заиста желите да избришете означене поруке?"
 msgstr[2] "Да ли заиста желите да избришете означене поруке?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Историјат разговора са %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s је тренутно %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Истекло време за учитавање слике"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Програмира"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Слика је превелика"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Затворићете неколико језичака"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Да ли заиста желите да их све затворите?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Групни разговори"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Поруке"
 
@@ -9715,100 +10368,112 @@ msgstr "- поруке ће бити логоване"
 msgid "- messages will not be logged"
 msgstr "- поруке неће бити логоване"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s је променио статус"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Игнориши"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s је на вези"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s је отишао"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Забрањујем %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Нова самостална порука од контакта %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Регистрација неуспела"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Нова приватна порука са групног разговора %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Сервис је послао лоше податке"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Нова порука од %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Ова датотека већ постоји"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Нова порука од %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Игнориши"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Конфигурација собе"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Датотека је празна"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Дохватање профила..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Информације контакта"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат: ГГГГ-ММ-ДД"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Информације примљене"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Ако нисте на вези, не можете објавити Баше информације"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Слање профила..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Информације НИСУ објављене"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Публикација vCard неуспела"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9816,51 +10481,52 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Ауторизација послата"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Ауторизација уклоњена"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG није употребљив"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Повезаћете се на %s без OpenPGP кључа."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9868,38 +10534,38 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Стварно затворити Гајим?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Јесте ли сигурни да желите затворити Гајим?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Увек затвори Гајим"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Прекини пренос датотеке"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9907,16 +10573,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9924,11 +10590,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9937,12 +10603,12 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са ових "
 "транспорта: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете блокирати контакт. Јесте ли сигурни да желите да наставите?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9951,56 +10617,56 @@ msgstr ""
 "шаље."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10009,11 +10675,11 @@ msgstr ""
 "особа увек видети као да нисте на вези."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10021,16 +10687,16 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10040,15 +10706,15 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете послати прилагођен статус. Јесте ли сигурни да желите да "
 "наставите?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10057,35 +10723,36 @@ msgstr ""
 "Контакт ће вас привремено видети као %(status)s, али само док не промените "
 "статус. Онда ће видети глобални статус."
 
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10095,11 +10762,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10107,12 +10774,17 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Пошаљи %s за %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Направи метаконтакте од %s и %s"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Направи метаконтакте од %s и %s"
@@ -10122,130 +10794,130 @@ msgstr "Направи метаконтакте од %s и %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "на %s налог"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "користећи %s рачун"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Управљање _маркерима..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "налога %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "за налог %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Конфигуриши сервисе..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Измени _групе"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Пошаљи једну поруку"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Изврши наредбу..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Преименуј"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "У_логуј се поново"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Промени статусну поруку..."
 
@@ -10262,24 +10934,14 @@ msgstr "Грешка у примању форме за податке"
 msgid "No result"
 msgstr "Нема резултата"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Грешка при упису на диск"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Тема: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Потврди ове опције сесије"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10291,7 +10953,7 @@ msgstr ""
 "\n"
 "\tДа ли су ове ставке прихватљиве?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10306,147 +10968,152 @@ msgstr ""
 "\n"
 "Наставити са сесијом?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Да ли је OpenPGP омогућен за овај контакт?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Промени статусну поруку..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "у _листи контаката"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Џабер ИД: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s овог групног разговора"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [умањен]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Последњи статус: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " од %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "На вези"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Ван везе"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Претплата: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " од %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Расположење:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Активност:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Песма:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Обавештење"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Скидање"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Слање"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Пренешено: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Није почео"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Заустављен"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Завршен"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?статус преноса:Паузиран"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Застој"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Пренос у току"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Овај сервис још није пружио детаљне информације"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10454,32 +11121,32 @@ msgstr ""
 "Овај сервис није могао одговорити са детаљним информацијама.\n"
 "Највероватније је застарео или у квару"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Клијент:Непознат"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?ОС:Непознат"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Време:Непознато"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "од %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10487,7 +11154,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10495,13 +11162,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10509,18 +11176,392 @@ msgstr ""
 "Не интересује Вас присутност контакта, нити Ваша присутност интересује њега/"
 "њу"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Одаберите датотеку за слање..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " отварање прозора/језичка са тим контактом "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Акције</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Услови</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Напредне Акције"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Напредна контрола обавештавања"
+
+#~ msgid "All statuses"
+#~ msgstr "Сви статуси"
+
+#~ msgid "Busy "
+#~ msgstr "Запослен"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Контакт променио статус"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Контакт Отишао Са Везе"
+
+#~ msgid "Don't have "
+#~ msgstr "Немам "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Пренос датотеке заустављен"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Бојење Порука Са Групног Разговора"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Примљена Порука Са Групног Разговора"
+
+#~ msgid "Have "
+#~ msgstr "Имам "
+
+#~ msgid "Launch a command"
+#~ msgstr "Покрените команду"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Један или више посебних статуса..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "На вези / Слободан за разговор"
+
+#~ msgid "Play a sound"
+#~ msgstr "Пуштање звукове"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Нова Приватна Порука"
+
+#~ msgid "When "
+#~ msgstr "Када "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Активирање управника прозора за бљескање прозора разговора у панелу"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Онемогући аутоматско отварање прозора за разговор"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Онемогући постојећи искачући прозор"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Онемогући постојећи звук за овај догађај"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Онемогући приказивање догађаја у листи контаката"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Онемогући приказивање догађаја у листи контаката"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Обавести ме искачућим прозором"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Отвори прозор за разговор са корисником"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Прикажи догађај у листи контаката"
+
+#~ msgid "and I "
+#~ msgstr "и ја "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Контакти"
+
+#~ msgid "for "
+#~ msgstr "за"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Групе"
+
+#~ msgid "when I'm in"
+#~ msgstr "када сам у"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Прикажи профил контакта (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Дозволи му/јој да види мој статус"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Опис:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Напредно..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Прикажи активности контаката на листи"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Прикажи _песме контаката на листи"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Прикажи _расположења контаката на листи"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ако је означена, Гајим ће приказивати активности контаката у листи "
+#~ "контаката"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ако је означена, Гајим ће приказивати расположење контаката у листи "
+#~ "контаката"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Ако је означена, Гајим ће приказивати песме контаката у листи контаката"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Пошаљи једну _поруку..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Кориснички аватар:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Гајим Брзе Поруке"
+
+#~ msgid "English"
+#~ msgstr "Енглески"
+
+#~ msgid "Belarusian"
+#~ msgstr "Белоруски"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Бугарски"
+
+#~ msgid "Breton"
+#~ msgstr "Бретански"
+
+#~ msgid "Czech"
+#~ msgstr "Чешки"
+
+#~ msgid "German"
+#~ msgstr "Немачки"
+
+#~ msgid "Greek"
+#~ msgstr "Грчки"
+
+#~ msgid "British"
+#~ msgstr "Британски"
+
+#~ msgid "Esperanto"
+#~ msgstr "Есперанто"
+
+#~ msgid "Spanish"
+#~ msgstr "Шпански"
+
+#~ msgid "Basque"
+#~ msgstr "Баскијски"
+
+#~ msgid "French"
+#~ msgstr "Француски"
+
+#~ msgid "Croatian"
+#~ msgstr "Хрватски"
+
+#~ msgid "Italian"
+#~ msgstr "Италијански"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Норвешки (б)"
+
+#~ msgid "Dutch"
+#~ msgstr "Холандски"
+
+#~ msgid "Norwegian"
+#~ msgstr "Норвешки"
+
+#~ msgid "Polish"
+#~ msgstr "Пољски"
+
+#~ msgid "Portuguese"
+#~ msgstr "Португалски"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Бразилски португалски"
+
+#~ msgid "Russian"
+#~ msgstr "Руски"
+
+#~ msgid "Serbian"
+#~ msgstr "Српски"
+
+#~ msgid "Slovak"
+#~ msgstr "Словачки"
+
+#~ msgid "Swedish"
+#~ msgstr "Шведски"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Кинески (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Језик за правопис"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Ако је истинито, Гајим ће конвертовати све карактер између $$ и $$ у "
+#~ "слику користећи dvips у ибацити је у прозор разговора."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Промените вредност да промените величину Латекс формула. Више је веће."
+
+#~ msgid "all or space separated status"
+#~ msgstr "све или размаком одвојен статус"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'да', 'не', или 'обоје'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'да', 'не' или ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Проверите Вашу конекцију или покушајте касније"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Грешка приликом извршавања \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "грешка: не могу отворити %s за читање"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Не могу да се повежем на порт %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Можда већ имате покренуту инстанцу Гајима. Пренос датотека ће бити "
+#~ "прекинут."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "ГТК+ џабер клијент"
+
+#~ msgid "Condition"
+#~ msgstr "Услов"
+
+#~ msgid "when I am "
+#~ msgstr "када сам "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Захтева pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Захтева gpg и python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Претвара 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' на 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 у едитору напредних подешавања."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Захтева python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
+#~ "узнемиравај, невидљив"
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Превише аргумената\n"
+#~ "Укуцајте \"%(basename)s help %(command)s\" за више информација"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Аргумент \"%(arg)s\" није наведен. \n"
+#~ "Укуцајте \"%(basename)s help %(command)s\" за више информација"
+
+#~ msgid "Contacts"
+#~ msgstr "Контакти"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Грешка при упису на диск"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Тема: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Расположење:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Активност:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10548,32 +11589,12 @@ 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 не поштује RFC правила. Неће бити додат на Вашу листу "
-#~ "контаката. Употребите алате као што је http://jru.jabberstudio.org/ да "
-#~ "бисте га уклонили"
-
 #~ msgid "Account Modification"
 #~ msgstr "Измена налога"
 
@@ -10676,9 +11697,6 @@ msgstr " ресурс са приоритетом "
 #~ "Историјати групних разговора\n"
 #~ "Историјат свих разговора"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Подешавање налога"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10847,18 +11865,9 @@ msgstr " ресурс са приоритетом "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Придружи Open_PGP Кључ"
 
-#~ 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.)"
@@ -10866,12 +11875,6 @@ msgstr " ресурс са приоритетом "
 #~ "Начин коришћења: /%(command)s <action>, шаље акцију тренутном групном "
 #~ "разговору. Користититреће лице. (нпр. /%(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"
 
@@ -10888,10 +11891,6 @@ msgstr " ресурс са приоритетом "
 #~ msgstr "Позвали сте %(contact_jid)s у собу %(room_jid)s"
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Надимак није пронађен: %s "
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10903,12 +11902,6 @@ msgstr " ресурс са приоритетом "
 #~ "НИСУ подржани."
 
 #~ 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 ""
@@ -10950,10 +11943,6 @@ 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 ""
@@ -10989,9 +11978,6 @@ msgstr " ресурс са приоритетом "
 #~ msgid "_Host:"
 #~ msgstr "_Хост:"
 
-#~ msgid "Show _roster"
-#~ msgstr "_Прикажи листу контаката"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Одаберите налог са којим желите да се синхронизујете"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 0de9d97f8..10339a4c4 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -5,15 +5,11 @@
 #
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -25,306 +21,297 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Lični događaji"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Započni razgovor"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Priključi se _grupnom razgovoru..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Otkrivanje servisa"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Izvrši naredbu..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "Izmeni nalog"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Otvori Gmail dolaznu poštu"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Lični događaji"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Započni razgovor"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "Izmeni nalog"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: čarobnjak za kreiranje naloga"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Povezivanje na server</b>\n"
-"\n"
-"Molimo pričekajte..."
+"Morate posedovati račun da biste se mogli povezati\n"
+"na džaber mrežu."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Želim da registrujem novi nalog"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Molimo odaberite jednu od opcija ispod:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Molimo popunite podatke za Vaš postojeći korisnički nalog</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Molimo odaberite server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Lozinka:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Dodajte ovaj sertifikat listi sertifikata kojima verujete\n"
-"SHA1 potpis sertifikata:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Snimi lozinku"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_imno prijavljivanje"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Poveži se kada pritisnem Završi"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Džaber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: čarobnjak za kreiranje naloga"
+msgid "Anon_ymous authentication"
+msgstr "Anon_imno prijavljivanje"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Molimo odaberite server</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prok_si:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Podesi..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Koristi Vaše određeno ime hosta/port "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prok_si:"
+msgid "_Hostname:"
+msgstr "Ime hosta:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Snimi lozinku"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Postavi moj profil pri povezivanju"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Napredno"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Morate posedovati račun da biste se mogli povezati\n"
-"na džaber mrežu."
+"Dodajte ovaj sertifikat listi sertifikata kojima verujete\n"
+"SHA1 potpis sertifikata:\n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "_Završi"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Ime hosta:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Povezivanje na server</b>\n"
+"\n"
+"Molimo pričekajte..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Džaber ID:"
+msgid "Connect when I press Finish"
+msgstr "Poveži se kada pritisnem Završi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Lozinka:"
+msgid "Set my profile when I connect"
+msgstr "Postavi moj profil pri povezivanju"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Završi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Ostalo</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ništa"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Nalozi"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Lične informacije</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Dodate"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proksi</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Obriši"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Po_desi prema statusu"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Prei_menuj"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Nalog"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Omogući"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Nalozi"
+msgid "Anonymous authentication"
+msgstr "Anonimno prijavljivanje"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administratorske operacije"
+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 ""
+"Resurs se šalje Džaber serveru kako bi se razlikovao isti džaber ID kod 2 "
+"ili više klijenata spojena u isto vreme na isti server sa istim računom. "
+"Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
+"najvišim prioritetom će dobijati obaveštenja o događajima"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonimno prijavljivanje"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatsko povezivanje kada se veza izgubi"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Sinhronizuj kontakte"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Pregled"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Kliknite da zatražite autorizaciju svim kontaktima drugog naloga"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Po_veži se prilikom pokretanja Gajima"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "I_zmeni lozinku"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Kliknite za izmenu lozinke Vašeg naloga"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Označite ovo da Vas Gajim pita pre nego što pošaljete lozinku preko "
-"nesigurne veze."
+msgid "Administration operations"
+msgstr "Administratorske operacije"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Odaberite datoteku za slanje..."
+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 ""
+"Prioritet se u džaberu koristi da odredi ko dobija događaje sa servera u "
+"slučaju da su dva ili više klijenata povezana na njega; klijent sa najvećim "
+"prioritetomdobija događaje"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Odaberite _Ključ"
+msgid "A_djust to status"
+msgstr "Po_desi prema statusu"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Kliknite za izmenu lozinke Vašeg naloga"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Kliknite da zatražite autorizaciju svim kontaktima drugog naloga"
+msgid "Priori_ty:"
+msgstr "Priori_tet"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Samopotpisani sertifikat"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Po_veži se prilikom pokretanja Gajima"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Veza"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-mejl:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Ime:"
+msgid "Resour_ce:"
+msgstr "Resur_s:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Pregled"
 
 #: ../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 ""
-"Ako je ovo označeno, Gajim će odašiljati još neke IP adrese pored Vaše,tako "
-"da prenos datoteka ima veće šanse da će raditi."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Sertifikat odbačen"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ako je označeno, Gajim će uzeti lozinku od GPG agenta"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Samopotpisani sertifikat"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Nalog"
 
 #: ../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 ""
-"Ako je ovo označeno, Gajim će slati poruke da je prisutan kako bi sprečio "
-"prekid veze zbog duge neaktivnosti"
+msgid "C_onnect on Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -335,6 +322,18 @@ msgstr ""
 "na džaber koristeći ovaj nalog"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatsko povezivanje kada se veza izgubi"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Snimi dnevnik razgovora za sve kontakte"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sinhroniziraj status naloga sa globalnim statusom"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -344,175 +343,204 @@ msgstr ""
 "padajućeg menija na dnu prozora kontakt liste) će promeniti i status ovog "
 "naloga "
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ako je podrazumevani port koji se koristi za dolazne poruke neodgovarajući "
-"za Vaša podešavanja, ovde možete odabrati neki drugi.\n"
-"Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Džaber ID:"
+msgid "Use file transfer proxies"
+msgstr "Koristi proksi za prenos datoteka"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Prezime:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ako je ovo označeno, Gajim će odašiljati još neke IP adrese pored Vaše,tako "
+"da prenos datoteka ima veće šanse da će raditi."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Spoji naloge"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Opšte"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Nije odabran nijedan ključ"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Lične Informacije"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Podesi..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proksi</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tet"
+msgid "_Warn before using an insecure connection"
+msgstr "Upozori pre korišćenja nesigurne veze"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritet se u džaberu koristi da odredi ko dobija događaje sa servera u "
-"slučaju da su dva ili više klijenata povezana na njega; klijent sa najvećim "
-"prioritetomdobija događaje"
+"Označite ovo da Vas Gajim pita pre nego što pošaljete lozinku preko "
+"nesigurne veze."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
+msgid "Send _keep-alive packets"
+msgstr "Šalji podat_ke o živosti"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Prei_menuj"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Ako je ovo označeno, Gajim će slati poruke da je prisutan kako bi sprečio "
+"prekid veze zbog duge neaktivnosti"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Resur_s:"
+msgid "Use cust_om hostname/port"
+msgstr "K_oristi Vaše određeno ime hosta/port "
 
 #: ../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 ""
-"Resurs se šalje Džaber serveru kako bi se razlikovao isti džaber ID kod 2 "
-"ili više klijenata spojena u isto vreme na isti server sa istim računom. "
-"Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
-"najvišim prioritetom će dobijati obaveštenja o događajima"
+msgid "_Hostname: "
+msgstr "Ime _hosta:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Snimi dnevnik razgovora za sve kontakte"
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Ostalo</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Šalji podat_ke o živosti"
+msgid "Connection"
+msgstr "Veza"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinhroniziraj status naloga sa globalnim statusom"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Nije odabran nijedan ključ"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinhroni_zuj status naloga sa globalnim statusom"
+msgid "Choose _Key..."
+msgstr "Odaberite _Ključ"
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Sinhronizuj kontakte"
+msgid "Use G_PG Agent"
+msgstr "Koristi G_PG agenta"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Ako je označeno, Gajim će uzeti lozinku od GPG agenta"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Koristi G_PG agenta"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "K_oristi Vaše određeno ime hosta/port "
+msgid "_Edit Personal Information..."
+msgstr "Izm_eni lične informacije..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "K_oristi svoj port:"
+msgid "Information about you, as stored in the server"
+msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Koristi proksi za prenos datoteka"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Lične informacije</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Lične Informacije"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "Izm_eni lične informacije..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Omogući"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinhroni_zuj status naloga sa globalnim statusom"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "Ime _hosta:"
+msgid "Use cust_om port:"
+msgstr "K_oristi svoj port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Podesi..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Ako je podrazumevani port koji se koristi za dolazne poruke neodgovarajući "
+"za Vaša podešavanja, ovde možete odabrati neki drugi.\n"
+"Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Ime:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Prezime:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "Upozori pre korišćenja nesigurne veze"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-mejl:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Džaber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Spoji naloge"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Nalog:"
+msgid "Add New Contact"
+msgstr "Dodaj novi kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Dozvo_li ovom kontaktu da vidi moj status"
+msgid "A_ccount:"
+msgstr "_Nalog:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Dodaj novi kontakt"
+msgid "_Protocol:"
+msgstr "_Protokol:"
 
-#: ../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 "Želio bih da Vas dodam na listu mojih kontakata."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ID korisnika:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Nadimak:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupa:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Dozvo_li ovom kontaktu da vidi moj status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Pretplata"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -524,7 +552,11 @@ msgstr ""
 "protokola. Kliknite na dugme za registraciju\n"
 "za nastavak."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registracija"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -532,593 +564,373 @@ msgstr ""
 "Morate biti povezani na transport da biste mogli\n"
 "dodavati kontakte sa ovog protokola."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupa:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Nadimak:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registracija"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Pretplata"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ID korisnika:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Želio bih da Vas dodam na listu mojih kontakata."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Dogodila se greška:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hok komande - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Odaberite komandu za izvršenje:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Molimo sačekajte dok se dobavlja lista komandi..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hok komande - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Odaberite komandu za izvršenje:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Označite još jednom"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Opis greške"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Molimo sačekajte dok se komanda šalje..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Završi"
+msgid "Please wait..."
+msgstr "Molimo sačekajte..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Molimo sačekajte dok se dobavlja lista komandi..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Ovaj džaber izvor ne izlaže nijednu komandu."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Molimo sačekajte dok se komanda šalje..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Dogodila se greška:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Molimo sačekajte..."
+msgid "Error description..."
+msgstr "Opis greške"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Ovaj džaber izvor ne izlaže nijednu komandu."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Završi"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Napredna izmena konfiguracije"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NAPOMENA:</b> Trebalo bi da ponovo pokrenete Gajim da bi neke izmene "
 "podešavanja postale primenjene"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Napredna izmena konfiguracije"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Ponovo učitaj podrazumevane boje"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Izbriši poruku dana"
+msgid "Show _XML Console"
+msgstr "Prikaži _XML Konzolu"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Izmeni liste _privatnosti..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../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"
+msgid "_Send Server Message..."
+msgstr "_Pošalji serversku poruku..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Postavi poruku dana..."
+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:7
 msgid "Sets Message of the Day"
 msgstr "Postavlja poruku dana"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Prikaži _XML Konzolu"
+msgid "Set MOTD..."
+msgstr "Postavi poruku dana..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Osveži poruku dana..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Osveži poruku dana..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Izbriši poruku dana"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Pošalji serversku poruku..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " otvaranje prozora/jezička sa tim kontaktom "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Akcije</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Uslovi</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Zvukovi</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Napredne Akcije"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Napredna kontrola obaveštavanja"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Svi statusi"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Odsutan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Zaposlen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt promenio status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt Otišao Sa Veze"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Nemam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Prenosi datoteka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Zahtev za prenosom datoteke"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Prenos datoteke zaustavljen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Bojenje Poruka Sa Grupnog Razgovora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Primljena Poruka Sa Grupnog Razgovora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Imam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Nevidljiv"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Pokrenite komandu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nedostupan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Jedan ili više posebnih statusa..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Na vezi / Slobodan za razgovor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Puštanje zvukove"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nova Privatna Poruka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kada "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktiviranje upravnika prozora za bljeskanje prozora razgovora u panelu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Onemogući automatsko otvaranje prozora za razgovor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Onemogući postojeći iskačući prozor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-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
-#, 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 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"
-msgstr "_Obavesti me iskačućim prozorom"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Otvori prozor za razgovor sa korisnikom"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "Prikaži događaj u listi kontakata"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "i ja "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontakti"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "za"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupe"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "kada sam u"
+msgid "Deletes Message of the Day"
+msgstr "Briše poruku dana"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ništa"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Podešavanja"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Automatsko povezivanje"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ništa"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Podešavanja"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Automatsko povezivanje"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Unos:"
+msgid "New entry received"
+msgstr "Nov događaj primljen"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Primili ste novi unos:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Ime teme:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Unos:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Zadnji put izmenjeno:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Nov događaj primljen"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Primili ste novi unos:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Poruka:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Poruka:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Poruka:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Izmeni lozinku"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Unesite ponovo kao potvrdu:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Unesite novu lozinku:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Unesite ponovo kao potvrdu:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Upišite Vašu novu statusnu poruku</b>"
+msgid "Save as Preset..."
+msgstr "Snimi kao već postavljenu..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivnost:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivnost:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Već postavljene poruke:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Snimi kao već postavljenu..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Upišite Vašu novu statusnu poruku</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Priključi se _grupnom razgovoru"
+msgid "_Copy Link Location"
+msgstr "_Kopiraj lokaciju veze"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Dodaj na listu kontakata..."
+msgid "_Open Link in Browser"
+msgstr "_Otvori vezu u internet pregledaču"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiraj lokaciju veze"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Otvori sastavljač e-mejla"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u internet pregledaču"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Započni razgovor"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Priključi se _grupnom razgovoru"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Dodaj na listu kontakata..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prikaži listu smajlija (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaj ovaj kontakt na listu (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "O"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Pregledaj istorijat razgovora (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Prikaži meni naprednih funkcija (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Pošalji poruku"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Pošalji"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "O"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Pozo_vi"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozovi prijatelje!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Server grupnog razgovora"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Molimo odaberite server grupnog razgovora."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1126,119 +938,136 @@ msgstr ""
 "Započećete grupni razgovor.\n"
 "Odaberite kontakte koje želite da pozovete"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Traži njegov/njen status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Molimo odaberite server grupnog razgovora."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Dodaj poseb_no obaveštenje..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Server grupnog razgovora"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Pridruži Open_PGP Ključ..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Pozo_vi"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "I_zvrši naredbu..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Započni ra_zgovor"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Izmeni _grupe..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Pošalji jednu _poruku..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Pošalji _datoteku..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Pozovi kontakte"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "_Ukloni"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Uključi/isključi enkripciju s kraja na kraj"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Pošalji korisnički definisan status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "I_zvrši naredbu..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Pošalji jednu _poruku..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Upravljanje kontaktima"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Pošalji _datoteku..."
+msgid "_Rename..."
+msgstr "_Preimenuj..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Postavi korisnički definisan avatar..."
+msgid "Edit _Groups..."
+msgstr "Izmeni _grupe..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Započni ra_zgovor"
+msgid "Assign Open_PGP Key..."
+msgstr "Pridruži Open_PGP Ključ..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Uključi/isključi enkripciju s kraja na kraj"
+msgid "Set Custom _Avatar..."
+msgstr "Postavi korisnički definisan avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Uključi/isključi Open_PGP enkripciju"
+msgid "Add Special _Notification..."
+msgstr "Dodaj poseb_no obaveštenje..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Pretplata"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Dozvoli mu/joj da vidi moj status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Dozvo_li ovom kontaktu da vidi moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Traži njegov/njen status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Istorijat"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignoriši"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blokiraj"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Upravljanje kontaktima"
+msgid "_Unignore"
+msgstr "_Poništi ignrisanje"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Preimenuj..."
+msgid "_Ignore"
+msgstr "_Ignoriši"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Pretplata"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "_Ukloni"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Poništi ignrisanje"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Istorijat"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Popunite formular."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracija sobe"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Popunite formular."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Izmeni grupe"
@@ -1251,55 +1080,47 @@ msgstr "(<b>ESession</b> info)"
 msgid "_Verify"
 msgstr "_Potvrdi"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Mogućnosti"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Lista mogućnosti Gajima:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Mogućnosti"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
+msgid "File Transfers"
+msgstr "Prenosi datoteka"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Prekini prenos datoteke"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Prikazuje listu prenosa datoteka između Vas i ostalih"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Prekini prenos označene datoteke"
+msgid "file transfers list"
+msgstr "lista prenosa datoteka"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Prekini prenos označene datoteke i izbriši nedovršenu datoteku"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Počisti"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Obavesti me kada se završi prenos datoteke"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Prenosi datoteka"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Sakriva prozor"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Ukloni završene, prekinute i neuspele prenose datoteka iz liste"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Ukloni prenos datoteka sa liste"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Ukloni završene, prekinute i neuspele prenose datoteka iz liste"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Prikazuje listu prenosa datoteka između Vas i ostalih"
-
-#: ../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"
@@ -1307,82 +1128,108 @@ msgstr ""
 "Ova akcija uklanja prenos datoteke sa liste. Ako je prenos aktivan, prvo se "
 "zaustavlja, pa onda uklanja"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Počisti"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pauziraj"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Prekini prenos označene datoteke i izbriši nedovršenu datoteku"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Nastavi"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Prekini prenos datoteke"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Obavesti me kada se završi prenos datoteke"
+msgid "Cancels the selected file transfer"
+msgstr "Prekini prenos označene datoteke"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Otvori sadržavajuću fasciklu"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Sakriva prozor"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pauziraj"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Nastavi"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista prenosa datoteka"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Otvori sadržavajuću fasciklu"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Boje jezičaka statusa razgovora</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Nalog"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Podebljano"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Sastavljanje"
+msgid "Gajim Themes Customization"
+msgstr "Personalizacija Gajim tema"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "Boja tekst_a:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Izgled fonta:"
+msgid "_Background:"
+msgstr "_Pozadina:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalizacija Gajim tema"
+msgid "Text _font:"
+msgstr "_Font teksta:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Otišao"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupa"
+msgid "Font style:"
+msgstr "Izgled fonta:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktivno"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Podebljano"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kurziv"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pauzirano"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Sastavljanje"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Neaktivno"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Boje jezičaka statusa razgovora</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Otišao"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1390,7 +1237,7 @@ msgstr ""
 "Poruke\n"
 "višekorisničkog razgovora"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1398,105 +1245,98 @@ msgstr ""
 "Usmerene poruke\n"
 "višekorisničkog razgovora"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pauzirano"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Boja tekst_a:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Font teksta:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Pozadina:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Promeni _nadimak..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Upravljanje sobama"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Promeni _temu..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Podesi _sobu..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Markiraj ovu so_bu"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "Uništi sobu"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Upravljanje sobama"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "Umanji prozor na zatvaranje"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Glas"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Markiraj ovu so_bu"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "_Send Private Message"
+msgstr "_Pošalji privatnu poruku"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "_Akcije prisutnih"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Pošalji _datoteku"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "_Akcije prisutnih"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Dodaj na listu kontakata"
+msgid "_Voice"
+msgstr "_Glas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Član"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Zabrani"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Vlasnik"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Izbaci"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Član"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Vlasnik"
+msgid "_Ban"
+msgstr "_Zabrani"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Pošalji privatnu poruku"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Glas"
+msgid "_Add to Roster"
+msgstr "_Dodaj na listu kontakata"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Prikaži listu formatiranja"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Promeni nadimak (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Markiraj ovu sobu (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1508,40 +1348,19 @@ msgid "From:"
 msgstr "Od:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../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."
-msgstr ""
-"<b>UPOZORENJE:</b>\n"
-"Ako planirate da radite veća uklanjanja, potrudite se da Gajim nije "
-"pokrenut. Uopšte, izbegavakte uklanjanja kontakata sa kojima trenutno "
-"razgovorate."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim menadžer dnevnika istorijata"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Obriši"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Izvezi"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim menadžer dnevnika istorijata"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1555,173 +1374,200 @@ msgstr ""
 "Koristite ovaj program da obrišete ili izvezete dnevnike. Možete odabrati "
 "dnevnike sa leve strane i/ili pretražiti bazu ispod."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>UPOZORENJE:</b>\n"
+"Ako planirate da radite veća uklanjanja, potrudite se da Gajim nije "
+"pokrenut. Uopšte, izbegavakte uklanjanja kontakata sa kojima trenutno "
+"razgovorate."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Pretraži bazu podataka"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Svi statusi"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Istorijat razgovora"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Izvezi"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Ime kontakta"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Grupni razgovori"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Svi statusi"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Istorijat razgovora"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Pretraga:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Zapisuj u dnevnik statusne promene kontakata"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Naložen"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "džid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Naložen"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Uđi u ovu sobu automatski kada se povežem"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Soba:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Nedavno:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Nedavno:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Uđi u ovu sobu automatski kada se povežem"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Soba:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Markiraj ovu sobu"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Markiraj ovu sobu"
+msgid "Bro_wse Rooms"
+msgstr "_Pregled"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Pridruži se"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automatsko povezivanje"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Podešavanje markera"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Umanji prozor na auto povezivanje"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Naslov:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Ispis statusa:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatsko povezivanje"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Naslov:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Umanji prozor na auto povezivanje"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1732,100 +1578,103 @@ msgid "_Configure"
 msgstr "_Konfiguriši"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Karakteristike</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP spoj\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Podešavanja</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP spoj\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Podešavanje proksi profila"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "Vrs_ta:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Lozinka:"
+msgid "_Name:"
+msgstr "_Ime:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proksi _host:"
+msgid "<b>Properties</b>"
+msgstr "<b>Karakteristike</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proksi _port:"
+msgid "Use HTTP prox_y"
+msgstr "Kor_isti HTTP proksi"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH adresa:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Kor_isti HTTP proksi"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Koristi proksi prijavljivanje"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Korisničko ime:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH adresa:"
+msgid "Pass_word:"
+msgstr "Lozinka:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Ime:"
+msgid "Proxy _Host:"
+msgstr "Proksi _host:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "Vrs_ta:"
+msgid "Proxy _Port:"
+msgstr "Proksi _port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Korisničko ime:"
+msgid "<b>Settings</b>"
+msgstr "<b>Podešavanja</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Podešavanje naloga"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Lozinka"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Odobri autorizaciju"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Dostupan"
+msgid "Version:"
+msgstr "GTK+ verzija:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfiguriši"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Opis:"
+msgid "Authors:"
+msgstr "_Odobri autorizaciju"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1833,39 +1682,32 @@ msgid "Homepage:"
 msgstr "<b>Lična strana:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Zastoj"
+msgid "Description:"
+msgstr "Opis:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfiguriši"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Zastoj"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1879,220 +1721,292 @@ msgid "Event desc"
 msgstr "događaj"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Napredna izmena konfiguracije</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikacije</b>"
+msgid "Custom"
+msgstr "Korisnički"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Akcije</b>"
+msgid "All chat states"
+msgstr "Svi statusi"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Auto status</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Sastavljanje"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Izgled razgovora</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Onemogućeno"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Boje linija razgovora</b>"
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Obaveštenja stanja razgovora</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikad\n"
+"Samo za događaje na čekanju\n"
+"Uvek"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Uslovi</b>"
+msgid "Always"
+msgstr "Odsutan"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr ""
 
-#. 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>Personalni</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Obavesti me o kontaktima koji se _odjave"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Prikaži događaj u listi kontakata"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Gmail Opcije</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Već postavljene statusne poruke</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privatnost</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Izgled liste kontakata</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Poslednji status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Statusne poruke</b>"
+msgid "Preferences"
+msgstr "Podešavanja"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Teme</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Prikaži _avatare kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Srednje ime:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Vizualna obaveštenja</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Prikaži statusne poruke kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Napredno"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Prikaži _raspoloženja kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Napredno..."
+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:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Svi statusi"
+msgid "Sort contacts by status"
+msgstr "Sortiraj kontakte po statusu"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Dozvoli slanje podataka o OS-u"
+msgid "in _roster"
+msgstr "u _listi kontakata"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Dozvoli slanje podataka o OS-u"
+msgid "in _group chats"
+msgstr "u _grupnim razgovorima"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
-"nevidljiv"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Izgled liste kontakata</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Doz_voli zvukove kada sam zauzet"
+msgid "_Window behavior:"
+msgstr "Ponašanje prozora:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Odsutan"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Pitaj za statusnu poruku pri:"
+msgid "_Emoticons:"
+msgstr "_Smajliji:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Načini prozor poruke kompaktnim"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Sakrij svu dugmad u prozoru razgovora"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Poruka razgovora:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Proveri po startovanju da li je Gajim podrazumevani džaber klijent"
+msgid "_Highlight misspelled words"
+msgstr "_Oboji pogrešno napisane reči"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Sastavljanje"
+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 ""
+"Ako je označena, Gajim će osvetljavati greške u kucanju u poljima za unos "
+"prozora razgovora. Ako se jezik eksplicitno ne postavi preko desnog klika na "
+"polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
+"grupni razgovor."
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Konfigurisanje boje i fonta interfejsa"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "_Prikaži listu kontakata"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Poruka razgovora:"
+msgid "Show icon when your messages are received"
+msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Ime kontakta"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Korisnički"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Izgled razgovora</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Kada se primi novi događaj:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Obavesti me o kontaktima koji se _prijave"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Obavesti me o kontaktima koji se _odjave"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Onemogućeno"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
+"nevidljiv"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Prikaži aktivnosti kontakata na listi"
+msgid "Notify on new _GMail email"
+msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Prikaži dodatne e-mejl detalje"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
+"GMail-amejlova"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Prikaži _raspoloženja kontakata na listi"
+msgid "Display _extra email details"
+msgstr "Prikaži dodatne e-mejl detalje"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Prikaži _pesme kontakata na listi"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Ako je označena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
+"e-mejlova"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Prikaži _avatare kontakata na listi"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Gmail Opcije</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Prikaži _raspoloženja kontakata na listi"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Prikaži statusne poruke kontakata na listi"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizualna obaveštenja</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Puštaj zvukove"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Pode_si..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Doz_voli zvukove kada sam zauzet"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Zvukovi</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Obaveštenja"
+
+#: ../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 "
@@ -2102,7 +2016,11 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
 "prozorima razgovora."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Prikazana obaveštenja o stanju razgovora:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2112,690 +2030,629 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
 "osobi."
 
-#: ../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 ć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:58
-msgid "Hide all buttons in chat windows"
-msgstr "Sakrij svu dugmad u prozoru razgovora"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
-"sistem koristite"
-
-#: ../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čena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
-"e-mejlova"
-
-#: ../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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
-"duže nije u upotrebi"
+msgid "_Send chat state notifications:"
+msgstr "Pošalji obaveštenja o stanju razgovora:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
-"u grupnim razgovorima"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Obaveštenja stanja razgovora</b>"
 
 #: ../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 ""
-"Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
-"kontakta u listi kontakata i u grupnim razgovorima"
+msgid "Personal Events"
+msgstr "Lični događaji"
 
 #: ../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"
+msgid "_Away after:"
+msgstr "Autom_atski odsutan posle:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
-"kontakata"
+"Ako je označena, Gajim će automatski promeniti status u Odsutan kada računar "
+"nije u upotrebi."
 
 #: ../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"
+msgid "_Not available after:"
+msgstr "Automatski _nedostupan nakon:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Ako je označena, Gajim će prikazivati pesme kontakata u listi kontakata"
+"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: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 ""
-"Ako je označena, Gajim će osvetljavati greške u kucanju u poljima za unos "
-"prozora razgovora. Ako se jezik eksplicitno ne postavi preko desnog klika na "
-"polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
-"grupni razgovor."
+msgid "minutes"
+msgstr "minuta"
 
 #: ../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 "
-"not in the roster"
-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: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 ""
-"Ako je označena, Gajim će držati dnevnike šifrovanih razgovora. Primetiti da "
-"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:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
-"GMail-amejlova"
+"Automatska statusna poruka pri odsutnosti. Ako je prazno, Gajim neće "
+"izmeniti trenutnu statusnu poruku\n"
+"$S će biti zamenjeno prethodnom statusnom porukom\n"
+"$T će biti zamenjeno sa vremenom odsutnosti"
 
 #: ../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, "
-"etc...)"
-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:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-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:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
-"ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
+"Automatska statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće "
+"izmeniti trenutnu statusnu poruku\n"
+"$S će biti zamenjeno prethodnom statusnom porukom\n"
+"$T će biti zamenjeno sa vremenom nedostupnosti"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Auto status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Načini prozor poruke kompaktnim"
+msgid "Ask status message when I:"
+msgstr "Pitaj za statusnu poruku pri:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Pode_si..."
+msgid "Sign _in"
+msgstr "Prijavljivanju"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "Server"
+msgid "Sign _out"
+msgstr "Odjavljivanju"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Obaveštenja"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Obavesti me o kontaktima koji se _prijave"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Statusne poruke</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Obavesti me o kontaktima koji se _odjave"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Već postavljene statusne poruke</b>"
 
-#: ../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:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
+msgid "Use system _default"
+msgstr "Koristi sistemski podrazumevano"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Nikad\n"
-"Samo za događaje na čekanju\n"
-"Uvek"
+msgid "Chat message:"
+msgstr "Poruka razgovora:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Lični događaji"
+msgid "<b>Font</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Puštaj zvukove"
+msgid "Use _transports icons"
+msgstr "Koristi ikone za _transporte"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 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:89
-msgid "Preferences"
-msgstr "Podešavanja"
+msgid "Status _iconset:"
+msgstr "Skup statusnih ikona:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Konfigurisanje boje i fonta interfejsa"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Teme</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Notification-daemon"
+msgid "Contact's nickname:"
+msgstr "Ime kontakta"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Prikaži događaj u listi kontakata"
+msgid "Your nickname:"
+msgstr "Nadimak:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Prijavljivanju"
+msgid "_Status message:"
+msgstr "_Statusna poruka:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Odjavljivanju"
+msgid "_URL highlight:"
+msgstr "URL osvetljavanje:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Ponovo učitaj podrazumevane boje"
 
 #: ../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 ""
-"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
-"je označeno, Gajim će samo prikazivati sirovi tekst poruke."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Poruka razgovora:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sortiraj kontakte po statusu"
+#, fuzzy
+msgid "Your message:"
+msgstr "Poruka greške: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Skup statusnih ikona:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Boje linija razgovora</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akcije</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"Automatska statusna poruka pri odsutnosti. Ako je prazno, Gajim neće "
-"izmeniti trenutnu statusnu poruku\n"
-"$S će biti zamenjeno prethodnom statusnom porukom\n"
-"$T će biti zamenjeno sa vremenom odsutnosti"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"Automatska statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće "
-"izmeniti trenutnu statusnu poruku\n"
-"$S će biti zamenjeno prethodnom statusnom porukom\n"
-"$T će biti zamenjeno sa vremenom nedostupnosti"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Koristi ikone za _transporte"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+msgid "<b>Video</b>"
+msgstr "<b>Srednje ime:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Koristi sistemski podrazumevano"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Uslovi</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Poruka greške: %s"
+msgid "_File manager:"
+msgstr "_Pregledač datoteka:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Nadimak:"
+msgid "_Mail client:"
+msgstr "_E-mejl klijent:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "Autom_atski odsutan posle:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Internet pregledač:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Prikazana obaveštenja o stanju razgovora:"
+msgid "<b>Custom</b>"
+msgstr "<b>Personalni</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Smajliji:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikacije</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Pregledač datoteka:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Oboji pogrešno napisane reči"
+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 ""
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Zapisuj u dnevnik statusne promene kontakata"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_E-mejl klijent:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "Automatski _nedostupan nakon:"
+msgid "Log _encrypted chat session"
+msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Otvori..."
+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 ""
+"Ako je označena, Gajim će držati dnevnike šifrovanih razgovora. Primetiti da "
+"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:132
-msgid "_Reset to Default Colors"
-msgstr "_Ponovo učitaj podrazumevane boje"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
 
 #: ../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:134
-msgid "_Status message:"
-msgstr "_Statusna poruka:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "URL osvetljavanje:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatnost</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "Ponašanje prozora:"
+msgid "_Log status changes of contacts"
+msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "u _grupnim razgovorima"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "u _listi kontakata"
+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:139
-msgid "minutes"
-msgstr "minuta"
+msgid "_Open..."
+msgstr "_Otvori..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Napredna izmena konfiguracije</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste privatnosti:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Dodaj / Izmeni pravilo</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Lista privatnosti"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista pravila</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista privatnosti</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktivno za ovu sesiju"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktovno po svakom pokretanju"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista pravila</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Svi"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Dodaj / Izmeni pravilo</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Sve (uključujući i pretplate)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Odbij"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Džaber ID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "sve u grupi"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Poredak:"
+msgid "all by subscription"
+msgstr "sve prema pretplati"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Lista privatnosti"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Svi"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "sve prema pretplati"
+msgid "to send me messages"
+msgstr "da mi šalje poruke"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "sve u grupi"
+msgid "to send me queries"
+msgstr "da mi šalje upite"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Oboje"
+msgid "to view my status"
+msgstr "da vidi moj status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Od"
+msgid "to send me status"
+msgstr "da mi pošalje status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "jedan"
+msgid "All (including subscription)"
+msgstr "Sve (uključujući i pretplate)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dva"
+msgid "Order:"
+msgstr "Poredak:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "da mi šalje poruke"
+#, fuzzy
+msgid "none"
+msgstr "jedan"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "da mi šalje upite"
+#, fuzzy
+msgid "both"
+msgstr "Oboje"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "da mi pošalje status"
+#, fuzzy
+msgid "from"
+msgstr "Od"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "da vidi moj status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresa</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "dva"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Rođendan:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Grad:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Prezime:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Firma:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Država:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Srednje ime:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Odsek:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-mejl:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefiks:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Dodatna adresa:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Ime:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Prezime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sufiks:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Puno ime</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Ulica:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Ime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Grad:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Lična strana:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Pokrajina:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Dodatna adresa:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Srednje ime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Poštanski broj:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Ime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Država:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Nadimak:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresa</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Broj telefona:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Lična strana:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Pozicija:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Ime:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Poštanski broj:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Nadimak:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Broj telefona:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: GGGG-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Uloga:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Rođendan:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Pokrajina:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-mejl:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Ulica:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Kliknite da biste postavili Vaš avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sufiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Lične informacije"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Firma:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "O"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Pozicija:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Kliknite da biste postavili Vaš avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Odsek:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: GGGG-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Uloga:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Lične informacije"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Posao"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Šta želite da uradite?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "O"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Ukloni nalog samo iz Gajima"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Ukloni nalog i iz Gajima i sa servera"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Šta želite da uradite?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Ukloni"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Razmena stavki kontakata"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2803,115 +2660,112 @@ msgstr ""
 "<b>neko@domaćin.com</b> želi da <b>dodate</b> neke kontakte u listu "
 "kontakata."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Telo poruke <trenutno se ne koristi, pa je podrazumevano sakriveno>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Razmena stavki kontakata"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_U redu"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Dodaj kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Telo poruke <trenutno se ne koristi, pa je podrazumevano sakriveno>"
 
+#. 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:2
-msgid "Fea_tures"
-msgstr "_Mogućnosti"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Akcije"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Prenosi da_toteka"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Dodaj kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Često postavljana pitanja (internet)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Izmeni"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Pomoć sa interneta"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Nalozi"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Prikaz"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Prikaži kontakte koji nisu na vezi"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Prikaži samo _aktivne kontakte"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Prikaži trans_porte"
 
-#: ../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:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "_Prikaži listu kontakata"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Nalozi"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Prenosi da_toteka"
 
-#. 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 "_Akcije"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Pomoć"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Izmeni"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Pomoć sa interneta"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_ČPP"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Pošalji jednu _poruku..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Često postavljana pitanja (internet)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Prikaz"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Molimo sačekajte dok se dobavlja formular pretrage..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Mogućnosti"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Pretraga"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Molimo sačekajte dok se dobavlja formular pretrage..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "Informacije"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2931,41 +2785,37 @@ msgstr "Registruj se na"
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Odgovori na ovu poruku"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Za:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "P_ošalji"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Pošalji poruku"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Pošalji poruku i zatvori prozor"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Odgovor"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Za:"
+msgid "Reply to this message"
+msgstr "Odgovori na ovu poruku"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Odgovor"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Pošalji i zatvori"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Pošalji poruku i zatvori prozor"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Odobri autorizaciju"
+msgid "Subscription Request"
+msgstr "Zahtev za pretplatom"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Odobri autorizaciju kontakta tako da može da vidi kada ste na vezi"
+msgid "_Deny"
+msgstr "_Odbij"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2973,262 +2823,274 @@ msgid ""
 "connected"
 msgstr "Odbij autorizaciju tako da ne može da vidi kada ste na vezi"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Zahtev za pretplatom"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Odobri autorizaciju"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Odbij"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Odobri autorizaciju kontakta tako da može da vidi kada ste na vezi"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Sinhronizuj kontakte"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Odaberite kontakte koje želite da sinhronizujete"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sinhronizacija: odaberite kontakte"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Ugasi zvukove"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Pošalji _jednu poruku"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Prikaži sv_e događaje na čekanju"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Odaberite kontakte koje želite da sinhronizujete"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Grupni razgovor"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Autorizacija:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Pošalji _jednu poruku"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klijent:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Prikaži sv_e događaje na čekanju"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Vreme kontakta na vezi:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Ugasi zvukove"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informacije kontakta"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Džaber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Prijava:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klijent:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Sistem:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentari"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Vreme kontakta na vezi:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Konfigurisani avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Prijava:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informacije kontakta"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Autorizacija:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Još"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Korisnički avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Font</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentari"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Džaber saobraćaj</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Unos</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Upit"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IU"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Upit"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Prisutnost"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Prisutnost"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Unos</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Izmeni nalog..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokalni džaber ID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Lično"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Džaber klijent"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Lično"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Brze Poruke"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Džaber IM Klijent"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Džaber klijent"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Poništi odobravanje"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neispravna soba"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Servis je poslao loše podatke"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Servis je izmenio identifikator sesije."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hok komande - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktivirano"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Deaktivirano"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Da/Ne"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Ceo broj"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Ime postavke"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Tip"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(ništa)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Skriven"
 
@@ -3240,242 +3102,185 @@ msgstr[0] "Primili ste nove unose (%(count)d nije prikazano):"
 msgstr[1] "Primili ste nove unose (%(count)d nije prikazano):"
 msgstr[2] "Primili ste nove unose (%(count)d nije prikazano):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Engleski"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Beloruski"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bugarski"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretanski"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Češki"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Nemački"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Grčki"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Britanski"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Španski"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Baskijski"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francuski"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Hrvatski"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italijanski"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norveški (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandski"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norveški"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Poljski"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugalski"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazilski portugalski"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruski"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Srpski"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovački"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Švedski"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Kineski (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Jezik za pravopis"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Greška."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Podvučeno"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Precrtano"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Očisti formatiranje"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Ovak kontakt ne podržava prenos datoteka."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Pošalji _datoteku"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 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:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Nijedan GPG ključ nije dodaljen ovom kontaktu. Ne možete šifrovati poruke sa "
 "GPG-om."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti pamćena"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "i prijavljeni"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3484,57 +3289,57 @@ msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesija NEĆE biti pamćena"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Ova sesija je šifrovana"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 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:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3542,13 +3347,14 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3557,170 +3363,474 @@ 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ne mogu da dešifrujem poruku od kontakta %s\n"
+"Možda je promenjena."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Prenosi datoteka"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Veličina: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "_Nalozi"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Prenos datoteke završen"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Poziv na grupni razgovor"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Udaljeni kontakt je prekinuo prenos"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Greška pri otvaranju datoteke"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Prenos datoteke zaustavljen"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Prenos datoteke prekinut"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Način korišćenja: /%s, sakriva dugmad."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nije pronađen"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Odsutan"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Dostupan"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Način korišćenja: /%s, šalje pink kontaktu"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Komanda nije podržana za zeroconf  nalog."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s nije ispravan nivo logovanja"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Promeni nadimak (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Neispravan nadimak"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Nadimak nije pronađen: %s "
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Pošalji %s za %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Pozvani ste u grupni razgovor"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Neispravan server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "vezanost izmenjena"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Nedostaje argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram fasciklu %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Izmeni statusne informacije"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Izmeni status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Postavi tip prisutnosti i opis"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Na vezi"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Duže odsutan"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Ne smetaj"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Nije na vezi"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Opis prisutnosti:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Status se promenio."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Napusti grupne razgovore"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Ppridružili ste se grupnom razgovoru."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Odaberite grupne razgovore koje želite da napustite"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py: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
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sledeće grupne razgovore:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Prosledi nepročitane poruke"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su prosleđene."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Prosledi nepročitane poruke"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Pusti zvuk kada je korisnik zauzet"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i demon obaveštenja za prikazivanje obaveštenja"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Prikaži u listi samo kontakte koji su na vezi i slobodni za ćaskanje."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Vreme u minutama, nakom koga će se Vaš status promeiti u Odsutan."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Odsutan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "odsutnosti."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Vreme u minutama, nakom koga će se Vaš status promeiti u Nije dostupan."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "nedostupnosti"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
@@ -3728,64 +3838,120 @@ msgstr ""
 "Kada prikazati ikonicu u sistemskoj kaseti. Može biti 'never', 'on_event', "
 "'always'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Boja za dolazni nadimak."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Boja za odlazni nadimak."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Boja dolaznog teksta."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Boja odlaznog teksta."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Boja teksta statusne poruke."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Prikaži događaj u listi kontakata"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Prikaži događaj u listi kontakata"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Zahtev za prenosom datoteke"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Prenos datoteke prekinut"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Poziv na grupni razgovor"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Font dolaznog nadimka."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Font odlaznog nadimka."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Font dolaznog teksta."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Font odlaznog teksta."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Font teksta statusne poruke."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py: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
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "podrazumevano"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Jezik koji koristi pravopis"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3795,7 +3961,7 @@ msgstr ""
 "'ponekad' - ispisuj vreme svakih print_ichat_every_foo_minutes minuta.\n"
 "'nikad' - nikad ne ispisuj vreme."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3806,18 +3972,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje_vremena "
 "postavnjeno na 'ponekad'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Smatraj * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
 "iokruženo sa * *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3828,7 +3994,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ako želite da koristite ovo, instalirajte "
 "docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3836,7 +4002,7 @@ msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
 "(tasterom tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3844,7 +4010,13 @@ msgstr ""
 "Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
 "nadimak u grupnom razgovoru već upotrebljen"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3855,44 +4027,51 @@ msgstr ""
 "dokumentaciju za strftime, za punu dokumentaciju: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani pre nadimka u razgovoru"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani posle nadimka u razgovoru"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste kontakata?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Koliko linija prethodnog razgovora pamtiti kada se prozor/jezičak  za "
 "razgovor ponovo otvori."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta da traju linije prethodnog razgovora."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3900,7 +4079,12 @@ msgstr ""
 "Koliko sekundi čekati pre ponovnog automatskog pridruživanja sobi sa koje "
 "ste raskačeni. Staviti 0 da onemogućite ponovno automatsko pridruživanje."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3908,11 +4092,11 @@ msgstr ""
 "Pošalji poruku sa Ctrl+Enter, a sa Enter pravi novu liniju. (Podrazumevano "
 "ponašanje Miralabisovog ICQ klijenta)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija sačuvati sa Ctrl+KeyUP"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3921,11 +4105,11 @@ msgstr ""
 "Ili Vaš specificirani URL sa %s u njemu gde je %s reč ili fraza ili 'VIKI-"
 "REČNIK' što znači korišćenje viki-rečnika."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolisati korišćenjem gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3936,14 +4120,14 @@ msgstr ""
 "računa (ako nemaju listen_to_network_manager postavljen na neistinito i "
 "sinhronizuj sa globalnim statusom) u zavisnosti od statusa mrežne konekcije."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3951,7 +4135,7 @@ msgstr ""
 "Prikazana obaveštenja o stanju razgovora u prozoru za razgovor. Može biti "
 "jedno od 'svi', 'samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3959,36 +4143,39 @@ msgstr ""
 "Ako se ne ispisuje vreme za svaku poruku (print_time==ponekad), ispisati ga "
 "svakih x minuta"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Uvek pitaj pre zatvaranja jezička/prozora kada je u pitanju ova lista "
 "odvojena blanko karakterima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nikad ne pitaj pre zatvaranja jezička/prozora grupnog razgovora kada je u "
 "pitanju ova listaodovojena blanko znacima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Pitaj pre zatvaranja jezička ćaskanja ako postoji kontrola koja može "
 "izgubiti podatke (ćaskanje, privatno ćaskanje, grupni razgovor koji neće "
 "biti minimizovan)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3996,28 +4183,34 @@ msgstr ""
 "Lista hostova odvojena zarezima, koju šaljemo, uz lokalne interefejse, za "
 "transfer datoteka, u slučaju prosleđivanja porta/NATovanja."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 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
+#: ../src/common/config.py:210
 #, 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
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži jezičak iako je samo jedan razgovor?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaši granicu sveske u prozorima razgovora?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4028,18 +4221,18 @@ msgstr ""
 "prioritet, odvojeni zarezima. Validne grupe su 1, 2, 5, 14, 15, 16, 17 i 18. "
 "Višlji brojevi su sugurniji, ali tada treba više vremena za početak sesije."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista reči odvojena blanko karakterima koje će biti obojene u grupnim "
 "razgovorima"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4048,14 +4241,14 @@ msgstr ""
 "Ako je istinito, Gajim se završava kada se pritisne X dugme. Ovo podešavanje "
 "se koristi samo ako je ikona sistemske kasete u upotrebi."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ako je istinito, Gajim proverava da li je podrazumevani džaber klijent na "
 "svakom startovanju."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4063,7 +4256,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ikonu na svakom jezičku koji sadrži "
 "nepročitane poruke. U zavisnosti od teme, ikona može biti i animirana."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4071,12 +4264,12 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
 "svaki kontakt u listi kontakata"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definišite poziciju avatara u listi kontakata. Može biti levo ili desno"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4084,7 +4277,7 @@ msgstr ""
 "Ako je istinito, Gajim će poslati upit za avatar za svaki kontakt koji "
 "prošlog puta nije  imao avatar ili je onaj u memoriji prestar"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -4092,9 +4285,10 @@ msgstr ""
 "Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
 "kontakt promeni svoj status i/ili statusnu poruku."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4106,30 +4300,34 @@ msgstr ""
 "sve statusne poruke. Ako je \"in_and_out\". Gajim će prikazivati samo poruke "
 "tipa taj i taj je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakta kada tek dođu na vezu."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakta kada tek odu sa veze."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ako je istinito, vraćene poruke iz istorijata će biti manjeg fonta od "
 "podrazumevanog."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4139,7 +4337,7 @@ msgstr ""
 "prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
 "novim događajima."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -4150,7 +4348,8 @@ msgstr ""
 "u grupnim razgovorima"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4158,7 +4357,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontroliše prozor gde se smeštaju nove poruke.\n"
@@ -4169,31 +4368,39 @@ msgstr ""
 "'pertype' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju "
 "u isti prozor."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je istinito, pritisak na taster 'esc' zatvara jezičak/prozor."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Sakriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Sakriva baner u prozoru razgovora dve osobe"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Sakriva listu učesnika u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4201,15 +4408,15 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku novog reda samo kada se ne radi o "
 "istoj osobi koja je pričala i u prošloj poruci."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Uvlačenje pri korišćenju spajanja uzastopnih nadimaka."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko skrolovanje u prozoru razgovora"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4217,11 +4424,11 @@ msgstr ""
 "Lista boja odvojena sa \":\" koje će biti korišćene za bojenje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab ide na sledeći jezičak kada nema nepročitanih jezičaka"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4229,7 +4436,7 @@ msgstr ""
 "Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazna niska "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4237,7 +4444,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4245,7 +4452,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu prilagođenog statusa? Prazna niska "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 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 "
@@ -4255,7 +4462,7 @@ msgstr ""
 "nalog u prozoru za izmenu podešavanja naloga. BUDITE OPREZNI, kada ste "
 "povezani sa negativnim prioritetom NEĆETE primati nikakve poruke od servera."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4263,7 +4470,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4271,7 +4478,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti KDE Novčanik (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4279,7 +4486,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ukupan broj korisnika i broj korinsika "
 "na vezi u grupnim redovima."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4287,7 +4494,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretira sve dolazne "
 "poruke kao poruke postavljenog tipa"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4295,19 +4502,11 @@ msgstr ""
 "Ako je istinito, Gajim će skrolovati i označiti kontakt koji Vam je "
 "poslednji poslao poruku, ako prozor razgovora nije otvoren."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Ako je istinito, Gajim će konvertovati sve karakter između $$ i $$ u sliku "
-"koristeći dvips u ibaciti je u prozor razgovora."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Vreme neaktivnosti posle koga se prozor za izmenu statusa zatvara."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4315,7 +4514,7 @@ msgstr ""
 "Maksimum poruka koje se prikazuju u razogovoru. Najstarije linije se "
 "sklanjaju."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4324,18 +4523,12 @@ msgstr ""
 "Ako je istinito, prozor obaveštenja od servisa obaveštenja će biti zakačen "
 "za sistemsku kasetu."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Odaberite interval između dve provere da se ništa ne dešava na računaru."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4343,21 +4536,22 @@ msgstr ""
 "Ispravne uri šeme. Samo šeme sa ove liste će biti prihvaćene kao \"stvarne\" "
 "uri. (mailto i xmpp se obrađuju zasebno)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Pitaj za statusne poruke van veze za sve kontakte koji nisu na vezi kada se "
 "uspostavi veza sa nalogom. UPOZORENJE: ovo će poslati mnogo zahteva serveru!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Ako je True, dopunjavanje u grupnim razgovorima će biti kao dopunjavanje u "
 "konzoli"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4365,31 +4559,60 @@ msgstr ""
 "Kada se prikazuje sopstveni kontakt. Može biti \"always\", "
 "\"when_other_resource\" or \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
+"podrazumevana poruka će biti korišćena."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4397,7 +4620,7 @@ msgstr ""
 "Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
 "Prioriteti su definsani u autopriority_* podešavanjima."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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"
@@ -4406,39 +4629,39 @@ msgstr ""
 "dnd, invisible. PAŽNJA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Ako je True, kontakti koji traže autorizaciju će automatski biti prihvaćeni."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Ako je False, nalog će biti onemogućen i neće se prikazivati u listi "
 "kontakata."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ako je onemogućeno, ne potpisuj prisustvo sa GPG ključem, čak iako je GPG "
 "konfigurisan."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj nalog."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Da li će Gajim automatski startovati šifrovanu sesiju ako je moguće?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4446,49 +4669,64 @@ msgstr ""
 "Uređena lista (odvojena zarezima) tipova konekcije za probu. Može sadržati "
 "tls, ssl ili plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Prikaži prozor upozorenja pre korišćenja standardne SSL biblioteke."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Slanje belina posle neaktivnosti"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "Slanje XMPP pinga posle neaktivnosti"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Koliko sekundi čekati na odgovor o paketima o živosti pre nego što pokušamo "
 "ponovno uspostavljanje veze."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 privremeno rešenje"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4496,15 +4734,34 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtev primanja"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Poslati zahtev primanja"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s Vam želi poslati datoteku."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4512,20 +4769,52 @@ msgstr ""
 "Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
 "želite da čuvate poruke u dnevniku?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonimno prijavljivanje"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_imno prijavljivanje"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4533,108 +4822,108 @@ msgstr ""
 "Da li Gajim treba automatski da započne šifrovanu vezu sa ovim kontaktom "
 "kada je moguće?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "sve ili razmakom odvojen status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'da', 'ne', ili 'oboje'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Napolju"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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."
@@ -4643,27 +4932,186 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Za"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "zahtev za ukidanje pretplate od kontakta %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Greška pri upisu na disk"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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 ""
+"Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite "
+"(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
+"istorijat poruka će biti izgubljen)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Soba grupnog razgovora je uništena"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Možete se priključiti sobi %s umesto ove"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Neispravan džaber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Poruka od neispravnog džaber ID-a, ignorisana je."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "greška prilikom slanja %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Nepoznata SSL greška: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nova Samostalna Poruka"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova samostalna poruka od kontakta %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nova Privatna Poruka"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova privatna poruka sa grupnog razgovora %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nova Poruka"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s je promenio status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt promenio status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s je na vezi"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt je na vezi"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s je otišao"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt je otišao sa veze"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
@@ -4673,213 +5121,188 @@ msgstr "Nije moguće učitavanje modula idle"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registracija uspešna"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registracija sa agentom %s uspešna"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registracija neuspela"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, 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: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:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../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: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: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 ""
-"Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite "
-"(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
-"istorijat poruka će biti izgubljen)."
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Želeo bih da te dodam na moju listu kontakata."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 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:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4888,76 +5311,77 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nepoznata SSL greška: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Veza sa \"%s\" nije moguća"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server je odgovorio: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, 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:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4966,7 +5390,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4975,24 +5399,33 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../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:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Autentičnost sertifikata %s može biti neispravna."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Prijavljivanje sa \"%s\" neuspešno"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 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:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5001,66 +5434,66 @@ 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslati kontakti: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Poslati kontakti:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Odjava registracije neuspela"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, 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:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Prenosi"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na ovom računaru nedostaju python vezivanja za D-Bus"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima se ne mogu koristiti"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus ne radi ispravno na ovom računaru"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus ne radi ispravno na ovom računaru"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus ne radi ispravno na ovom računaru"
@@ -5075,7 +5508,7 @@ msgstr ""
 "Servis nije dostupan: Gajim nije pokrenut ili je stavka podešavanja "
 "remote_control neistinita"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus ne postoji na ovom računaru ili nema python modula."
 
@@ -5260,224 +5693,232 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Potrebna je adresa servera."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Nedostupan"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prenosa:Pauziran"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prenosa:Pauziran"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Nevidljiv"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Učesnici"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Učesnik"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5485,22 +5926,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " iz sobe %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " od korisnika %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5508,21 +5949,40 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaj na čekanju"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Isteklo vreme za učitavanje slike"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Slika je prevelika"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL nije još validan"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Isteklo vreme za učitavanje slike"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracija sobe"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5534,111 +5994,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravan nivo logovanja"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Podrazumevana poruka"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Veličina: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Datoteka: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zelena"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "greška: ne mogu otvoriti %s za čitanje"
+msgid "Error: cannot open %s for reading"
+msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -6275,19 +6749,115 @@ msgstr "Uči"
 msgid "Writing"
 msgstr "Piše"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "podrazumevano"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "morska"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Krije se"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Nalog"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Nalog"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Opis"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Greška"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "jedan"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "soba"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Nepoznat izvođač"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6296,32 +6866,19 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "iz <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Ne mogu da se povežem na port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 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:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6330,44 +6887,43 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ne mogu se povezati na port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Molimo proverite da li je avahi-demon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Vaša poruka nije mogla biti poslata."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6379,24 +6935,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6405,214 +6961,215 @@ msgstr ""
 "Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
 "ili odaberite drugi jezik postavkom speller_language opcije."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promene trenutno primene, morate da se ponovo povežete."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promenu imena naloga, morate otići sa veze."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da biste promenili ime naloga, morate prvo pročitati sve događaje na čekanju."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Ime Naloga Već U Upotrebi"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ovo ime već koristi jedan od Vaših naloga. Molimo Vas, odaberite drugo ime."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Neispravno ime naloga"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Ime naloga ne može biti prazno."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Nema dostupnih OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../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
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 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:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Da biste onemogućili nalog, morate biti raskačeni."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "DŽID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6620,11 +7177,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6632,11 +7189,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6644,11 +7201,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6656,7 +7213,7 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6672,110 +7229,107 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Šta želite da uradite?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ukloni nalog samo iz Gajima"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 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:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Neispravan nadimak"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Karakter nije dozvoljen"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Neispravan server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Neispravna soba"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6785,32 +7339,32 @@ msgstr ""
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6825,7 +7379,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6836,72 +7390,89 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije uklonjen"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Konfiguriši"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "događaj"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Primljena Prva Poruka"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Primljena Prva Poruka"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Sledeća Primljena Poruka Fokusirana"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Sledeća Primljena Poruka Nefokusirana"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt Na Vezi"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt Otišao Sa Veze"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Poruka Poslata"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Primljen Gmail e-mejl"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6911,7 +7482,7 @@ msgstr ""
 "stigla na drugi kraj. Ako ova ikona ostane ovako \n"
 "dugo vremena, verovatno je da se poruka izgubila."
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6919,237 +7490,238 @@ 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Juče"
 msgstr[1] "Juče"
 msgstr[2] "Juče"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Džaber ID već u listi kontakata"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 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:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Džaber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ID Ključa"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Snimi kao već postavljenu statusnu poruku"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ džaber klijent"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Džaber klijent"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7162,100 +7734,154 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Nesigurna veza"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
+"PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Ne pitaj me više"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Loš uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Ovo nije grupni razgovor"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Neispravan nalog"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7264,168 +7890,138 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt je na vezi"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nova Poruka"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nova Privatna Poruka"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Poziv na grupni razgovor"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt promenio status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Ukloni"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7433,189 +8029,187 @@ 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:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Dodate"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Džaber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupe"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Dodaj _kontakt"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Dodaj _kontakt"
+msgstr[1] "Dodaj _kontakt"
+msgstr[2] "Dodaj _kontakt"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Uklanja kontakt sa liste"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Uklanja kontakt sa liste"
+msgstr[1] "Uklanja kontakt sa liste"
+msgstr[2] "Uklanja kontakt sa liste"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Neispravano ime servera"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Servis je vratio grešku."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Uslov"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "kada sam "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7626,19 +8220,19 @@ msgstr ""
 "\n"
 "Kratka Autentikaciona Niska ove sesije je: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Identitet kontakta potvrđen"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Potvrdite ponovo..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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 "
@@ -7648,19 +8242,19 @@ msgstr ""
 "poruke ili da Vam šalju poruke, morate potvrditi njihov identitet klikajući "
 "dugme ispod."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Identitet kontakta NIJE potvrđen"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet kontakta?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7674,85 +8268,126 @@ 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:5239
+#: ../src/dialogs.py:5154
 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:5273
+#: ../src/dialogs.py:5189
 #, 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:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP 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:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG ključ je dodeljen kontaktu, ali Vi <b>ne verujete</b> ovom ključu, tako "
 "da poruke <b>ne mogu</b> biti šifrovane. Upotrebite Vašeg GPG klijenta da "
 "date poverenje ovom ključu."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG ključ je dodeljen ovom kontaktu i Vi verujete ovom ključu tako da će "
 "poruke biti šifrovane."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "za nalog %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Samopotpisani sertifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7760,233 +8395,248 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Izvrši naredbu"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Marker je već postavljen"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni razgovor \"%s\" je već markiran."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Marker uspešno dodat"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Validacija SSL sertifikata"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka koja se koristi da proveri sertifikate servera i osigura sigurnu "
 "vezu."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Zahteva python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Razgovor bez servera sa autodetekcijom klijenata u lokalnoj mreži."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Zahteva python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Zahteva pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Komandna linija"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Skripta za kontrolu Gajima iz komandne linije."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Zahteva 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Šifrovanje OpenPGP poruke"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Šifrujem poruke razgovora sa gpg ključevima."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Zahteva gpg i python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Autodetekcija statusa mreže."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Zahteva gnome-network-manager i python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Menadžment sesija"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesija je sačuvana na prekidu veze i učitana po logovanju."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Zahteva python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Šifrovanje lozinkom"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lozinke se mogu sačuvati i pouzdanije od običnog teksta."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Zahteva gnome-keyring and python-gnome2-desktop, ili kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Zahteva dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Zahteva nslookup da biste koristili SRV zapise."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Provera pravopisa"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Provera pravopisa sastavljenih poruka."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Zahteva libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Zahteva libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Obaveštenje"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Pasivna iskačuća obaveštenja o novim događajima."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7994,67 +8644,41 @@ msgstr ""
 "Zahteva python-notify ili, umesto toga python-dbus u sprezi sa notification-"
 "daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatski status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Daje mogućnost merenja vremena kada se ništa ne dešava, da se odredi auto "
 "status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Zahteva libxss biblioteku."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Zahteva python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Pretvara LaTeX izraze između $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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 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."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Šifrovanje poruke s kraja na kraj"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Šifrujem poruke razgovora."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Zahteva python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8062,172 +8686,200 @@ msgstr ""
 "Generiše XHTML izlaz od RST koda (pogledati http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Zahteva python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Zahteva python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Zahteva python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Zahteva python-dbus."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Dostupan"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Mogućnost"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Veličina: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Primaoc: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sačuvano u: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Prenos datoteke završen"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Prenos datoteke prekinut"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primaoc: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Prenos datoteke zaustavljen"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Odaberite datoteku za slanje..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Opis:"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Datoteka: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tip: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Opis: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s Vam želi poslati datoteku:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, 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:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Snimi datoteku kao..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Datoteka: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tip: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s Vam želi poslati datoteku:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Slanje profila..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Greška pri prenosu datoteke"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8235,69 +8887,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/sek)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Neispravna datoteka"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "poruka"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Smajliji:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Prikaži događaj u listi kontakata"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Napredna izmena konfiguracije"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Konfiguracija sobe"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu treba X server da bi se pokrenuo. Završavam..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "neuspelo uvoženje PyGTK modula: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajimu treba pyGTK 2.12 ili veća verzija"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajimu treba pyGTK 2.12 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajimu treba GTK 2.12 ili veća verzija"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.12 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8306,12 +8995,11 @@ msgstr ""
 "Molimo osigurajte se da je Pywin32 instaliran na Vašem sistemu. Možete ga "
 "naći na %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8319,28 +9007,28 @@ msgstr ""
 "Jedna instanca Gajima izgleda već radi\n"
 "Svejedno želite pokrenuti?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste kontakata "
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8348,53 +9036,57 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "nalog"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Menja status jednog ili više naloga"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "poruka"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8403,20 +9095,44 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Menja status jednog ili više naloga"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "prioritet koji želite da date ovom nalogu"
+
+#: ../src/gajim-remote.py:122
+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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "sadržaj poruke. Nalog mora biti naznačen ili \"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8426,34 +9142,29 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8463,134 +9174,131 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Šalje datoteku kontaktu"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
 "stavka postaviti"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvara dijalog za započinjanje razgovora"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 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
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8598,44 +9306,93 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Izmeni status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Nadimak za korišćenje"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
+"sve naloge"
+
+#: ../src/gajim-remote.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI za upravljanje"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Nalog u kome želite da upravljate njime"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Sadržaj poruke"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Pridruži se novoj sobi"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "soba"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Džaber ID sobe:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Nadimak za korišćenje"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Lozinka za ulazak u sobu"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Nalog sa koga želite da uđete u sobu"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8644,156 +9401,44 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
+"Korišćenje: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Loš 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 ""
-"jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
-"uznemiravaj, nevidljiv"
-
-#: ../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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "sadržaj poruke. Nalog mora biti naznačen ili \"\""
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Izmeni status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Nadimak za korišćenje"
-
-#: ../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 ""
-"Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
-"sve naloge"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI za upravljanje"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Nalog u kome želite da upravljate njime"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Sadržaj poruke"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Džaber ID sobe:"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Nadimak za korišćenje"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Lozinka za ulazak u sobu"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Nalog sa koga želite da uđete u sobu"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Korišćenje: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8802,7 +9447,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8811,10 +9456,14 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Loš uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8837,181 +9486,219 @@ msgid "You cannot delete your current theme"
 msgstr "Ne možete izbrisati Vašu trenutnu temu"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Molimo Vas da prvo odaberete neku drugu temu."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s je postavio temu na %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Soba sada prikazuje nedostupne članove"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "soba sada ne prikazuje nedostupne članove"
+
+#: ../src/groupchat_control.py:1293
+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/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Logovanje u sobi je sada omogućeno"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Logovanje u sobi je sada onemogućeno"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Soba sada više nije anonimna"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Soba je sada polu anonimna"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Soba je sada potpuno anonimna"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, 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:1481
+#: ../src/groupchat_control.py:1799
 #, 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:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo odredite novi nadimak koji želite da koristite:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9019,22 +9706,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -9057,65 +9744,59 @@ msgstr "_Prijavi grešku"
 msgid "Details"
 msgstr "Detalji"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije Vaš podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 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:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Snimi sliku kao..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9126,92 +9807,86 @@ msgstr ""
 "registrovan od strane nekog od učesnika.\n"
 "Molimo odredite drugi nadimak ispod:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Uvek koristi nadimak kada postoji konflikt"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> 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."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9219,102 +9894,96 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Ukinuta pretplata"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Soba sada prikazuje nedostupne članove"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "soba sada ne prikazuje nedostupne članove"
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
+msgid "%(jid)s declined the invitation: %(reason)s"
 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:934
-msgid "Room logging is now enabled"
-msgstr "Logovanje u sobi je sada omogućeno"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Logovanje u sobi je sada onemogućeno"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Soba sada više nije anonimna"
 
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Soba je sada polu anonimna"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Soba je sada potpuno anonimna"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije tačna"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG lozinka nije tačna"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Sertifikat je istekao"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG ključ nije od poverenja"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "GPG ključ koji se koristi za šifrovanje nije od poverenja. Da li zaista "
 "želite da šifrujete ovu poruku?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi e-mejl za %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9322,7 +9991,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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9337,80 +10006,65 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../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:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Greška pri otvaranju datoteke"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Prenosi datoteka"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ne mogu da dešifrujem poruku od kontakta %s\n"
-"Možda je promenjena."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Greška."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9419,21 +10073,21 @@ msgstr ""
 "novo ime resursa"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9444,15 +10098,20 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Greška SSL sertifikata"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9469,27 +10128,7 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"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: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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9497,7 +10136,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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9507,17 +10146,17 @@ msgstr ""
 "želite to da uradite?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 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:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9527,90 +10166,93 @@ msgstr ""
 "emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
 "više detalja."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG ključ istekao"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Novi grupni razgovor"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Želeo bih Vas dodati na moju listu kontakata"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "kreiram fasciklu %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakti"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Poruka"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Želite li počistiti bazu podataka? (NE PREPORUČUJE SE AKO JE GAJIM POKRENUT)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9624,97 +10266,109 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, molimo sačekajte..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Greška sa bazom podataka"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Izvoženje dnevnika istorijata..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s u %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
-msgstr[1] ""
-"Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
-msgstr[2] ""
-"Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Da li zaista želite da izbrišete označenu poruku?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Ova operacija je nepovratna."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Poništi odobravanje"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[1] "Da li zaista želite da izbrišete označene poruke?"
 msgstr[2] "Da li zaista želite da izbrišete označene poruke?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istorijat razgovora sa %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Isteklo vreme za učitavanje slike"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programira"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Slika je prevelika"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Zatvorićete nekoliko jezičaka"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite da ih sve zatvorite?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9726,100 +10380,112 @@ msgstr "- poruke će biti logovane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti logovane"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s je promenio status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignoriši"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s je na vezi"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s je otišao"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Zabranjujem %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nova samostalna poruka od kontakta %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registracija neuspela"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova privatna poruka sa grupnog razgovora %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Servis je poslao loše podatke"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nova poruka od %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Ova datoteka već postoji"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nova poruka od %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignoriši"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfiguracija sobe"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacije kontakta"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informacije primljene"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Slanje profila..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Publikacija vCard neuspela"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9827,51 +10493,52 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, 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:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, 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:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9879,38 +10546,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Stvarno zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Uvek zatvori Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Prekini prenos datoteke"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9918,16 +10585,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9935,11 +10602,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9948,12 +10615,12 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovih "
 "transporta: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 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:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9962,56 +10629,56 @@ msgstr ""
 "šalje."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, 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:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10020,11 +10687,11 @@ msgstr ""
 "ta osoba uvek videti kao da niste na vezi."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10032,16 +10699,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10051,15 +10718,15 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete poslati prilagođen status. Jeste li sigurni da želite da "
 "nastavite?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10068,35 +10735,36 @@ msgstr ""
 "Kontakt će vas privremeno videti kao %(status)s, ali samo dok ne promenite "
 "status. Onda će videti globalni status."
 
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10106,11 +10774,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10118,12 +10786,17 @@ 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Pošalji %s za %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Napravi metakontakte od %s i %s"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Napravi metakontakte od %s i %s"
@@ -10133,130 +10806,130 @@ msgstr "Napravi metakontakte od %s i %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Izmeni _grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Izvrši naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "U_loguj se ponovo"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
@@ -10273,24 +10946,14 @@ msgstr "Greška u primanju forme za podatke"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Greška pri upisu na disk"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10302,7 +10965,7 @@ msgstr ""
 "\n"
 "\tDa li su ove stavke prihvatljive?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10317,147 +10980,152 @@ msgstr ""
 "\n"
 "Nastaviti sa sesijom?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Promeni statusnu poruku..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "u _listi kontakata"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Džaber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blokiran]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [umanjen]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslednji status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Na vezi"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Van veze"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Raspoloženje:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivnost:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Pesma:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Obaveštenje"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Slanje"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nije počeo"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Zaustavljen"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Završen"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?status prenosa:Pauziran"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Zastoj"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Prenos u toku"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10465,32 +11133,32 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Vreme:Nepoznato"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10498,7 +11166,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10506,13 +11174,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10520,18 +11188,392 @@ msgstr ""
 "Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
 "nju"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Odaberite datoteku za slanje..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " otvaranje prozora/jezička sa tim kontaktom "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Akcije</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Uslovi</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Napredne Akcije"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Napredna kontrola obaveštavanja"
+
+#~ msgid "All statuses"
+#~ msgstr "Svi statusi"
+
+#~ msgid "Busy "
+#~ msgstr "Zaposlen"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt promenio status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt Otišao Sa Veze"
+
+#~ msgid "Don't have "
+#~ msgstr "Nemam "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Prenos datoteke zaustavljen"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Primljena Poruka Sa Grupnog Razgovora"
+
+#~ msgid "Have "
+#~ msgstr "Imam "
+
+#~ msgid "Launch a command"
+#~ msgstr "Pokrenite komandu"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Jedan ili više posebnih statusa..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Na vezi / Slobodan za razgovor"
+
+#~ msgid "Play a sound"
+#~ msgstr "Puštanje zvukove"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nova Privatna Poruka"
+
+#~ msgid "When "
+#~ msgstr "Kada "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktiviranje upravnika prozora za bljeskanje prozora razgovora u panelu"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Onemogući automatsko otvaranje prozora za razgovor"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Onemogući postojeći iskačući prozor"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Onemogući postojeći zvuk za ovaj događaj"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Onemogući prikazivanje događaja u listi kontakata"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Onemogući prikazivanje događaja u listi kontakata"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Obavesti me iskačućim prozorom"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Otvori prozor za razgovor sa korisnikom"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Prikaži događaj u listi kontakata"
+
+#~ msgid "and I "
+#~ msgstr "i ja "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontakti"
+
+#~ msgid "for "
+#~ msgstr "za"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupe"
+
+#~ msgid "when I'm in"
+#~ msgstr "kada sam u"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Prikaži profil kontakta (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Dozvoli mu/joj da vidi moj status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Opis:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Napredno..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Prikaži aktivnosti kontakata na listi"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Prikaži _pesme kontakata na listi"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Prikaži _raspoloženja kontakata na listi"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
+#~ "kontakata"
+
+#~ 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"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Pošalji jednu _poruku..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Korisnički avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Brze Poruke"
+
+#~ msgid "English"
+#~ msgstr "Engleski"
+
+#~ msgid "Belarusian"
+#~ msgstr "Beloruski"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bugarski"
+
+#~ msgid "Breton"
+#~ msgstr "Bretanski"
+
+#~ msgid "Czech"
+#~ msgstr "Češki"
+
+#~ msgid "German"
+#~ msgstr "Nemački"
+
+#~ msgid "Greek"
+#~ msgstr "Grčki"
+
+#~ msgid "British"
+#~ msgstr "Britanski"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Španski"
+
+#~ msgid "Basque"
+#~ msgstr "Baskijski"
+
+#~ msgid "French"
+#~ msgstr "Francuski"
+
+#~ msgid "Croatian"
+#~ msgstr "Hrvatski"
+
+#~ msgid "Italian"
+#~ msgstr "Italijanski"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norveški (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandski"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norveški"
+
+#~ msgid "Polish"
+#~ msgstr "Poljski"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugalski"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazilski portugalski"
+
+#~ msgid "Russian"
+#~ msgstr "Ruski"
+
+#~ msgid "Serbian"
+#~ msgstr "Srpski"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovački"
+
+#~ msgid "Swedish"
+#~ msgstr "Švedski"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kineski (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Jezik za pravopis"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Ako je istinito, Gajim će konvertovati sve karakter između $$ i $$ u "
+#~ "sliku koristeći dvips u ibaciti je u prozor razgovora."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
+
+#~ msgid "all or space separated status"
+#~ msgstr "sve ili razmakom odvojen status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'da', 'ne', ili 'oboje'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'da', 'ne' ili ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "greška: ne mogu otvoriti %s za čitanje"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Ne mogu da se povežem na port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti "
+#~ "prekinut."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ džaber klijent"
+
+#~ msgid "Condition"
+#~ msgstr "Uslov"
+
+#~ msgid "when I am "
+#~ msgstr "kada sam "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Zahteva pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Zahteva gpg i python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Pretvara LaTeX izraze između $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Zahteva texlive-latex-base i dvipng (sve iz MikTeX-a). Morate "
+#~ "podesiti'use_latex' na True u editoru naprednih podešavanja."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Zahteva python-avahi."
+
+#, fuzzy
+#~ 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"
+
+#, 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)"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakti"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Greška pri upisu na disk"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Tema: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Raspoloženje:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivnost:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10559,32 +11601,12 @@ msgstr " resurs sa prioritetom "
 #~ 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 "unsubscribe request from %s"
-#~ msgstr "zahtev za ukidanje pretplate od kontakta %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"
 
@@ -10687,9 +11709,6 @@ msgstr " resurs sa prioritetom "
 #~ "Istorijati grupnih razgovora\n"
 #~ "Istorijat svih razgovora"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Podešavanje naloga"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10858,18 +11877,9 @@ msgstr " resurs sa prioritetom "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Pridruži Open_PGP Ključ"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Komanda nije podržana za zeroconf  nalog."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Komanda: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Način korišćenja: /%s, sakriva dugmad."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10877,12 +11887,6 @@ msgstr " resurs sa prioritetom "
 #~ "Način korišćenja: /%(command)s <action>, šalje akciju trenutnom grupnom "
 #~ "razgovoru. Koristititreće lice. (npr. /%(command)s je eksplodirao.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Način korišćenja: /%s, šalje pink kontaktu"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Nema informacija ni pomoći za /%s"
 
@@ -10899,10 +11903,6 @@ msgstr " resurs sa prioritetom "
 #~ msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Nadimak nije pronađen: %s "
-
-#, fuzzy
 #~ 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 \"@\". "
@@ -10914,12 +11914,6 @@ msgstr " resurs sa prioritetom "
 #~ "imenima NISU podržani."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10961,10 +11955,6 @@ msgstr " resurs sa prioritetom "
 #~ "Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
 #~ "razgovoru."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr ""
-#~ "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11001,9 +11991,6 @@ msgstr " resurs sa prioritetom "
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
 
-#~ msgid "Show _roster"
-#~ msgstr "_Prikaži listu kontakata"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
 
diff --git a/po/sv.po b/po/sv.po
index a990979b7..4c6839ef6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,15 +5,11 @@
 # 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-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+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"
@@ -23,308 +19,299 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Personliga händelser"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Starta chatt..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Gå in i _gruppchatt..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Kör kommando..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Redigera konto"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Öppna Gmail-inkorg"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Personliga händelser"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Starta chatt..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "_Redigera konto"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Kontoskaparen"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Ansluter till server</b>\n"
-"\n"
-"Vänta..."
+"Du behöver ha ett konto för att kunna ansluta till\n"
+"Jabber-nätverket."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+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:5
+msgid "I want to _register for a new account"
+msgstr "Jag vill _registrera ett nytt konto"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Välj ett av nedanstående alternativ:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Fyll i informationen för ditt befintliga konto</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Välj en server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Lösenord:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-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:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Spara lösen_ord"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_ym autentisering"
+#: ../data/gui/accounts_window.ui.h:21
+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:11
-msgid "Connect when I press Finish"
-msgstr "Anslut när jag trycker på Färdigställ"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber-ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Kontoskaparen"
+msgid "Anon_ymous authentication"
+msgstr "Anon_ym autentisering"
 
 #: ../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"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Välj en server</b>"
 
 #: ../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/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../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"
+msgid "Prox_y:"
+msgstr "Prox_yserver:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Hantera..."
 
 #: ../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: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"
+msgid "Use custom hostname/port"
+msgstr "Använd anpassat värdnamn/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_yserver:"
+msgid "_Hostname:"
+msgstr "_Värdnamn:"
 
 #: ../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"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../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/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avancerat"
 
 #: ../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:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Du behöver ha ett konto för att kunna ansluta till\n"
-"Jabber-nätverket."
+"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:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Avancerat"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "F_ärdigställ"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Värdnamn:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Ansluter till server</b>\n"
+"\n"
+"Vänta..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+msgid "Connect when I press Finish"
+msgstr "Anslut när jag trycker på Färdigställ"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Lösenord:"
+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:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "F_ärdigställ"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Diverse</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ingen"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Konton"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Personlig information</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Lägg till"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxyserver</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Ta bort"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Justera _efter status"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Byt _namn"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Konto"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Aktivera"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Konton"
+msgid "Anonymous authentication"
+msgstr "Anonym autentisering"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administrationsåtgärder"
+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 ""
+"Resursen skickas till Jabberservern för att separera samma JID i två eller "
+"flera delar beroende på antalet klienter anslutna till samma server med "
+"samma konto. Så du kan vara ansluten till samma konto med resurserna \"Hem\" "
+"och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
+"(se nedan)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonym autentisering"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Återanslut automatiskt när anslutningen förloras"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Synkronisera kontakter"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Bläddra"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Klicka för att begära auktorisation till alla kontakter för annat konto"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "A_nslut vid start av Gajim"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "_Byt lösenord"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Klicka för att byta kontots lösenord"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Kryssa för denna så att Gajim frågar dig innan ditt lösenord skickas över en "
-"osäker anslutning."
+msgid "Administration operations"
+msgstr "Administrationsåtgärder"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Välj fil att skicka..."
+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 ""
+"Prioritet används i Jabber för att fastställa vem som får händelser från "
+"jabberservern när två eller flera klienter är anslutna till samma konto: "
+"Klienten med den högsta prioriteten får händelserna"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Välj nyc_kel..."
+msgid "A_djust to status"
+msgstr "Justera _efter status"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klicka för att byta kontots lösenord"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Klicka för att begära auktorisation till alla kontakter för annat konto"
+msgid "Priori_ty:"
+msgstr "Priori_tet:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Självsignerat certifikat"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "A_nslut vid start av Gajim"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Anslutning"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-post:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Förnamn:"
+msgid "Resour_ce:"
+msgstr "Resur_s:"
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+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: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"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Bläddra"
 
 #: ../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 ""
-"Om kryssad kommer Gajim att sända ut fler IP-adresser än bara ditt IP. Detta "
-"för att öka chanserna att filöverföringar ska fungera som de ska."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certifikatet nekades"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Om kryssad kommer Gajim att få lösenordet från en GPG-agent, t.ex. Seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Självsignerat certifikat"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Konto"
 
 #: ../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 ""
-"Om kryssad kommer Gajim att skicka keep-alive-paket som förhindrar att "
-"anslutningen överstiger tidsgränsen, vilket leder till frånkoppling"
+msgid "C_onnect on Gajim startup"
+msgstr "A_nslut vid start av Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -335,6 +322,18 @@ msgstr ""
 "detta konto"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Återanslut automatiskt när anslutningen förloras"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Spara konversations_loggar för alla kontakter"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Synk_ronisera kontostatus med global status"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -344,176 +343,205 @@ msgstr ""
 "kombinationsrutan i botten av kontaktlistfönstret) att påverka statusen även "
 "för detta konto"
 
-#: ../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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Om standardporten som används för inkommande meddelanden inte passar din "
-"konfiguration så kan du välja en annan här.\n"
-"Du kan dock överväga att ändra möjliga brandväggsregler."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-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:831
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+msgid "Use file transfer proxies"
+msgstr "Använd proxyservrar för filöverföringar"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Efternamn:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Om kryssad kommer Gajim att sända ut fler IP-adresser än bara ditt IP. Detta "
+"för att öka chanserna att filöverföringar ska fungera som de ska."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Sa_mmanfoga konton"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Allmänt"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Ingen nyckel vald"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_Använd miljövariabeln HTTP__PROXY"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Personlig information"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Hantera..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxyserver</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tet:"
+msgid "_Warn before using an insecure connection"
+msgstr "_Varna innan en osäker anslutning används"
 
 #: ../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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritet används i Jabber för att fastställa vem som får händelser från "
-"jabberservern när två eller flera klienter är anslutna till samma konto: "
-"Klienten med den högsta prioriteten får händelserna"
+"Kryssa för denna så att Gajim frågar dig innan ditt lösenord skickas över en "
+"osäker anslutning."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
+msgid "Send _keep-alive packets"
+msgstr "Skicka _keep-alive-paket"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Byt _namn"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Om kryssad kommer Gajim att skicka keep-alive-paket som förhindrar att "
+"anslutningen överstiger tidsgränsen, vilket leder till frånkoppling"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Resur_s:"
+msgid "Use cust_om hostname/port"
+msgstr "Använd anpassa_t värdnamn/port"
 
 #: ../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 ""
-"Resursen skickas till Jabberservern för att separera samma JID i två eller "
-"flera delar beroende på antalet klienter anslutna till samma server med "
-"samma konto. Så du kan vara ansluten till samma konto med resurserna \"Hem\" "
-"och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
-"(se nedan)"
+msgid "_Hostname: "
+msgstr "_Värdnamn: "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Spara konversations_loggar för alla kontakter"
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diverse</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Skicka _keep-alive-paket"
+msgid "Connection"
+msgstr "Anslutning"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synk_ronisera kontostatus med global status"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Ingen nyckel vald"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synk_ronisera kontostatus med global status"
+msgid "Choose _Key..."
+msgstr "Välj nyc_kel..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Synkronisera kontakter"
+msgid "Use G_PG Agent"
+msgstr "Använd G_PG-agent"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
+"Om kryssad kommer Gajim att få lösenordet från en GPG-agent, t.ex. Seahorse"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Använd G_PG-agent"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Använd anpassa_t värdnamn/port"
+msgid "_Edit Personal Information..."
+msgstr "R_edigera personlig information..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Använd anpassad p_ort:"
+msgid "Information about you, as stored in the server"
+msgstr "Information om dig, som den är sparad på servern"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Använd proxyservrar för filöverföringar"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Personlig information</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Personlig information"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "R_edigera personlig information..."
+msgid "Co_nnect on Gajim startup"
+msgstr "A_nslut vid start av Gajim"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Aktivera"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Synk_ronisera kontostatus med global status"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Värdnamn: "
+msgid "Use cust_om port:"
+msgstr "Använd anpassad p_ort:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Hantera..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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 ""
+"Om standardporten som används för inkommande meddelanden inte passar din "
+"konfiguration så kan du välja en annan här.\n"
+"Du kan dock överväga att ändra möjliga brandväggsregler."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Förnamn:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Efternamn:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Varna innan en osäker anslutning används"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-post:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_Använd miljövariabeln HTTP__PROXY"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber-ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Sa_mmanfoga konton"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "K_onto:"
+msgid "Add New Contact"
+msgstr "Lägg till ny kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Tillåt _denna kontakt att se min status"
+msgid "A_ccount:"
+msgstr "K_onto:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Lägg till ny kontakt"
+msgid "_Protocol:"
+msgstr "_Protokoll:"
 
-#: ../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 "Jag vill lägga till dig i min kontaktlista."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Användar-id:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Smeknamn:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupp:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Tillåt _denna kontakt att se min status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Prenumeration"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -525,7 +553,11 @@ msgstr ""
 "här protokollet. Klicka på knappen \n"
 "Registrera för att fortsätta."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registrera"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -533,387 +565,189 @@ msgstr ""
 "Du måste vara ansluten till transporten för att kunna\n"
 "lägga till en kontakt från det här protokollet."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupp:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Smeknamn:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokoll:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registrera"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Prenumeration"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Användar-id:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Ett fel har inträffat:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Välj kommando att köra:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Vänta under tiden kommandolistan hämtas..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr ""
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Välj kommando att köra:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Kontrollera en gång till"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Felbeskrivning..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Vänta under tiden kommandot skickar..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "F_ärdigställ"
+msgid "Please wait..."
+msgstr "Vänta..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Vänta under tiden kommandolistan hämtas..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Denna jabber-entitet visar inga kommandon."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Vänta under tiden kommandot skickar..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Ett fel har inträffat:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Vänta..."
+msgid "Error description..."
+msgstr "Felbeskrivning..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Denna jabber-entitet visar inga kommandon."
+#, fuzzy
+msgid "F_inish"
+msgstr "F_ärdigställ"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Avancerad konfigurationsredigerare"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivning</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>OBSERVERA:</b> Du bör starta om Gajim för att vissa inställningar ska bli "
 "aktiva"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Avancerad konfigurationsredigerare"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Återställ till standardfärger"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Ta bort MOTD"
+msgid "Show _XML Console"
+msgstr "Visa _XML-konsoll"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-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
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Redigera _integritetslistor..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administratör"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
+msgid "_Send Server Message..."
+msgstr "_Skicka servermeddelande..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 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:6
-msgid "Set MOTD..."
-msgstr "Ange MOTD..."
-
 #: ../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:8
-msgid "Show _XML Console"
-msgstr "Visa _XML-konsoll"
+msgid "Set MOTD..."
+msgstr "Ange MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Uppdatera MOTD..."
-
-#: ../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
+msgid "Update MOTD..."
+msgstr "Uppdatera MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administratör"
+msgid "Delete MOTD"
+msgstr "Ta bort MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Skicka servermeddelande..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " ett fönster/flik öppnad med den kontakten "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Åtgärder</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Villkor</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Ljud</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Avancerade åtgärder"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Avancerad notifieringskontroll"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Alla statusar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Frånvarande"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Upptagen "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakten ändrade status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt loggade ut"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Har inte "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Filöverföringar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Förfrågan om Filöverföring"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Filöverföring Stoppad"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Meddelande markerat i gruppchatt"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Meddelande mottaget i gruppchatt"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Har "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Osynlig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Kör ett kommando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Inte tillgänglig"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "En eller flera speciella statusar..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Ansluten / Ledig för chatt"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Spela upp ett ljud"
+msgid "Deletes Message of the Day"
+msgstr "Tar bort dagens meddelande"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "Receive a Message"
-msgstr "Skicka Privat Meddelande"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "När "
+msgid "No"
+msgstr "Ingen"
 
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
 msgstr ""
-"_Aktivera fönsterhanterarens UrgencyHint för att chattfönster ska blinka i "
-"verktygsraden"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Inaktivera automatiskt öppning av chattfönster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Inaktivera befintligt popupfönster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Inaktivera befintligt ljud för denna händelse"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, 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 roster"
-msgstr "_Inaktivera visning av händelser i kontaktlista"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informera mig med ett popupfönster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Öppna chattfönster med användare"
 
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, 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 roster"
-msgstr "_Visa händelse i kontaktlista"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "och jag "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "contact(s)"
-msgstr "Kontakter"
+msgid "Prefer"
+msgstr "Inställningar"
 
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "för "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupper"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "när jag är i"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
+msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:2
+#: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Local</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:4
+#: ../data/gui/archiving_preferences_window.ui.h:9
 #, fuzzy
 msgid "Auto"
 msgstr "Anslut automatiskt"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+#: ../data/gui/atom_entry_window.ui.h:1
+msgid "New entry received"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
 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"
+#: ../data/gui/atom_entry_window.ui.h:3
+msgid "Feed name:"
 msgstr ""
 
-#: ../data/gui/atom_entry_window.ui.h:1
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "Entry:"
 msgstr ""
 
-#: ../data/gui/atom_entry_window.ui.h:2
-msgid "Feed name:"
-msgstr ""
-
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Senast ändrad:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr ""
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
 msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
@@ -921,208 +755,185 @@ msgid "Blocked Contacts"
 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:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "A_vblockera"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Meddelande:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Ställ in aktivitet"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Ställ in en aktivitet"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Meddelande:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Meddelande:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humör:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Meddelande:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Byt lösenord"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Ange det igen för att bekräfta:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Ange nytt lösenord:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Ange det igen för att bekräfta:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Ange ditt nya statusmeddelande</b>"
+msgid "Save as Preset..."
+msgstr "Spara som förval..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivitet:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Humör:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivitet:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Förvalda meddelanden:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Spara som förval..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Ange ditt nya statusmeddelande</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Gå in i _gruppchatt"
+msgid "_Copy Link Location"
+msgstr "_Kopiera länkplats"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Lägg till i kontaktlista..."
+msgid "_Open Link in Browser"
+msgstr "_Öppna länk i webbläsare"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiera JID/e-postadress"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiera länkplats"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Skriv e-post"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Öppna länk i webbläsare"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Gå in i _gruppchatt"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Lägg till i kontaktlista..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Visa en lista över känsloikoner (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Lägg till denna kontakt till kontaktlistan (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Bläddra i chatthistoriken (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Visa en meny över avancerade funktioner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Skicka meddelande"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Skicka"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../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"
+msgid "*"
 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:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Bjud _in"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Bjud in vänner!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC-server"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Välj en MUC-server."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1130,120 +941,137 @@ msgstr ""
 "Du är på väg att påbörja en fleranvändarchatt.\n"
 "Välj kontakterna som du vill bjuda in"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Be om att få se hans/hennes status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Välj en MUC-server."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Lägg till speciell _notifiering..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "MUC-server"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Tilldela Open_PGP-nyckel..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Bjud _in"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Kör kommando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Starta _chatt"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Redigera _grupper..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Skicka ett _meddelande"
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Skicka _fil..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Bjud in _kontakter"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Ta _bort"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Växla Open_PGP-kryptering"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Växla användarkryptering"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Skicka a_npassad status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Kör kommando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Skicka ett _meddelande"
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Hantera kontakt"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Skicka _fil..."
+msgid "_Rename..."
+msgstr "Byt _namn..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Ställ in anpassad _avatar..."
+msgid "Edit _Groups..."
+msgstr "Redigera _grupper..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Starta _chatt"
+msgid "Assign Open_PGP Key..."
+msgstr "Tilldela Open_PGP-nyckel..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Växla användarkryptering"
+msgid "Set Custom _Avatar..."
+msgstr "Ställ in anpassad _avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Växla Open_PGP-kryptering"
+msgid "Add Special _Notification..."
+msgstr "Lägg till speciell _notifiering..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Prenumeration"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Tillåt henne/honom att se min status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Tillåt _denna kontakt att se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../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"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "_Be om att få se hans/hennes status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historik"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignorera"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blockera"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Hantera kontakt"
+msgid "_Unignore"
+msgstr "A_vignorera"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "Byt _namn..."
+msgid "_Ignore"
+msgstr "_Ignorera"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Prenumeration"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "Ta _bort"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "A_vignorera"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Historik"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Fyll i formuläret."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Rumkonfiguration"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Fyll i formuläret."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Redigera grupper"
@@ -1256,56 +1084,47 @@ msgstr "(<b>ESession</b>-info)"
 msgid "_Verify"
 msgstr "_Verifiera"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Funktioner"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Lista över möjliga funktioner i Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Funktioner"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "En lista över aktiva, färdigställda och stoppade filöverföringar"
+msgid "File Transfers"
+msgstr "Filöverföringar"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Avbryt filöverföring"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Visar en lista med filöverföringar mellan dig och andra"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Avbryter den markerade filöverföringen"
+msgid "file transfers list"
+msgstr "filöverföringslista"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Avbryter den markerade filöverföringen och tar bort den ofullständiga filen"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "En lista över aktiva, färdigställda och stoppade filöverföringar"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Rensa _upp"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Meddela mig när en filöverföring är färdig"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Filöverföringar"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "När en filöverföring är färdig så visa en popupnotifiering"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Döljer fönstret"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Tar bort färdiga, avbrutna och misslyckade filöverföringar från listan"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Ta bort filöverföring från listan."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Tar bort färdiga, avbrutna och misslyckade filöverföringar från listan"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Visar en lista med filöverföringar mellan dig och andra"
-
-#: ../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"
@@ -1313,42 +1132,55 @@ msgstr ""
 "Denna åtgärd tar bort en filöverföring från listan. Om överföringen är aktiv "
 "så stoppas den först och tas sedan bort"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Rensa _upp"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Paus"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "När en filöverföring är färdig så visa en popupnotifiering"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr ""
+"Avbryter den markerade filöverföringen och tar bort den ofullständiga filen"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Fortsätt"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Avbryt filöverföring"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Meddela mig när en filöverföring är färdig"
+msgid "Cancels the selected file transfer"
+msgstr "Avbryter den markerade filöverföringen"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Öppna mapp"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Döljer fönstret"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Paus"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Fortsätt"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "filöverföringslista"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Öppna mapp"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Flikfärger för chattstatus</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Fet"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupp"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 #, fuzzy
@@ -1356,40 +1188,54 @@ msgid "Chat Banner"
 msgstr "Banderoll:"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Skriver"
+msgid "Gajim Themes Customization"
+msgstr "Gajims temaanpassare"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "Text_färg:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Typsnittsstil:"
+msgid "_Background:"
+msgstr "_Bakgrund:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajims temaanpassare"
+msgid "Text _font:"
+msgstr "Text_typsnitt:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Borta"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupp"
+msgid "Font style:"
+msgstr "Typsnittsstil:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Inaktiv"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Fet"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kursiv"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pausad"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Skriver"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Inaktiv"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Flikfärger för chattstatus</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Borta"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1397,7 +1243,7 @@ msgstr ""
 "MUC-\n"
 "meddelanden"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1405,106 +1251,99 @@ msgstr ""
 "MUC-dirigerade\n"
 "meddelanden"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pausad"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Text_färg:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Text_typsnitt:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Bakgrund:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Byt smek_namn..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Hantera rum"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Byt _ämne..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Konfigurera _rum..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Bokmärk"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Förstör %s"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Hantera rum"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimera vid stängning"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Röst"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Bokmärk"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "_Send Private Message"
+msgstr "_Skicka privat meddelande"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr ""
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Skicka _fil"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr ""
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Lägg till i kontaktlista"
+msgid "_Voice"
+msgstr "_Röst"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Medlem"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Bannlys"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Ägare"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "Sparka _ut"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Medlem"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Ägare"
+msgid "_Ban"
+msgstr "_Bannlys"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Skicka privat meddelande"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Röst"
+msgid "_Add to Roster"
+msgstr "_Lägg till i kontaktlista"
 
-#: ../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:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Visa en lista över formateringar"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Ändra ditt smeknamn (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bokmärk detta rum (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1516,39 +1355,19 @@ msgid "From:"
 msgstr "Från:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Ämne:"
 
 #: ../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."
-msgstr ""
-"<b>VARNING:</b>\n"
-"Se till att Gajim inte är startat om du planerar att radera mycket. Undvik i "
-"regel att radera för kontakter du just nu chattar med."
+msgid "Gajim History Logs Manager"
+msgstr "Gajims hanterare för historikloggar"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Exportera"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajims hanterare för historikloggar"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1562,172 +1381,198 @@ msgstr ""
 "Använd detta program för att ta bort eller exportera loggar. Du kan välja "
 "loggar från vänstra sidan och/eller sökdatabasen nedan."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>VARNING:</b>\n"
+"Se till att Gajim inte är startat om du planerar att radera mycket. Undvik i "
+"regel att radera för kontakter du just nu chattar med."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Sök i databasen"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Gamla berättelser"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Konversationshistorik"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Exportera"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Kontaktnamn"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Gruppchattar"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Gamla berättelser"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Konversationshistorik"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Sök:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Logga statusändringar för kontakter"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Het"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "JID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 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:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Het"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 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:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Gå in detta rum automatiskt när jag ansluter"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Rum:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Senaste:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Senaste:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Gå in detta rum automatiskt när jag ansluter"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Rum:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bokmärk detta rum (Ctrl+B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Bokmärk detta rum (Ctrl+B)"
+msgid "Bro_wse Rooms"
+msgstr "_Bläddra"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Gå in i"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Anslut automatiskt"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Om kryssad kommer Gajim att gå in i den här gruppchatten vid uppstart"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Hantera bokmärken"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimera när du gått in automatiskt"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Titel:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Skriv ut status:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Anslut automatiskt"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Om kryssad kommer Gajim att gå in i den här gruppchatten vid uppstart"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titel:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimera när du gått in automatiskt"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1738,100 +1583,103 @@ msgid "_Configure"
 msgstr "_Konfigurera"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Egenskaper</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Inställningar</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Typ:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Lösen_ord:"
+msgid "_Name:"
+msgstr "_Namn:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxyser_ver:"
+msgid "<b>Properties</b>"
+msgstr "<b>Egenskaper</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxyserverns _port:"
+msgid "Use HTTP prox_y"
+msgstr "Använd HTTP-prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Använd HTTP-prox_y"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Använd autentiser_ing för proxyserver"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Användarnamn:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "Lösen_ord:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Namn:"
+msgid "Proxy _Host:"
+msgstr "Proxyser_ver:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Typ:"
+msgid "Proxy _Port:"
+msgstr "Proxyserverns _port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Användarnamn:"
+msgid "<b>Settings</b>"
+msgstr "<b>Inställningar</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Hantera konton"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Lösenfras"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_ktorisera"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Tillgänglig"
+msgid "Version:"
+msgstr "GTK+ version:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfigurera"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Beskrivning: "
+msgid "Authors:"
+msgstr "Au_ktorisera"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1839,39 +1687,32 @@ msgid "Homepage:"
 msgstr "<b>Webbplats:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Avstannad"
+msgid "Description:"
+msgstr "Beskrivning: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigurera"
 
 #: ../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 ""
+msgid "Installed"
+msgstr "Avstannad"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1885,220 +1726,292 @@ msgid "Event desc"
 msgstr "Händelser"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Avancerad konfigurationsredigerare</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Använd alltid OS/X standardprogram"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Program</b>"
+msgid "Custom"
+msgstr "Anpassad"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Åtgärder</b>"
+msgid "All chat states"
+msgstr "Alla statusar"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Automatisk status</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Skriver"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Chattutseende</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Avstängd"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Radfärger för chatt</b>"
+#, fuzzy
+msgid "Never"
+msgstr "_Aldrig"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notifieringar för chattstatus</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Aldrig\n"
+"Endast vid väntande händelser\n"
+"Alltid"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Villkor</b>"
+msgid "Always"
+msgstr "Frånvarande"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Öppna det"
 
-#. 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>Anpassad</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notifiera mig om det"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Typsnitt</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Visa enbart i _registret"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail-inställningar</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Förvalda statusmeddelanden</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Integritet</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Kontaktlistans utseende</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Senaste status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Statusmeddelanden</b>"
+msgid "Preferences"
+msgstr "Inställningar"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Teman</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Visa a_vatarer för kontakter i kontaktlista"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Mellannamn:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
+"gruppchattar"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visuella notifieringar</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Visa status_meddelanden för kontakter i kontaktlista"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 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:23
-msgid "Advanced"
-msgstr "Avancerat"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Visa _humör för kontakter i kontaktlista"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Avancerat..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
+"gruppchattsfönstren"
 
 #: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Alla statusar"
+msgid "Sort contacts by status"
+msgstr "Sortera kontakter efter status"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Tillåt information om _operativsystem att skickas"
+msgid "in _roster"
+msgstr "i _kontaktlista"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Tillåt information om _operativsystem att skickas"
+msgid "in _group chats"
+msgstr "i _gruppchattar"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Tillåt popup/notifieringar när jag är _frånvarande/inte tillgänglig/upptagen/"
-"osynlig"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Kontaktlistans utseende</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Tillåt ljud när jag är _upptagen"
+msgid "_Window behavior:"
+msgstr "_Fönsterbeteende:"
 
 #: ../data/gui/preferences_window.ui.h:30
 #, fuzzy
-msgid "Always"
-msgstr "Frånvarande"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+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:31
-msgid "Ask status message when I:"
-msgstr "Fråga efter statusmeddelande när jag:"
+msgid "_Emoticons:"
+msgstr "_Känsloikoner:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "_Gör meddelandefönstren kompakta"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Dölj alla knappar i chattfönster"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorera textformatering i inkommande meddelanden"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Chattmeddelande:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Kontrollera vid uppstart om Gajim är _standardklient för Jabber"
+msgid "_Highlight misspelled words"
+msgstr "_Markera felstavade ord"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Skriver"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Konfigurera färger och typsnitt för gränssnittet"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Visa registerfönstret när Gajim startar"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Chattmeddelande:"
+msgid "Show icon when your messages are received"
+msgstr "Ljud att spela upp när ett MUC-meddelande anländer."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Kontaktnamn"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Anpassad"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Chattutseende</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "När ny händelse tas emot:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Notifiera mig om kontakter som loggar _in"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Notifiera mig om kontakter som loggar _ut"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Avstängd"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Tillåt popup/notifieringar när jag är _frånvarande/inte tillgänglig/upptagen/"
+"osynlig"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Visa _aktivitet för kontakter i kontaktlista"
+msgid "Notify on new _GMail email"
+msgstr "Notifiera vid ny _Gmail-e-post"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Visa _extra e-postdetaljer"
+#, fuzzy
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Om kryssad kommer Gajim också inkludera information om vem som skickade den "
+"nya e-posten"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Visa _humör för kontakter i kontaktlista"
+msgid "Display _extra email details"
+msgstr "Visa _extra e-postdetaljer"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Visa _låtar för kontakter i kontaktlista"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Om kryssad kommer Gajim även att inkludera information om avsändaren av den "
+"nya e-posten"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Visa a_vatarer för kontakter i kontaktlista"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail-inställningar</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Visa _humör för kontakter i kontaktlista"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Visa status_meddelanden för kontakter i kontaktlista"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Visuella notifieringar</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Spela _upp ljud"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Ha_ntera..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Tillåt ljud när jag är _upptagen"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Ljud</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Notifieringar"
+
+#: ../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 "
@@ -2108,7 +2021,11 @@ 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:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "Visa _notifieringar för chattstatus:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2118,682 +2035,617 @@ 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: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 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:58
-msgid "Hide all buttons in chat windows"
-msgstr "Dölj alla knappar i chattfönster"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
-"du använder"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Om kryssad kommer Gajim även att inkludera information om avsändaren av den "
-"nya e-posten"
-
-#: ../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:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+msgid "_Send chat state notifications:"
+msgstr "_Skicka notifieringar för chattstatus:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
-"gruppchattar"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notifieringar för chattstatus</b>"
 
 #: ../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 ""
-"Om kryssad kommer Gajim att visa statusmeddelanden för kontakter under "
-"kontaktens namn i kontaktfönster och gruppchattar"
+msgid "Personal Events"
+msgstr "Personliga händelser"
 
 #: ../data/gui/preferences_window.ui.h:65
-#, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
-"gruppchattsfönstren"
+msgid "_Away after:"
+msgstr "_Frånvarande efter:"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr ""
-"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
-"gruppchattsfönstren"
+"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:67
-#, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
-"gruppchattsfönstren"
+msgid "_Not available after:"
+msgstr "_Inte tillgänglig efter:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
-"gruppchattsfönstren"
 
 #: ../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 ""
+msgid "minutes"
+msgstr "minuter"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
-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 ""
-"Kryssa i det här valet enbart om någon du inte har i registret spammar/"
-"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: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:72
-#, fuzzy
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"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 ""
-"Om kryssad kommer Gajim också inkludera information om vem som skickade den "
-"nya e-posten"
 
 #: ../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, "
-"etc...)"
-msgstr ""
-"Om kryssad kommer Gajim att använda protokollspecifika statusikoner (t.ex. "
-"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: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:75
-#, fuzzy
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"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 ""
-"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:76
-msgid "Log _encrypted chat session"
-msgstr "Logga kr_ypterad chattsession"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatisk status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "_Gör meddelandefönstren kompakta"
+msgid "Ask status message when I:"
+msgstr "Fråga efter statusmeddelande när jag:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Ha_ntera..."
+msgid "Sign _in"
+msgstr "Loggar _in"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "_Aldrig"
+msgid "Sign _out"
+msgstr "Loggar _ut"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Notifieringar"
+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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Notifiera mig om kontakter som loggar _in"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Statusmeddelanden</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Notifiera mig om kontakter som loggar _ut"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Förvalda statusmeddelanden</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notifiera mig om det"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notifiera vid ny _Gmail-e-post"
+msgid "Use system _default"
+msgstr "Använd systemets _standard"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Aldrig\n"
-"Endast vid väntande händelser\n"
-"Alltid"
+msgid "Chat message:"
+msgstr "Chattmeddelande:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Personliga händelser"
+msgid "<b>Font</b>"
+msgstr "<b>Typsnitt</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Spela _upp ljud"
+msgid "Use _transports icons"
+msgstr "Använd _transporternas ikoner"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Öppna det"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Om kryssad kommer Gajim att använda protokollspecifika statusikoner (t.ex. "
+"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:89
-msgid "Preferences"
-msgstr "Inställningar"
+msgid "Status _iconset:"
+msgstr "Status_ikoner:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Konfigurera färger och typsnitt för gränssnittet"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Teman</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
+msgid "Contact's nickname:"
+msgstr "Kontaktnamn"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Visa enbart i _registret"
+msgid "Your nickname:"
+msgstr "För_e smeknamn:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Loggar _in"
+msgid "_Status message:"
+msgstr "_Statusmeddelande:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Loggar _ut"
+msgid "_URL highlight:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Återställ till standardfärger"
 
 #: ../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 ""
-"Vissa meddelanden kan innehålla textformatering (formatering, färger etc). "
-"Om kryssad kommer Gajim att endast visa rå meddelandetext."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Chattmeddelande:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sortera kontakter efter status"
+#, fuzzy
+msgid "Your message:"
+msgstr "Felmeddelande: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Meddelande markerat i gruppchatt"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Status_ikoner:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Radfärger för chatt</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Åtgärder</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Använd _transporternas ikoner"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Använd alltid OS/X standardprogram"
+msgid "<b>Video</b>"
+msgstr "<b>Mellannamn:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Använd systemets _standard"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Villkor</b>"
 
-#: ../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:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Felmeddelande: %s"
+msgid "_File manager:"
+msgstr "_Filhanterare:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "För_e smeknamn:"
+msgid "_Mail client:"
+msgstr "_E-postklient:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Frånvarande efter:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "Visa _notifieringar för chattstatus:"
+msgid "<b>Custom</b>"
+msgstr "<b>Anpassad</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Känsloikoner:"
+msgid "<b>Applications</b>"
+msgstr "<b>Program</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Filhanterare:"
+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:125
-msgid "_Highlight misspelled words"
-msgstr "_Markera felstavade ord"
+#, fuzzy
+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 ""
+"Kryssa i det här valet enbart om någon du inte har i registret spammar/"
+"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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorera händelser från kontakter som inte finns i kontaktlistan"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Tillåt information om _operativsystem att skickas"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorera textformatering i inkommande meddelanden"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Logga statusändringar för kontakter"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Tillåt information om _operativsystem att skickas"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_E-postklient:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Inte tillgänglig efter:"
+msgid "Log _encrypted chat session"
+msgstr "Logga kr_ypterad chattsession"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Öppna..."
+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:132
-msgid "_Reset to Default Colors"
-msgstr "_Återställ till standardfärger"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Tillåt information om _operativsystem att skickas"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "_Skicka notifieringar för chattstatus:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Statusmeddelande:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+msgid "<b>Privacy</b>"
+msgstr "<b>Integritet</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Fönsterbeteende:"
+msgid "_Log status changes of contacts"
+msgstr "_Logga statusändringar för kontakter"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "i _gruppchattar"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "i _kontaktlista"
+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:139
-msgid "minutes"
-msgstr "minuter"
+msgid "_Open..."
+msgstr "_Öppna..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Avancerad konfigurationsredigerare</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Avancerat"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Integritetslistor:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Lägg till / redigera en regel</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Integritetslista"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista över regler</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Integritetslistor</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktiv för denna session"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktiv vid varje uppstart"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista över regler</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Alla"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Lägg till / redigera en regel</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "alla efter prenumeration"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Tillåt"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Neka"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "alla i gruppen"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ordning:"
+msgid "all by subscription"
+msgstr "alla efter prenumeration"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Integritetslista"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Alla"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "alla efter prenumeration"
+msgid "to send me messages"
+msgstr "att skicka mig meddelanden"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "alla i gruppen"
+msgid "to send me queries"
+msgstr "att skicka mig frågor"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Båda"
+msgid "to view my status"
+msgstr "att se min status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Från"
+msgid "to send me status"
+msgstr "att skicka mig status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
 #, fuzzy
-msgid "none"
-msgstr "ett"
+msgid "All (including subscription)"
+msgstr "alla efter prenumeration"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "två"
+msgid "Order:"
+msgstr "Ordning:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "att skicka mig meddelanden"
+#, fuzzy
+msgid "none"
+msgstr "ett"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "att skicka mig frågor"
+#, fuzzy
+msgid "both"
+msgstr "Båda"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "att skicka mig status"
+#, fuzzy
+msgid "from"
+msgstr "Från"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "att se min status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adress</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "två"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Födelsedag:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Stad:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Efternamn:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Företag:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Land:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Mellannamn:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Avdelning:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-post:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Titel:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Extra adress:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Tilltalsnamn:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Efternamn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suffix:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Fullständigt namn</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Gatuadress:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Tilltalsnamn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Stad:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Webbplats:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Län:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Extra adress:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Mellannamn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Postnummer:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Namn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Land:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Smeknamn:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adress</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefonnr.:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Webbplats:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Position:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Namn:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Postnummer:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Smeknamn:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefonnr.:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Titel:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: ÅÅÅÅ-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Roll:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Födelsedag:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Län:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-post:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Gatuadress:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Klicka för att ange din avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Suffix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Personlig info"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Företag:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Om"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Position:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Klicka för att ange din avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Avdelning:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: ÅÅÅÅ-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Roll:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Personlig info"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Jobb"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Vad vill du göra?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Om"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Ta bort kontot _endast från Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Ta bort kontot från Gajim och från _servern"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Vad vill du göra?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "Ta _bort"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr ""
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2801,115 +2653,112 @@ msgstr ""
 "<b>någon@någonstans.se</b> vill att du ska <b>lägga till</b> några kontakter "
 "till din kontaktlista."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Lägg till _kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "Fun_ktioner"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Åtgärder"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Fil_överföringar"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "Lägg till _kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Frågor och svar (webb)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "R_edigera"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Hjälp på nätet"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "K_onton"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, a_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 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:13
+msgid "_View"
+msgstr "_Visa"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Visa frånkopplade _kontakter"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Visa endast _aktiva kontakter"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Visa _transporter"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Visa frånkopplade _kontakter"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Visa _kontaktlista"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "K_onton"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Fil_överföringar"
 
-#. 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 "_Åtgärder"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Hjälp"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "R_edigera"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Hjälp på nätet"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_Frågor och svar"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Skicka ett _meddelande..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Frågor och svar (webb)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Visa"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Vänta under tiden sökformuläret hämtas..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fun_ktioner"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Sök"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Vänta under tiden sökformuläret hämtas..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Lägg till kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Sök"
 
@@ -2929,41 +2778,37 @@ msgstr "Registrera hos"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Svara på detta meddelande"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Till:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Skick_a"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Skicka meddelande"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Skicka meddelande och stäng fönster"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Svara"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Till:"
+msgid "Reply to this message"
+msgstr "Svara på detta meddelande"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Svara"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Skicka och stäng"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Skicka meddelande och stäng fönster"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_ktorisera"
+msgid "Subscription Request"
+msgstr "Prenumerationsbegäran"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Auktorisera kontakt så att han eller hon vet när du är ansluten"
+msgid "_Deny"
+msgstr "_Neka"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2973,263 +2818,275 @@ msgstr ""
 "Neka auktorisering från kontakt så att han eller hon inte vet när du är "
 "ansluten"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Prenumerationsbegäran"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_ktorisera"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Neka"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Auktorisera kontakt så att han eller hon vet när du är ansluten"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Synkronisera kontakter"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Välj kontot med vilket du vill synkronisera"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Välj kontakterna som du vill synkronisera"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synkronisera : välj kontakter"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Inga ljud"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Skicka ett _meddelande"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Visa alla väntande _händelser"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Välj kontakterna som du vill synkronisera"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Gruppchatt"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Fråga:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Skicka ett _meddelande"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klient:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Visa alla väntande _händelser"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Län:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Inga ljud"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontaktinformation"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber-ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Prenumeration:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klient:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Kommentarer"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Län:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Konfigurerad avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Prenumeration:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kontaktinformation"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Fråga:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Mer"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Användaravatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Typsnitt</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Kommentarer"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabbertrafik</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML-inmatning</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Fråga (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Typsnitt</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Fråga (Info/Query)"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Närvaro"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Närvaro"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML-inmatning</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Redigera konto..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokal JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+-baserad Jabber-klient"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Personlig"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Snabbmeddelandeklienten Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber-snabbmeddelandeklient"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+-baserad Jabber-klient"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Avbryt bekräftelse"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 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:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Ogiltigt rum"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, 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
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:421
+#, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr ""
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Tjänsten returnerade ett fel."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktiverad"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Inaktiverad"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolesk"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Färg"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Inställningens namn"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Värde"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Dold"
 
@@ -3240,242 +3097,185 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] ""
 msgstr[1] ""
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "engelska"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "vitryska"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "bulgariska"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "bretonska"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "tjeckiska"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "tyska"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "grekiska"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "brittiska"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "spanska"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "baskiska"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "franska"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "kroatiska"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "italienska"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "norska (bokmål)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "nederländska"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "norska (nynorsk)"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "polska"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "portugisiska"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "brasiliansk portugisiska"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "ryska"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "serbiska"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "slovakiska"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "svenska"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "kinesiska"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Stavningsspråk"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Fel."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "En anslutning är inte tillgänglig"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 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:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Understruken"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Genomstruken"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Ingen formatering"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Verkligen skicka filen?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, 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:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG-kryptering aktiverad"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Denna kontakt har inte stöd för filöverföringar."
+
 #. 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: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
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Inte i kontaktlista"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Funktionen är inte tillgänglig under Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Skicka fil"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Denna kontakt har inte stöd för filöverföringar."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, 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:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
 "meddelanden med GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG-kryptering inaktiverad"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sessionen KOMMER att loggas"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sessionen KOMMER INTE att loggas"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "är"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "är INTE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "kommer"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "kommer INTE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "och autentiserad"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 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:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3484,32 +3284,32 @@ msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Sessionsförhandlingen avbröts"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sessionen KOMMER INTE att loggas"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Denna session är krypterad"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " och KOMMER att loggas"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " och KOMMER INTE att loggas"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3517,25 +3317,25 @@ msgstr ""
 "Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
 "mer information."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E-kryptering inaktiverad"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Följande meddelande var INTE krypterat"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 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:2566
+#: ../src/chat_control.py:2797
 #, 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:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3543,13 +3343,14 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: ../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
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3558,232 +3359,592 @@ 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:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Kunde inte dekryptera meddelande från %s\n"
+"Det kan ha manipulerats."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s är nu %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Filöverföringar"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Storlek: "
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "Acceptera"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Filöverföring färdig"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Inbjudan till Gruppchatt"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Fjärrkontakten stoppade överföringen"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Fel vid öppnande av filen"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Filöverföringen stoppad"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Filöverföringen avbruten"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Anslutning med motpart kan inte etableras."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Användning: /%s, döljer chattknapparna."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Användning: /%s, skickar meddelandet till kontakten"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s kunde inte hittas"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Frånvarande"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Tillgänglig"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Användning: /%s, tömmer textfönstret."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Växla Open_PGP-kryptering"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Användning: /%s, skickar en ping till kontakten"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Kommandot stöds inte för zeroconf-konto."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Klicka för att visa tidigare konversationer med den här kontakten"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s är inte en giltig loggnivå"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Sessionsbus inte tillgänglig"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Sessionsbus inte tillgänglig"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Ändra ditt smeknamn (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Ogiltigt smeknamn"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Användning: /%s <smeknamn>, öppnar ett privat chattfönster med den angivna "
+"deltagaren."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+msgid "Nickname not found"
+msgstr "Smeknamnet hittades inte"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Användning: /%s <smeknamn>, öppnar ett privat chattfönster med den angivna "
+"deltagaren."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Fråga innan gruppchattflik eller -fönster stängs."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Skicka %s till %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Du är inbjuden till en gruppchatt"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Ogiltig server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Anknytning: "
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Användning: /%s, visa namnen för gruppchattens deltagare."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Saknar argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "skapar loggdatabas"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "skapar loggdatabas"
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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: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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, 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:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Ändra statusinformation"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Ändra status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Ställ in närvarotypen och en beskrivning"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Ansluten"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Stör inte"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Frånkopplad - koppla från"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Beskrivning av närvaro:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Statusen har ändrats."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Lämna gruppchattar"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s på %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Du har inte gått in i en gruppchatt."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 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:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Gruppchattar"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Du lämnade följande gruppchattar:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Vidarebefordra olästa meddelanden"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Alla olästa meddelanden har vidarebefordrats."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Vidarebefordra olästa meddelanden"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Spela upp ljud när användaren är upptagen"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Använd D-Bus och Notification-Daemon för att visa meddelanden"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Visa endast kontakter som är anslutna och lediga för chatt i kontaktlistan."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minuter efter vilken din status ändras till frånvarande."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Frånvarande på grund av overksam i mer än $T min)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minuter efter vilken din status ändras till inte tillgänglig."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Inte tillgänglig på grund av overksam i mer än $T min)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "text för statusmeddelande"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Visa händelse i kontaktlista"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Visa händelse i kontaktlista"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Chattstatusmeddelanden:"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Förfrågan om Filöverföring"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Filöverföringen avbruten"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "När en filöverföring är färdig så visa en popupnotifiering"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Inbjudan till Gruppchatt"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Byter Smeknamn"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "text för statusmeddelande"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 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:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Språk som används för stavningskontroll"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3793,32 +3954,32 @@ msgstr ""
 "\"ibland\" - skriv ut tid var print_ichat_every_foo_minutes minut.\n"
 "\"aldrig\" - skriv aldrig ut tid."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandla par av * / _ som möjliga formateringstecken."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Om sant så tas inte */_ bort. Så *abc* blir i fet stil men * * / / _ _ tas "
 "inte bort."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3826,7 +3987,7 @@ msgstr ""
 "Tecken att lägga till efter smeknamnet när smeknamnskomplettering används "
 "(tabb) i gruppchatt."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3834,7 +3995,13 @@ msgstr ""
 "Tecken att föreslå för att läggas till efter önskat smeknamn när önskat "
 "smeknamn används av någon annan i gruppchatten."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3845,52 +4012,62 @@ msgstr ""
 "\". Läs python-manualen för strftime för fullständig dokumentation: http://"
 "docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tecken som skrivs ut före smeknamnet i konversationer"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Lägg till * och [n] i kontaktlistans titel?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Hur många rader som skall kommas ihåg från tidigare konversation när en "
 "chattflik/chattfönster öppnas igen."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hur många minuter skall de sista raderna från tidigare konversation finnas "
 "kvar."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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 ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3898,11 +4075,11 @@ msgstr ""
 "Skicka meddelande med Ctrl+Enter och gör radbrytning med Enter (ICQ-klienten "
 "Mirabilis standardbeteende)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3911,11 +4088,11 @@ msgstr ""
 "Antingen en anpassad url med %s, där %s är ordet/frasen eller \"WIKTIONARY\" "
 "vilket betyder att wiktionary skall användas."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Om kryssad så kan Gajim fjärrstyras med gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 #, fuzzy
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
@@ -3927,52 +4104,52 @@ msgstr ""
 "för konton (om de nu inte har listen_to_network_manager satt till False och "
 "dem synkar med global status) baserat på om nätverkets status."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3981,29 +4158,35 @@ msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-standarden säger: KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifiera om händelser in systemets statusikon."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Visa stängningsknapp i flik?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -4011,18 +4194,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Chattstatusmeddelanden:"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4031,13 +4214,13 @@ msgstr ""
 "Om sant så avslutas Gajim när fönsterhanterarens X-knapp klickas. Denna "
 "inställning behandlas endast när aktivitetsfältsikonen används."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4045,7 +4228,7 @@ msgstr ""
 "Om sant kommer Gajim att visa en ikon på varje flik som innehåller olästa "
 "meddelanden. Beroende på temat så kan denna ikon vara animerad."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -4054,11 +4237,11 @@ msgstr ""
 "Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
 "kontakt under dess namn i registerfönstret"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -4067,7 +4250,7 @@ msgstr ""
 "avatar senaste gången, eller som har en mellanlagrad avatar som är för "
 "gammal."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4076,37 +4259,41 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrundsfärg på kontakter när de precis loggat in."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrundsfärg på kontakter när de precis loggat ut."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Visa inte avatar för själva transporten."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Visa inte kontaktlista i systemets fönsterlista."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -4116,7 +4303,7 @@ msgstr ""
 "fönstret att blinka (standardbeteendet i de flesta fönsterhanterare) när det "
 "finns väntande händelser."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -4128,7 +4315,7 @@ msgstr ""
 "SHA-info i gruppchattnärvaroinformation"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4137,7 +4324,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrollerar fönstret där nya meddelanden placeras.\n"
@@ -4148,33 +4335,41 @@ msgstr ""
 "visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
 "inställning skall börja gälla."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Om True kommer escape att stänga en tabb eller ett fönster"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Döljer knapparna i chattfönster."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Döljer bannern i chattfönster för två personer"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Döljer deltagarlistan i gruppchattfönster."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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."
@@ -4182,16 +4377,16 @@ msgstr ""
 "Visa endast smeknamnet, i en chatt, vid början av en rad om det inte är "
 "samma person som pratar som i förra meddelandet."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4199,230 +4394,258 @@ msgid ""
 msgstr ""
 "Lista på färger som kommer användas för att färga smeknamnet i gruppchattar.<"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl+Tabb går till nästa skrivflik när ingen är oläst."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 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
+#: ../src/common/config.py:287
 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
+#: ../src/common/config.py:288
 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
+#: ../src/common/config.py:289
 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
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktivera ESessions-kryptering för detta konto."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Ska Gajim automatiskt starta en krypterad session när det är möjligt?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Visa en varningsdialog innan standard-SSL-biblioteket används."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Temporär lösning för Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4430,34 +4653,85 @@ msgstr ""
 "Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
 "alternativet file_transfer_proxies för filöverföringar."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s vill skicka en fil till dig."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 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:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonym autentisering"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_ym autentisering"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Är OpenPGP aktiverat för denna kontakt?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4465,108 +4739,106 @@ msgstr ""
 "Ska Gajim automatiskt starta en krypterad session med denna kontakt om "
 "möjligt?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 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:447
-msgid "all or space separated status"
-msgstr "alla eller mellanslagsseparerad status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "\"yes\", \"no\" eller \"both\""
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../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:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (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
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, lämna ett meddelande."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4575,27 +4847,187 @@ 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:499
+#: ../src/common/config.py:527
 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:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Till"
+
+#: ../src/common/connection_handlers_events.py:370
+#, 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 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"
+
+#: ../src/common/connection_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "avprenumerationsförfrågan från %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, 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)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Auktorisering har tagits bort"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Du kan gå in i detta rum istället: %s"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Ogiltigt Jabber-ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "fel vid sändning av %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Okänt SSL-fel: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nytt Enstaka Meddelande"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nytt meddelande från %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Skicka Privat Meddelande"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nytt privat meddelande från gruppchatten %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Skickat av %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nytt Meddelande"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nytt meddelande från %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s ändrade status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s är nu %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakten ändrade status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s loggade in"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakten loggade in"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s loggade ut"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt Loggade Ut"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Kunde inte läsa in idle-modul"
@@ -4605,20 +5037,20 @@ msgstr "Kunde inte läsa in idle-modul"
 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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registreringen lyckades"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s lyckades"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4626,194 +5058,169 @@ msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: "
 "%(error_msg)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
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Osynlighet stöds inte"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Kontot %s saknar stöd för osynlighet."
 
-#: ../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: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 ""
-"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:1956
+msgid "I would like to add you to my roster."
+msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Kunde inte få tag på utfärdarens certifikat"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Kunde inte få tag på certifikatspärrlista"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kunde inte dekryptera certifikatets signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kunde inte dekryptera spärrlistans signatur"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Kunde inte avkoda utfärdarens publika nyckel"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Fel i certifikatsignatur"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Fel i spärrlistans signatur"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet är ännu inte giltigt"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "Spärrlistan har gått ut"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfel i certifikatets notBefore-fält"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfel i certifikatets notAfter-fält"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfel i spärrlistans lastUpdate-fält"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfel i spärrlistans nextUpdate-fält"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Självsignerat certifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Självsignerat certifikat i certifikatkedja"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "Kunde inte verifiera det första certifikatet"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Certifikatkedjan är för lång"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Certifikatet spärrat"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Ogiltigt CA-certifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Certifikatet är inte pålitligt"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Certifikatet nekades"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4822,78 +5229,79 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Återanslut manuellt."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, 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:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Okänt SSL-fel: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, 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: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\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Kunde inte ansluta till \"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din anslutning eller försök igen senare."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarade: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunde inte ansluta till kontot %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, 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:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4902,7 +5310,7 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4911,95 +5319,104 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: ../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:1420
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunde inte ansluta till \"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, 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:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Skickade kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Bjud in _kontakter"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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: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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Inte i kontaktlista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python-bindningar saknas på den här datorn"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus-egenskaper kan inte användas"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus finns inte på den här maskinen eller så saknas pythonmodulen"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus finns inte på den här maskinen eller så saknas pythonmodulen"
@@ -5013,7 +5430,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Tjänsten ej tillgänglig: Gajim körs inte, eller så är remote_control False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finns inte på den här maskinen eller så saknas pythonmodulen"
 
@@ -5194,268 +5611,295 @@ msgstr "Slutet av veckan"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Inte tillgänglig"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pausad"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pausad"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "Fr_ånvarande"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Osynlig"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Från"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Båda"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Ägare"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administratör"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 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:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d meddelande väntar"
 msgstr[1] "%d meddelanden väntar"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " från rummet %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " från användaren %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " från %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d väntande händelse"
 msgstr[1] "%d väntande händelser"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Tidsgräns översteg vid inläsning av bild"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Bild är för stor"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "Spärrlistan är ännu inte giltig"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Tidsgräns översteg vid inläsning av bild"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rumkonfiguration"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5467,111 +5911,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Felmeddelande: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Fel vid körning av \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s är inte en giltig loggnivå"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Standardmeddelande"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Storlek: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Fil: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "green"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "fel: kan inte öppna %s för läsning"
+msgid "Error: cannot open %s for reading"
+msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
@@ -6211,19 +6669,115 @@ msgstr "Studerar"
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "standard"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Gömmer sig"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Land:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Konto"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Beskrivning"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Fel."
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "ett"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "rum"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "URI"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Okänd artist"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Okänd titel"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Okänd källa"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6232,21 +6786,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> av <i>%(artist)s</i>\n"
 "från <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Kunde inte binda till port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6254,11 +6795,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:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahifel"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6267,44 +6808,43 @@ msgstr ""
 "%s\n"
 "Link-local-meddelanden kanske inte fungerar korrekt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Kunde inte starta lokal tjänst"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Kunde inte binda till port %d."
 
-#: ../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
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontrollera om avahi-daemon körs."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, 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:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Ditt meddelande kunde inte skickas."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 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:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6316,24 +6856,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fel när tjänsten lades till. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Standardmeddelande"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6342,213 +6882,214 @@ msgstr ""
 "Du måste installera %s ordboken för att använda stavningskontroll, eller "
 "välj ett annat språk genom att sätta valet speller_language"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
 #. Name column
-#: ../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
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Återanslut nu?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Om du vill att ändringarna skall ske omedelbart måste du återansluta."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP är inte användbar på den här datorn"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Läs alla väntande händelser innan du tar bort detta konto."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har öppnat chatt i kontot %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 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:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "För att ändra kontonamnet måste du läsa alla väntande händelser."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Byt namn på konto"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Ange ett nytt namn för kontot %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 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:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 #, 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:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 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:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 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:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Din server saknar stöd för Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 #, 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:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 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:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Bannlista"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Ägarlista"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Administratörslista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6556,11 +7097,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6568,11 +7109,11 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6580,11 +7121,11 @@ msgstr ""
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6592,7 +7133,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6608,111 +7149,108 @@ 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:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Vad vill du göra?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ta bort kontot _endast från Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Var säker på att fylla i server- och rumfälten eller ta bort det här "
 "bokmärket."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Ogiltigt smeknamn"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Tecknet tillåts inte"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Ogiltig server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Ogiltigt rum"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Kontot har lagts till"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6722,33 +7260,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:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 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:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Ange en server på vilken du vill registrera."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, 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:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6763,7 +7301,7 @@ msgstr ""
 "SSL-fel: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6774,79 +7312,96 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP-noden togs inte bort"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, 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
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Konfigurera"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Första meddelandet mottaget"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Nästa meddelande blev fokuserat"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Nästa meddelande blev ofokuserat"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Meddelande skickat"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6854,231 +7409,232 @@ msgstr ""
 "Texten under denna linje är vad som har sagts\n"
 "sedan du senast hade fokus på denna gruppchatt"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "A_vsluta"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Igår"
 msgstr[1] "Igår"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Osynlighet stöds inte"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber-ID finns redan i listan"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Ange humör"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Skriv över statusmeddelande?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 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:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Ange ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM-adress:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG-nummer:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ-nummer:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN-adress:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-adress:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, 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:876
+#: ../src/dialogs.py:886
 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:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i kontaktlistan"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Användar-id:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "En GTK+ jabberklient"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "En GTK+-baserad Jabber-klient"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ version:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK version:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Nuvarande utvecklare:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 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:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -7088,7 +7644,7 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7101,104 +7657,158 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Osäker anslutning"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Du är på väg att skicka ditt lösenord över en osäker anslutning. Du bör "
+"installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
+"skicka lösenordet?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "Fråga mig i_nte igen"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, 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:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du är redan i gruppchatten %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 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:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Felaktig uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Det här är ingen gruppchatt"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 #, 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:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, 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:2349 ../src/groupchat_control.py:1848
+#: ../src/dialogs.py:2623
 #, fuzzy
-msgid "The group chat Jabber ID has not allowed characters."
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s är inte namnet på en gruppchatt."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 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:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7207,168 +7817,138 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Ogiltigt JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kunde inte tolka \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 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:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakten loggade in"
-
-#: ../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:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nytt Meddelande"
-
-#. single message
-#: ../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:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Skicka Privat Meddelande"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Inbjudan till Gruppchatt"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakten ändrade status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, 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:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML-konsol"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Ledsen"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Ändra"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "Ta _bort"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7376,189 +7956,185 @@ 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: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:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Ändra"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber-ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, 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:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Lägg till kontakt"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Lägg till kontakt"
+msgstr[1] "_Lägg till kontakt"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Ta bort en kontakt från kontaktlista"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Ta bort en kontakt från kontaktlista"
+msgstr[1] "Ta bort en kontakt från kontaktlista"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Ogiltigt servernamn"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Tjänsten returnerade ett fel."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, 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:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordning: %(order)s, åtgärd: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redigera en regel</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Lägg till en regel</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Ogiltigt listnamn"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 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:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, 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:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Vill du acceptera inbjudan?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Villkor"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "när jag är "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7569,38 +8145,38 @@ msgstr ""
 "\n"
 "Denna sessions Short Authentication String är <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Du har redan verifierat identiteten för denna kontakt."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet är verifierad"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Verifiera igen..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 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:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet är INTE verifierad"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Verifiera..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifierat kontaktens identitet?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7610,77 +8186,121 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
+"Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
+"meddelanden med GPG."
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
+"Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
+"meddelanden med GPG."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "för kontot %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Självsignerat certifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Andra"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 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:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7688,297 +8308,286 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 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:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar i %(address)s med kontot %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 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:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Kör kommando"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Söker av %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Beskrivning"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärket har lagts till"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 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:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Nod"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Validering av SSL-certifikat"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Ett bibliotek som används för att validera servercertifikat för att försäkra "
 "en säker anslutning."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Kräver python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Kräver python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Kräver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Kommandorad"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Ett skript för att styra Gajim via kommandraden."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Kräver 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Funktionen är inte tillgänglig under Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP-meddelandekryptering"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Krypterar chattmeddelanden med gpg-nycklar."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Kräver gpg och python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Automatisk detektering av nätverksstatus."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Kräver gnome-network-manager och python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Sessionshantering"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim-sessionen lagras vid utloggning och återskapas vid inloggning."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Kräver python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Lösenordskryptering"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lösenord kan lagras säkert och inte bara i klartext."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Kräver gnome-keyring och python-gnome2-desktop, eller kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Möjlighet att ansluta till servrar som använder SRV-poster."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Kräver dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Kräver nslookup för att använda SRV-poster."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Stavningskontroll"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Stavningskontrollerar meddelanden."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Kräver libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Kräver libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Notifiering"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 "Kräver python-notify eller python-dbus i kombination med notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatisk status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Kräver libxss-biblioteket."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Kräver python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Transformera LaTeX-uttryck mellan $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"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 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."
-
-#: ../src/features_window.py:97
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "OpenPGP-kryptering"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Krypterar chattmeddelanden."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Kräver python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST-generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7986,140 +8595,137 @@ msgstr ""
 "Generera XHTML-utdata från RST-kod (se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Kräver python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Kräver python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Kräver python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Kräver python-dbus."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Tillgänglig"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Funktion"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Förlopp"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sparad i: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Filöverföring färdig"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Filöverföringen avbruten"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Anslutning med motpart kan inte etableras."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottagare: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Felmeddelande: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Filöverföringen stoppad"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Välj fil att skicka..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Beskrivning: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Denna fil används av en annan process."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Fil: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Typ: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Beskrivning: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-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:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, 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:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8127,33 +8733,64 @@ 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:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:918
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 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."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Spara fil som..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Fil: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Typ: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Beskrivning: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s vill skicka en fil till dig:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Skickar profil..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Fel i Filöverföring"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8161,69 +8798,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Ogiltig Fil"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "meddelande"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Känsloikoner:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Visa enbart i _registret"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Avancerad konfigurationsredigerare"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Rumkonfiguration"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim behöver Xserver för att köra. Avbryter..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim behöver PyGTK 2.12 eller senare"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim behöver PyGTK 2.12 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim behöver GTK 2.12 eller senare"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim behöver GTK 2.12 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behöver pywin32 för att köra"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8231,12 +8905,11 @@ msgid ""
 msgstr ""
 "Kontrollera att Pywin32 är installerat på ditt system. Du kan hämta det på %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim körs redan"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8244,29 +8917,29 @@ msgstr ""
 "En annan instans of Gajim verkar redan vara igång\n"
 "Starta ändå?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Visar hjälp för ett specifikt kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Visar eller döljer kontaktlistan"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8274,51 +8947,55 @@ 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
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "konto"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ändrar status för konto eller konton"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "meddelande"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8326,21 +9003,48 @@ 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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ändrar status för konto eller konton"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_tet:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Jag vill _registrera ett nytt konto"
+
+#: ../src/gajim-remote.py:122
+#, 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:128
 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-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 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
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 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-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8351,35 +9055,30 @@ 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
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: ../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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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-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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8390,136 +9089,133 @@ 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:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "ämne"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "meddelandeämne"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID för rummet som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 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
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Sökväg"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 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-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nyckel"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 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
+#: ../src/gajim-remote.py:214
 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
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Lägger till en kontakt till kontaktlistan"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 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
+#: ../src/gajim-remote.py:236
 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
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"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
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerar antalet olästa meddelanden"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öppnar \"Starta chatt\" dialogen"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Startar chatt, med detta kontot"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Skickar anpassad XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML att skicka"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8527,44 +9223,93 @@ 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
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Ändra status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Smeknamn att använda"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
+"skickas till alla konton"
+
+#: ../src/gajim-remote.py:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI att hantera"
+
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Konto i vilket du vill hanterare den"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Meddelandeinnehåll"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 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"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "rum"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Rummets JID"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "smeknamn"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Smeknamn att använda"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "lösenord"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Lösenord för att gå in i rummet"
+
+#: ../src/gajim-remote.py:292
+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:297
 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
+#: ../src/gajim-remote.py:301
 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
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8573,164 +9318,46 @@ 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
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 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
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Användning: %s %s %s \n"
-"\t %s"
+"Användning: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../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-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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Felaktig 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 av: offline, online, chat, away, xa, dnd, invisible "
-
-#: ../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: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 ""
-"Returnerar nuvarande statusmeddelande (det globala om inget konto "
-"specificerats)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Ändra status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Smeknamn att använda"
-
-#: ../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 för vilket XML kommer skickas. Om du inte specificerat kommer XML "
-"skickas till alla konton"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI att hantera"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Konto i vilket du vill hanterare den"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Meddelandeinnehåll"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Rummets JID"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Smeknamn att använda"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Lösenord för att gå in i rummet"
-
-#: ../src/gajim-remote.py:291
-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:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Användning: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8739,7 +9366,7 @@ msgstr ""
 "För många argument. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8748,10 +9375,14 @@ msgstr ""
 "Argumentet \"%(arg)s\" är inte angivet. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer info"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Felaktig uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8774,203 +9405,240 @@ msgid "You cannot delete your current theme"
 msgstr "Du kan inte ta bort ditt nuvarande tema"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Välj först ett annat för ditt aktuella tema."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, 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:236
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s har ställt in ämnet till %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Rummet visar nu otillgängliga medlemmar"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "rummet visar nu inga otillgängliga medlemmar"
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Rumsloggning är nu aktiverad"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Rumsloggning är nu inaktiverad"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Rummet är nu icke-anonymt"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Rummet är nu semi-anonymt"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Rummet är nu fullständigt anonymt"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Rumsloggning är aktiverad"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 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:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, 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:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, 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:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../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:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, 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:1383
+#: ../src/groupchat_control.py:1701
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Anknytning: "
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "systemet stängs av"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, 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:1500
+#: ../src/groupchat_control.py:1818
 #, 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:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: ../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:1774
+#: ../src/groupchat_control.py:2124
 #, 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:1776
+#: ../src/groupchat_control.py:2126
 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: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:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
+#: ../src/groupchat_control.py:2199
+#, fuzzy
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Förstör %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -8995,64 +9663,58 @@ msgstr "_Rapportera fel"
 msgid "Details"
 msgstr "Detaljer"
 
-#. we talk about file
-#: ../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:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 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:448
+#: ../src/gtkgui_helpers.py:393
 #, 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:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim är inte standardklient för Jabber"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 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:824
+#: ../src/gtkgui_helpers.py:769
 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:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Utökning stöds inte"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, 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:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
 #. 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
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9063,93 +9725,87 @@ msgstr ""
 "av\n"
 "en annan deltagare. Ange ett annat smeknamn nedan:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 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:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, 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:163
+#: ../src/gui_interface.py:160
 #, 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:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, 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
+#: ../src/gui_interface.py:299
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Du är bannlyst från gruppchatten %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Gruppchatten %s finns inte."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 #, 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."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, 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
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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: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:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, 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:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9157,109 +9813,105 @@ 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:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, 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:926
-msgid "Room now shows unavailable member"
-msgstr "Rummet visar nu otillgängliga medlemmar"
-
-#: ../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:930
-msgid "A non-privacy-related room configuration change has occurred"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "Rumsloggning är nu aktiverad"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Rumsloggning är nu inaktiverad"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Rummet är nu icke-anonymt"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Rummet är nu semi-anonymt"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Rummet är nu fullständigt anonymt"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 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:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 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:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Certifikatet har gått ut"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr ""
+"Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG-nyckeln är inte pålitlig"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 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:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 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:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, 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:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9274,101 +9926,86 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../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:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Fel vid öppnande av filen"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Filöverföringar"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, 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:1291
+#: ../src/gui_interface.py:1063
 #, 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:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Överföringen av %(filename)s från %(name)s har stannat."
+
+#: ../src/gui_interface.py:1080
 #, 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:1308
+#: ../src/gui_interface.py:1084
 #, 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:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Kunde inte dekryptera meddelande från %s\n"
-"Det kan ha manipulerats."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Kunde inte dekryptera meddelande"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 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:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Fel."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 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:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Fel vid verifiering av SSL-certifikat"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9379,15 +10016,20 @@ msgstr ""
 "server: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL-certifikatfel"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL-certifikatfel"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9404,28 +10046,7 @@ msgstr ""
 "\n"
 "Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
 
-#: ../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:1777
-#, fuzzy
-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 ""
-"Du är på väg att skicka ditt lösenord över en osäker anslutning. Du bör "
-"installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
-"skicka lösenordet?"
-
-#: ../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:1814
+#: ../src/gui_interface.py:1447
 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?"
@@ -9434,7 +10055,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:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9444,11 +10065,11 @@ msgstr ""
 "säker på att du vill göra det?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9456,7 +10077,7 @@ msgstr ""
 "Ditt konfigurerade känsloikontema hittades inte så känsloikoner har "
 "inaktiverats."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 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 "
@@ -9466,90 +10087,93 @@ msgstr ""
 "uppdatera formatet för filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons för mer information."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP 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:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG-nyckeln har gått ut"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP 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:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Ny gruppchatt"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "skapar katalogen %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakter"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Meddelande"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Vill du städa upp databasen? (DU AVRÅDS ATT GÖRA DETTA OM GAJIM KÖRS)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9563,94 +10187,109 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänta..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Databasfel"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Exporterar Loggar..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py: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] "Vill du verkligen ta bort loggar för den valda kontakten?"
-msgstr[1] "Vill du verkligen ta bort loggar för de valda kontakterna?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Vill du verkligen ta bort det valda meddelandet?"
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Vill du verkligen ta bort loggar för den valda kontakten?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Avbryt bekräftelse"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort det valda meddelandena?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversationshistorik med %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Diskfel"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s är nu %(status)s:%(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Felmeddelande: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 #, fuzzy
 msgid "Error"
 msgstr "Fel."
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status är nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Tidsgräns översteg vid inläsning av bild"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programmerar"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Bild är för stor"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Du är på väg att stänga flera flikar"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Vill du verkligen stänga alla dem?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Chattar"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Meddelanden"
 
@@ -9662,100 +10301,111 @@ msgstr "- meddelanden kommer att loggas"
 msgid "- messages will not be logged"
 msgstr "- meddelanden kommer inte att loggas"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s ändrade status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignorera"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s loggade in"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s loggade ut"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Bannlyser %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nytt meddelande från %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registreringen misslyckades"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nytt privat meddelande från gruppchatten %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Skickat av %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Den här filen finns redan"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nytt meddelande från %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorera"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Rumkonfiguration"
 
-#: ../src/profile_window.py:58
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Filen är tom"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Hämtar profil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Filen är tom"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformation"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: ÅÅÅÅ-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Information togs emot"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+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:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Skickar profil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informationen INTE publicerad"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9763,53 +10413,54 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, 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:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG är inte användbar"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9817,38 +10468,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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "inte i synk"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Verkligen avsluta Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Är du säker på att du vill avsluta Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Stäng alltid Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filöverföring"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9856,16 +10507,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:2720
+#: ../src/roster_window.py:2989
 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:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9873,11 +10524,11 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "med denna transport."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9886,70 +10537,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:2800
+#: ../src/roster_window.py:3043
 #, 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:2802
+#: ../src/roster_window.py:3045
 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:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, 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:2949
+#: ../src/roster_window.py:3140
 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:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, 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:3374
+#: ../src/roster_window.py:3637
 #, 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:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9958,11 +10609,11 @@ msgstr ""
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9970,18 +10621,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:3392
+#: ../src/roster_window.py:3655
 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:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter kommer att tas bort från din kontaktlista"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9991,47 +10642,48 @@ 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:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"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:3461
+#: ../src/roster_window.py:3724
 #, 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:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 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:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 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:4189
+#: ../src/roster_window.py:4550
 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:4191
+#: ../src/roster_window.py:4552
 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 "
@@ -10041,24 +10693,29 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, 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:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Skicka %s till %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Gör %s till en metakontakt för %s"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
@@ -10068,131 +10725,131 @@ msgstr "Gör %s till en metakontakt för %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../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
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "använder %s-kontot"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Hantera bokmärken..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Konfigurera tjänster..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Skicka ett meddelande"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Koppla från"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Koppla från"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Gå in i ny gruppchatt"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Ändra statusmeddelande..."
 
@@ -10209,24 +10866,14 @@ msgstr ""
 msgid "No result"
 msgstr "Inga resultat"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Ämne: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Bekräfta dessa sessionsalternativ"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10238,7 +10885,7 @@ msgstr ""
 "\n"
 "\tGodtar du dessa alternativ?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10253,147 +10900,152 @@ msgstr ""
 "\n"
 "Vill du fortsätta med sessionen?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Är OpenPGP aktiverat för denna kontakt?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktlista"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av den här gruppchatten"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blockerad]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [minimerad]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Senaste status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " sedan %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " sedan %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Humör:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivitet:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Låt:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Notifiering"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Hämta"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Skicka upp"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Färdigställd"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pausad"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10401,32 +11053,32 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Tid:Okänd"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "sedan %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tillhörighet:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10434,7 +11086,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10442,30 +11094,398 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 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:363
+#: ../src/vcard.py:414
 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:370
+#: ../src/vcard.py:421
 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:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Det finns inga väntande prenumerationsbegäran."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Välj fil att skicka..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " ett fönster/flik öppnad med den kontakten "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Åtgärder</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Villkor</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Avancerade åtgärder"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Avancerad notifieringskontroll"
+
+#~ msgid "All statuses"
+#~ msgstr "Alla statusar"
+
+#~ msgid "Busy "
+#~ msgstr "Upptagen "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakten ändrade status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt loggade ut"
+
+#~ msgid "Don't have "
+#~ msgstr "Har inte "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Filöverföring Stoppad"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Meddelande markerat i gruppchatt"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Meddelande mottaget i gruppchatt"
+
+#~ msgid "Have "
+#~ msgstr "Har "
+
+#~ msgid "Launch a command"
+#~ msgstr "Kör ett kommando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "En eller flera speciella statusar..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Ansluten / Ledig för chatt"
+
+#~ msgid "Play a sound"
+#~ msgstr "Spela upp ett ljud"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Skicka Privat Meddelande"
+
+#~ msgid "When "
+#~ msgstr "När "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktivera fönsterhanterarens UrgencyHint för att chattfönster ska blinka "
+#~ "i verktygsraden"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Inaktivera automatiskt öppning av chattfönster"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Inaktivera befintligt popupfönster"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Inaktivera befintligt ljud för denna händelse"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Inaktivera visning av händelser i kontaktlista"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Inaktivera visning av händelser i kontaktlista"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informera mig med ett popupfönster"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Öppna chattfönster med användare"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Visa händelse i kontaktlista"
+
+#~ msgid "and I "
+#~ msgstr "och jag "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontakter"
+
+#~ msgid "for "
+#~ msgstr "för "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupper"
+
+#~ msgid "when I'm in"
+#~ msgstr "när jag är i"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Visa kontaktens profil (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Tillåt henne/honom att se min status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Beskrivning: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Avancerat..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Visa _aktivitet för kontakter i kontaktlista"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Visa _låtar för kontakter i kontaktlista"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Visa _humör för kontakter i kontaktlista"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
+#~ "gruppchattsfönstren"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
+#~ "gruppchattsfönstren"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
+#~ "gruppchattsfönstren"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Skicka ett _meddelande..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Användaravatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Snabbmeddelandeklienten Gajim"
+
+#~ msgid "English"
+#~ msgstr "engelska"
+
+#~ msgid "Belarusian"
+#~ msgstr "vitryska"
+
+#~ msgid "Bulgarian"
+#~ msgstr "bulgariska"
+
+#~ msgid "Breton"
+#~ msgstr "bretonska"
+
+#~ msgid "Czech"
+#~ msgstr "tjeckiska"
+
+#~ msgid "German"
+#~ msgstr "tyska"
+
+#~ msgid "Greek"
+#~ msgstr "grekiska"
+
+#~ msgid "British"
+#~ msgstr "brittiska"
+
+#~ msgid "Esperanto"
+#~ msgstr "esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "spanska"
+
+#~ msgid "Basque"
+#~ msgstr "baskiska"
+
+#~ msgid "French"
+#~ msgstr "franska"
+
+#~ msgid "Croatian"
+#~ msgstr "kroatiska"
+
+#~ msgid "Italian"
+#~ msgstr "italienska"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "norska (bokmål)"
+
+#~ msgid "Dutch"
+#~ msgstr "nederländska"
+
+#~ msgid "Norwegian"
+#~ msgstr "norska (nynorsk)"
+
+#~ msgid "Polish"
+#~ msgstr "polska"
+
+#~ msgid "Portuguese"
+#~ msgstr "portugisiska"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "brasiliansk portugisiska"
+
+#~ msgid "Russian"
+#~ msgstr "ryska"
+
+#~ msgid "Serbian"
+#~ msgstr "serbiska"
+
+#~ msgid "Slovak"
+#~ msgstr "slovakiska"
+
+#~ msgid "Swedish"
+#~ msgstr "svenska"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "kinesiska"
+
+#~ msgid "Spelling language"
+#~ msgstr "Stavningsspråk"
+
+#~ msgid "all or space separated status"
+#~ msgstr "alla eller mellanslagsseparerad status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "\"yes\", \"no\" eller \"both\""
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "\"yes\", \"no\" eller \"\""
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Kontrollera din anslutning eller försök igen senare"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Fel vid körning av \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "fel: kan inte öppna %s för läsning"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Kunde inte binda till port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "En GTK+ jabberklient"
+
+#~ msgid "Condition"
+#~ msgstr "Villkor"
+
+#~ msgid "when I am "
+#~ msgstr "när jag är "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Kräver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Kräver gpg och python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transformera LaTeX-uttryck mellan $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, 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 ""
+#~ "Kräver texlive-latex-base och dvipng (Allt finns i MikTeX). Du måste "
+#~ "ställa in \"use_latex\" till True i avancerad konfiguration."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Kräver python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr ""
+#~ "Returnerar nuvarande statusmeddelande (det globala om inget konto "
+#~ "specificerats)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Användning: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakter"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Ämne: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Humör:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivitet:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10493,33 +11513,12 @@ msgstr " resurs med prioritet "
 #~ 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 "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"
 
@@ -10622,9 +11621,6 @@ msgstr " resurs med prioritet "
 #~ "Historik för gruppchattar\n"
 #~ "All chatthistorik"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Hantera konton"
-
 #~ msgid "gtk-delete"
 #~ msgstr "Ta bort"
 
@@ -10794,18 +11790,9 @@ msgstr " resurs med prioritet "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Tilldela Open_PGP-nyckel"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Kommandot stöds inte för zeroconf-konto."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Kommandon: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Användning: /%s, tömmer textfönstret."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Användning: /%s, döljer chattknapparna."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10813,12 +11800,6 @@ msgstr " resurs med prioritet "
 #~ "Användning: /%(command)s <åtgärd>, skickar åtgärd till aktuell "
 #~ "gruppchatt. Använd tredje person. (t.ex. /%(command)s exploderar.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Användning: /%s, skickar en ping till kontakten"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Användning: /%s, skickar meddelandet till kontakten"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Ingen hjälp för /%s"
 
@@ -10834,9 +11815,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
-#~ msgid "Nickname not found"
-#~ msgstr "Smeknamnet hittades inte"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -10849,13 +11827,6 @@ msgstr " resurs med prioritet "
 #~ "Stödjer INTE mellanslag i smeknamn."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Användning: /%s <smeknamn>, öppnar ett privat chattfönster med den "
-#~ "angivna deltagaren."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10895,9 +11866,6 @@ msgstr " resurs med prioritet "
 #~ msgstr ""
 #~ "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Användning: /%s, visa namnen för gruppchattens deltagare."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11061,9 +12029,6 @@ msgstr " resurs med prioritet "
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "Använd _link-local-meddelanden"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Klicka för att visa tidigare konversationer med den här kontakten"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Kompakt vy    Alt+C"
 
@@ -11076,9 +12041,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Query Builder..."
 #~ msgstr "Frågebyggare..."
 
-#~ msgid "Accept"
-#~ msgstr "Acceptera"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Inbjudan mottagen"
 
@@ -11205,9 +12167,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Company:"
 #~ msgstr "Företag:"
 
-#~ msgid "Country:"
-#~ msgstr "Land:"
-
 #~ msgid "Given:"
 #~ msgstr "Förnamn:"
 
@@ -11453,9 +12412,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Auktorisera kontakt automatiskt"
 
-#~ msgid "Send File"
-#~ msgstr "Skicka fil"
-
 #~ msgid "_Join New Room..."
 #~ msgstr "Anslut till nytt _rum..."
 
@@ -11516,12 +12472,6 @@ msgstr " resurs med prioritet "
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alla kontakter i den här gruppen är frånkopplade eller har fel"
 
-#~ msgid "Size: "
-#~ msgstr "Storlek: "
-
-#~ msgid "Session bus is not available"
-#~ msgstr "Sessionsbus inte tillgänglig"
-
 #~ msgid "Sound"
 #~ msgstr "Ljud"
 
@@ -11796,9 +12746,6 @@ msgstr " resurs med prioritet "
 #~ "på kompaktvy med Alt+C. NOTIS: Statusen du lämnar ett fönster/en flik i "
 #~ "är inte permanent"
 
-#~ msgid "Show roster window on Gajim startup"
-#~ msgstr "Visa registerfönstret när Gajim startar"
-
 #~ msgid "_Service Discovery"
 #~ msgstr "_Tjänstefinnare"
 
diff --git a/po/tr.po b/po/tr.po
index 833639ce4..345b172f7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,15 +2,16 @@
 # Copyright (C) 2010 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.
 # Django Shegman <shegman@tablatures.de>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13.10.2-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 15:01+0100\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2010-03-24 22:29+0100\n"
 "Last-Translator: Ferdi Kunzmann <shegman@tablatures.de>\n"
 "Language-Team: Turkish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,403 +19,525 @@ msgstr ""
 "X-Poedit-Bookmarks: -1,-1,66,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../data/gui/account_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+#, fuzzy
+msgid "_Status"
+msgstr "Durum"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Kişisel Olaylar"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "Sohbet _Başla"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
+#, fuzzy
+msgid "Join _Group Chat..."
+msgstr "Grup Sohbete Katıl"
+
+#: ../data/gui/account_context_menu.ui.h:5
+#, fuzzy
+msgid "_Add Contact..."
+msgstr "Kişi _ekle"
+
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
+msgid "_Discover Services"
+msgstr ""
+
+#: ../data/gui/account_context_menu.ui.h:7
+#, fuzzy
+msgid "_Execute Command..."
+msgstr "<b>Yürütecek komutayı seç</b>"
+
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
+#: ../data/gui/account_context_menu.ui.h:9
+#, fuzzy
+msgid "_Modify Account"
+msgstr "%s hesaptan"
+
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Hesap oluşturma yardımcı"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Sucucuya bağlanılıyor</b>\n"
-"\n"
-"Bekleyiniz lütfen..."
+"Önce bir hesap lazım Jabber ağa\n"
+"bağlanmak için"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
-msgid "<b>Please choose one of the options below:</b>"
-msgstr "<b>Lütfen altdaki seçeneklerinden birini seçiniz:</b>"
+msgid "I already have an account I want to _use"
+msgstr "Benim _kullanmak istediyim bir hesapım var bile"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:5
-msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>Lütfen varolan hesapının verisini doldurun</b>"
+msgid "I want to _register for a new account"
+msgstr "Yeni bir hesap _kaydetmek istiyorum"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Lütfen sunucu seçiniz</b>"
+msgid "<b>Please choose one of the options below:</b>"
+msgstr "<b>Lütfen altdaki seçeneklerinden birini seçiniz:</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
+msgid "<b>Please fill in the data for your existing account</b>"
+msgstr "<b>Lütfen varolan hesapının verisini doldurun</b>"
 
 #: ../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 ""
-"Bu doğruluk belgeyi bilinen doğruluk belgelere kat.\n"
-"SHA1 doğruluk belgenin parmakizi:\n"
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Parola:"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Parola_yı hatırla"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:10
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "İşaretliyse, Gajim bu hesapının parolayı hatırlar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Anon_ymous authentication"
-msgstr "Kimliksiz kimlik doğrulaması"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber kimliği:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Connect when I press Finish"
-msgstr "Bitir tıklayınca bağlan"
+msgid "Anon_ymous authentication"
+msgstr "Kimliksiz kimlik doğrulaması"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Hesap oluşturma yardımcı"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Lütfen sunucu seçiniz</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I already have an account I want to _use"
-msgstr "Benim _kullanmak istediyim bir hesapım var bile"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Sunuc:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-msgid "I want to _register for a new account"
-msgstr "Yeni bir hesap _kaydetmek istiyorum"
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
-#: ../data/gui/accounts_window.ui.h:25
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "İşaretliyse, Gajim bu hesapının parolayı hatırlar"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Yönet..."
 
+#: ../data/gui/account_creation_wizard_window.ui.h:17
+msgid "Use custom hostname/port"
+msgstr "Kendi bir makine adı/portu kullan"
+
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-#: ../data/gui/accounts_window.ui.h:36 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1256 ../src/config.py:1359 ../src/config.py:1652
-#: ../src/config.py:1657 ../src/config.py:2208 ../src/config.py:2287
-#: ../src/config.py:2300 ../src/config.py:3538 ../src/config.py:3611
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2887
-#: ../src/roster_window.py:2893 ../src/roster_window.py:2898
-msgid "None"
-msgstr "Hiçbiri"
+msgid "_Hostname:"
+msgstr "_Bilgisayar adı:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "_Port:"
+msgstr "_Porta:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-#: ../data/gui/accounts_window.ui.h:45
-msgid "Save pass_word"
-msgstr "Parola_yı hatırla"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_İlerle"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Set my profile when I connect"
-msgstr "Profilimi belir bağlanırsam"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:22
-msgid "Use custom hostname/port"
-msgstr "Kendi bir makine adı/portu kullan"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:23
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Önce bir hesap lazım Jabber ağa\n"
-"bağlanmak için"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:9
-msgid "_Advanced"
-msgstr "_İlerle"
+"Bu doğruluk belgeyi bilinen doğruluk belgelere kat.\n"
+"SHA1 doğruluk belgenin parmakizi:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Finish"
-msgstr "_Bitir"
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Sucucuya bağlanılıyor</b>\n"
+"\n"
+"Bekleyiniz lütfen..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-msgid "_Hostname:"
-msgstr "_Bilgisayar adı:"
+msgid "Connect when I press Finish"
+msgstr "Bitir tıklayınca bağlan"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:57
-msgid "_Jabber ID:"
-msgstr "_Jabber kimliği:"
+msgid "Set my profile when I connect"
+msgstr "Profilimi belir bağlanırsam"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-#: ../data/gui/accounts_window.ui.h:59
-msgid "_Password:"
-msgstr "_Parola:"
+msgid "_Finish"
+msgstr "_Bitir"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Port:"
-msgstr "_Porta:"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:31
-msgid "_Server:"
-msgstr "_Sunuc:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Karışık</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Hiçbiri"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Hesaplar"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Kişisel ilanlar sayfası</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Ekle"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Sil"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Durumu a_yarla"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Adı _değiştir"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Hesap"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Etkinleştir"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Hesaplar"
+msgid "Anonymous authentication"
+msgstr "Kimliksiz kimlik doğrulaması"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Yönetim işlemleri"
+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 ""
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Kimliksiz kimlik doğrulaması"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Bağlantıyı kaybetince kendilinden tekrar bağlan"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Kişileri eşzamana getir"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "C_onnect on Gajim startup"
-msgstr "Gajim açılırken bağlan"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Başka bir hesapın bütün kişilerin yetkiyi almak için tıkla"
 
 #: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Parolayı de_ğiştir"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Bunu işaretleyince Gajim göndermeden sorar parolayı tehlikeli bir bağlantı üzerinden göndersin mi diye."
+msgid "Click to change account's password"
+msgstr "Bu hesabın parolyı değiştirmek için tikla"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Choose _Key..."
-msgstr "Bir anahtar dosyası seçin"
+msgid "Administration operations"
+msgstr "Yönetim işlemleri"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Click to change account's password"
-msgstr "Bu hesabın parolyı değiştirmek için tikla"
+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 ""
+"Jabberde öncelik kullanıliyorki, iki veya daha fazla istemci ayni hesapı "
+"kullanmak istiyorsa, hangi istemci jabber sunucdan olayları alsın diye "
+"bilinsin; En yüksek öncelikli istemci olayları alır"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Başka bir hesapın bütün kişilerin yetkiyi almak için tıkla"
+msgid "A_djust to status"
+msgstr "Durumu a_yarla"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim açılırken bağlan"
+msgid "Priority will change automatically according to your status."
+msgstr "Durumuna göre öncelik kendilinden değişir."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Connection"
-msgstr "Bağlantı"
+msgid "Priori_ty:"
+msgstr "Ön_celik:"
 
 #: ../data/gui/accounts_window.ui.h:19
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:20
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "İlk Ad:"
-
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:21 ../data/gui/roster_window.ui.h:2
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:558 ../src/notify.py:581 ../src/notify.py:622
-#: ../src/notify.py:638
-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:22 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2829 ../src/roster_window.py:5376
-msgid "General"
-msgstr "Genel"
-
-#: ../data/gui/accounts_window.ui.h:23
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "İşaretliyse, Gajim senin IPden ayrı daha fazla IPleri yayınlaştırırki, çalişan dosya gönderimin şansı büyütmek için."
+msgid "Resour_ce:"
+msgstr "Kay_nak:"
 
 #: ../data/gui/accounts_window.ui.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "İşaretliyse, Gajim bir GPG acentadan seahorse gibi parolyı alır."
+msgid "_Client Cert File:"
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Göz at"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "İşaretliyse, Gajim bağlantıyı zaman aşımı yüzünden kaybetmemek için ayakta tutma packetleri gönderir"
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "^Rededilmiş durumunu değiştir"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "İşaretliyse, Gajim başlarken kendilinden jabbere bu hesapı kullanıp bağlanır"
+#, fuzzy
+msgid "Client certificate"
+msgstr "%(nickname)s Girdi"
 
 #: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "İşaretliyse, her global duruma yapılan geğişiklik (kişi listesinin altındaki giriş kutusundan yürütüldü) bu hesapın duruma da yapılır"
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Hesap"
 
 #: ../data/gui/accounts_window.ui.h:29
+msgid "C_onnect on Gajim startup"
+msgstr "Gajim açılırken bağlan"
+
+#: ../data/gui/accounts_window.ui.h:30
 msgid ""
-"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."
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
 msgstr ""
-"Giren iletler için öntanımlı porta senin kurmada uygun değilse burada değişterebilirsin.\n"
-"Belki halka ayarları değiştirmeye üzerinde düşünürsün."
+"İşaretliyse, Gajim başlarken kendilinden jabbere bu hesapı kullanıp bağlanır"
 
 #: ../data/gui/accounts_window.ui.h:31
-msgid "Information about you, as stored in the server"
-msgstr "Senin kişimsel informationun, nasıl sunucdaysa"
+msgid "Auto-reconnect when connection is lost"
+msgstr "Bağlantıyı kaybetince kendilinden tekrar bağlan"
 
 #: ../data/gui/accounts_window.ui.h:32
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1775
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber kimliği:"
+msgid "Save conversation _logs for all contacts"
+msgstr "Her kişinin sohbet _kaydını kaydet"
 
 #: ../data/gui/accounts_window.ui.h:33
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Soy Ad:"
+msgid "Synch_ronize account status with global status"
+msgstr "Hesap durumu global durumuyla eş_zamanla"
 
 #: ../data/gui/accounts_window.ui.h:34
-msgid "Mer_ge accounts"
-msgstr "Hesapları bir_leştir"
+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 ""
+"İşaretliyse, her global duruma yapılan geğişiklik (kişi listesinin altındaki "
+"giriş kutusundan yürütüldü) bu hesapın duruma da yapılır"
 
-#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
-#: ../src/config.py:2301
-msgid "No key selected"
-msgstr "Hiçbir anahtar seçilmedi"
+#: ../data/gui/accounts_window.ui.h:35
+msgid "Use file transfer proxies"
+msgstr "Dosya aktarım vekil sunucları kullan"
 
-#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Kişisel ilanlar sayfası"
+#: ../data/gui/accounts_window.ui.h:36
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"İşaretliyse, Gajim senin IPden ayrı daha fazla IPleri yayınlaştırırki, "
+"çalişan dosya gönderimin şansı büyütmek için."
+
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Genel"
 
 #: ../data/gui/accounts_window.ui.h:38
-msgid "Priori_ty:"
-msgstr "Ön_celik:"
+msgid "_use HTTP__PROXY environment variable"
+msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: ../data/gui/accounts_window.ui.h:39
-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 "Jabberde öncelik kullanıliyorki, iki veya daha fazla istemci ayni hesapı kullanmak istiyorsa, hangi istemci jabber sunucdan olayları alsın diye bilinsin; En yüksek öncelikli istemci olayları alır"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Yönet..."
 
 #: ../data/gui/accounts_window.ui.h:40
-msgid "Priority will change automatically according to your status."
-msgstr "Durumuna göre öncelik kendilinden değişir."
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
-msgid "Re_name"
-msgstr "Adı _değiştir"
+#: ../data/gui/accounts_window.ui.h:41
+msgid "_Warn before using an insecure connection"
+msgstr "Tehlikeli bağlantı kurmadan önce uyar"
 
 #: ../data/gui/accounts_window.ui.h:42
-msgid "Resour_ce:"
-msgstr "Kay_nak:"
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Bunu işaretleyince Gajim göndermeden sorar parolayı tehlikeli bir bağlantı "
+"üzerinden göndersin mi diye."
 
 #: ../data/gui/accounts_window.ui.h:43
-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 ""
+msgid "Send _keep-alive packets"
+msgstr "_Yaşamda kal paketleri gönder"
 
 #: ../data/gui/accounts_window.ui.h:44
-msgid "Save conversation _logs for all contacts"
-msgstr "Her kişinin sohbet _kaydını kaydet"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"İşaretliyse, Gajim bağlantıyı zaman aşımı yüzünden kaybetmemek için ayakta "
+"tutma packetleri gönderir"
+
+#: ../data/gui/accounts_window.ui.h:45
+msgid "Use cust_om hostname/port"
+msgstr "Özel makine adı/porta kullan"
 
 #: ../data/gui/accounts_window.ui.h:46
-msgid "Send _keep-alive packets"
-msgstr "_Yaşamda kal paketleri gönder"
+msgid "_Hostname: "
+msgstr "_Makine Adı:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Synch_ronize account status with global status"
-msgstr "Hesap durumu global durumuyla eş_zamanla"
+msgid "_Port: "
+msgstr "_Porta:"
 
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Synchroni_ze account status with global status"
-msgstr "Hesap durumu global durumuyla eş_zamanla"
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Karışık</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Kişileri eşzamana getir"
+msgid "Connection"
+msgstr "Bağlantı"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Use G_PG Agent"
-msgstr "G_PG acenta kullan"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Hiçbir anahtar seçilmedi"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Use cust_om hostname/port"
-msgstr "Özel makine adı/porta kullan"
+msgid "Choose _Key..."
+msgstr "Bir anahtar dosyası seçin"
 
 #: ../data/gui/accounts_window.ui.h:52
-msgid "Use cust_om port:"
-msgstr "Kendi bir porta kullan"
+msgid "Use G_PG Agent"
+msgstr "G_PG acenta kullan"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "Use file transfer proxies"
-msgstr "Dosya aktarım vekil sunucları kullan"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "İşaretliyse, Gajim bir GPG acentadan seahorse gibi parolyı alır."
 
 #: ../data/gui/accounts_window.ui.h:54
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
+
+#: ../data/gui/accounts_window.ui.h:55
 msgid "_Edit Personal Information..."
 msgstr "Kişisel ilanlar sayfayı yazımla"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Etkinleştir"
-
 #: ../data/gui/accounts_window.ui.h:56
-msgid "_Hostname: "
-msgstr "_Makine Adı:"
+msgid "Information about you, as stored in the server"
+msgstr "Senin kişimsel informationun, nasıl sunucdaysa"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Manage..."
-msgstr "_Yönet..."
+#: ../data/gui/accounts_window.ui.h:57
+msgid "<b>Personal Information</b>"
+msgstr "<b>Kişisel ilanlar sayfası</b>"
+
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Kişisel ilanlar sayfası"
+
+#: ../data/gui/accounts_window.ui.h:59
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim açılırken bağlan"
 
 #: ../data/gui/accounts_window.ui.h:60
-msgid "_Port: "
-msgstr "_Porta:"
+msgid "Synchroni_ze account status with global status"
+msgstr "Hesap durumu global durumuyla eş_zamanla"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Warn before using an insecure connection"
-msgstr "Tehlikeli bağlantı kurmadan önce uyar"
+msgid "Use cust_om port:"
+msgstr "Kendi bir porta kullan"
 
 #: ../data/gui/accounts_window.ui.h:62
-msgid "_use HTTP__PROXY environment variable"
-msgstr "sistemin HTTP vekil ayarları kullanılır"
+msgid ""
+"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 ""
+"Giren iletler için öntanımlı porta senin kurmada uygun değilse burada "
+"değişterebilirsin.\n"
+"Belki halka ayarları değiştirmeye üzerinde düşünürsün."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "İlk Ad:"
+
+#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Soy Ad:"
+
+#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber kimliği:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "Hesapları bir_leştir"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "H_esap:"
+msgid "Add New Contact"
+msgstr "Yeni Kişi Ekle"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Bu kişiye durumu görmeye hak ver"
+msgid "A_ccount:"
+msgstr "H_esap:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Yeni Kişi Ekle"
+msgid "_Protocol:"
+msgstr "_Protokol:"
 
-#: ../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 "Seni kişi listeme eklemek isterdim"
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Kullanıcı kimliği:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Takma Ad:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grup:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Bu kişiye durumu görmeye hak ver"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "Üyelik ileti _kaydet"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -422,582 +545,523 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:9
-msgid ""
-"You must be connected to the transport to be able\n"
-"to add a contact from this protocol."
-msgstr ""
-
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grup:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Takma Ad:"
-
 #: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Kayıt Ol"
 
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "Üyelik ileti _kaydet"
+#: ../data/gui/add_new_contact_window.ui.h:14
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
 
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Kullanıcı kimliği:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Seni kişi listeme eklemek isterdim"
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Bir hata oluştu:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-Hoc Komutlar - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Yürütecek komutayı seç</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Lütfen bekle komuta listesini alırken…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-Hoc Komutlar - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Yürütecek komutayı seç</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Bir daha dene"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Hata açıklaması…"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Komuta gönderirken lütfen bekleyiniz…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "Please wait while retrieving command list..."
-msgstr "Lütfen bekle komuta listesini alırken…"
+msgid "Please wait..."
+msgstr "Lütfen bekleyin..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while the command is sending..."
-msgstr "Komuta gönderirken lütfen bekleyiniz…"
+msgid "This jabber entity does not expose any commands."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait..."
-msgstr "Lütfen bekleyin..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Bir hata oluştu:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "This jabber entity does not expose any commands."
-msgstr ""
+msgid "Error description..."
+msgstr "Hata açıklaması…"
+
+#: ../data/gui/adhoc_commands_window.ui.h:10
+#, fuzzy
+msgid "F_inish"
+msgstr "_Bitir"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Açıklama</b>"
+msgid "Advanced Configuration Editor"
+msgstr "İlerlemiş Ayarlama Editörü"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr ""
+msgid "Filter:"
+msgstr "Filtre:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "İlerlemiş Ayarlama Editörü"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Açıklama</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtre:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "Öntanımlı değerlerine geri al"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Deletes Message of the Day"
-msgstr "Günün İletisini Sil"
+msgid "Show _XML Console"
+msgstr "_XML Konsolu Göster"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Edit _Privacy Lists..."
-msgstr "Kişisel Gizlilik Listesini biçimle"
+msgid "Edit Archi_ving Preferences"
+msgstr ""
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
-msgid "Sends a message to users currently connected to this server"
-msgstr "Şuanda bu sunuca bağlanmış kişilere bir ilet gönder"
+msgid "Edit _Privacy Lists..."
+msgstr "Kişisel Gizlilik Listesini biçimle"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:4
-msgid "Set MOTD..."
-msgstr "MOTD'yi yaz"
+msgid "_Administrator"
+msgstr "_Yönetici"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sets Message of the Day"
-msgstr "Günün İletisini yazar"
+#, fuzzy
+msgid "_Send Server Message..."
+msgstr "Tek Bir İleti Gönder…"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Show _XML Console"
-msgstr "_XML Konsolu Göster"
+msgid "Sends a message to users currently connected to this server"
+msgstr "Şuanda bu sunuca bağlanmış kişilere bir ilet gönder"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
-msgid "Update MOTD..."
-msgstr "MOTD'yi yenileştir"
+msgid "Sets Message of the Day"
+msgstr "Günün İletisini yazar"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Updates Message of the Day"
-msgstr "Günün İletisini yenileştirir"
+msgid "Set MOTD..."
+msgstr "MOTD'yi yaz"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "_Administrator"
-msgstr "_Yönetici"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Aksiyonlar</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Şartlar</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sesler</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "İlerlemiş aksiyonlar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "İlerlemiş bildirim kontrolü"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Bütün durumlar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
-msgid "Away"
-msgstr "Uzakta"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Meşgul"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "Kişinin Değişme Durumu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "Kişinin bağlantısı kesildi"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Yok"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "Dosya Gönderme Tamamlandı"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "Dosya Gönderme Soru"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "Dosya gönderme başlandı"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "Grup Sohbet İleti Vurgula"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "Grup Sohbet İleti Alındı"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Sahip"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
-msgid "Invisible"
-msgstr "Görünmez"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Bir komut yürüt"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216
-msgid "Not Available"
-msgstr "Mevcut Değil"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Bir veya daha fazla değişik durumlar…"
+msgid "Updates Message of the Day"
+msgstr "Günün İletisini yenileştirir"
 
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Çevrede / Sohbete hazır"
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "MOTD'yi yenileştir"
 
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Bir ses çal"
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#, fuzzy
+msgid "Delete MOTD"
+msgstr "Sil"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "Ileti alınıyor"
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
+msgid "Deletes Message of the Day"
+msgstr "Günün İletisini Sil"
 
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Ne zaman"
+#: ../data/gui/archiving_preferences_window.ui.h:1
+#, fuzzy
+msgid "No"
+msgstr "Hiçbiri"
 
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "Sohbet pencereyi kendilinden acılmasını _engelle"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "Varolan açılan penceryi _engelle"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "Bu olay için varolan sesi _engelle"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
-msgstr "Kişi listedeki olayları _engelle"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "Sistem tepsisinde gösterilen olayları _engelle"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "Beni bir açılan pencereyle _haberle"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "Kişiyle sohbet pencere _aç"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
-msgstr "Kişi listesindeki olayları göster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Sistem tepsisinde gösterilen olayları göster"
+#: ../data/gui/archiving_preferences_window.ui.h:3
+#, fuzzy
+msgid "Prefer"
+msgstr "Tercihler"
 
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "ve ben"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "kişi(ler)"
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "herkez"
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "için"
+#: ../data/gui/archiving_preferences_window.ui.h:7
+msgid "<i>Method Local</i>"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "grup(lar)"
+#: ../data/gui/archiving_preferences_window.ui.h:8
+msgid "<i>Method Auto</i>"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "ben burdaysam"
+#: ../data/gui/archiving_preferences_window.ui.h:9
+#, fuzzy
+msgid "Auto"
+msgstr "Kendiliğinden Katıl"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Kayıt:"
+msgid "New entry received"
+msgstr "Yeni kayıt alındı"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Yeni bir kayıt alındı:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Feed name:"
 msgstr "İlk Ad:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Kayıt:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Son değişiklik:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Yeni kayıt alındı"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
-msgid "You have received new entry:"
-msgstr "Yeni bir kayıt alındı:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Engellenmiş Kişiler"
 
-#: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Mesaj:</b> "
+#: ../data/gui/blocked_contacts_window.ui.h:2
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
+msgid "_Unblock"
+msgstr "Engellemeyi _Kaldır"
 
-#: ../data/gui/change_activity_dialog.ui.h:2
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "Set Activity"
 msgstr "Etkinlik ayarla"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Bir etkinlik ayarla"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Mesaj:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Mesaj:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Ruh Hali:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Mesaj:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Parolayı Değiştir"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Olaylamak için bir daha tuşla:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Yeni parola girin: "
 
-#: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Yeni durum ileti yaz</b>"
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Olaylamak için bir daha tuşla:"
 
-#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
-msgid "Activity:"
-msgstr "Etkinlik:"
+#: ../data/gui/change_status_message_dialog.ui.h:1
+msgid "Save as Preset..."
+msgstr "Önceden hazırlanmış olarak kaydet:"
 
-#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
+#: ../data/gui/change_status_message_dialog.ui.h:2
 msgid "Mood:"
 msgstr "Ruh Hali:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Etkinlik:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Önceden hazırlanmış iletleri:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Önceden hazırlanmış olarak kaydet:"
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Yeni durum ileti yaz</b>"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:1
+msgid "_Copy Link Location"
+msgstr ""
+
+#: ../data/gui/chat_context_menu.ui.h:2
+#, fuzzy
+msgid "_Open Link in Browser"
+msgstr "Gmail Gelen Kutusunu _Aç"
+
+#: ../data/gui/chat_context_menu.ui.h:3
+msgid "_Copy JID/Email Address"
+msgstr ""
+
+#: ../data/gui/chat_context_menu.ui.h:4
+#, fuzzy
+msgid "_Open Email Composer"
+msgstr "Gmail Gelen Kutusunu _Aç"
+
+#: ../data/gui/chat_context_menu.ui.h:5
+#: ../data/gui/subscription_request_popup_menu.ui.h:1
+#: ../data/gui/systray_context_menu.ui.h:2
+#, fuzzy
+msgid "_Start Chat"
+msgstr "Sohbet _Başla"
+
+#: ../data/gui/chat_context_menu.ui.h:6
+#, fuzzy
+msgid "Join _Group Chat"
+msgstr "Grup Sohbete Katıl"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "Kişi listeye _ekle…"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr ""
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Kişiyi listeye ekle"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "sobete dikkat veriyor"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Kişisel Bilgisi"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+msgid "Show advanced functions (Alt+D)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Mesajı gönder"
+
+#. 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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Gönder"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr "9"
 
-#: ../data/gui/chat_control.ui.h:13
-msgid "Mic volume:"
-msgstr "Mikrofon ses şiddeti:"
-
-#: ../data/gui/chat_control.ui.h:14
-msgid "Sound volume:"
-msgstr "Ses şiddeti:"
-
-#. 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:16 ../data/gui/groupchat_control.ui.h:2
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Gönder"
+#: ../data/gui/chat_control.ui.h:20
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
-msgid "label"
-msgstr "etiket"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Davet _et"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Arkadaşları Davet Et!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC sunucusu"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Lütfen bir MUC sunucu seç."
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
+msgid "MUC server"
+msgstr "MUC sunucusu"
+
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Davet _et"
 
 #: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Onun durumu görmeye _sor"
+msgid "Start _Chat"
+msgstr "Sohbet _Başla"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Özel Bildirim Ekle"
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Tek Bir İleti Gönder…"
 
 #: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Open_PGP anahtarı havale et…"
-
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "Bir komut y_ürüt"
-
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "_Grupları biçimle…"
+msgid "Send _File..."
+msgstr "_Dosya Gönder…"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
-#: ../src/roster_window.py:5441
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Buna davet _et"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Kişi Davet _Et"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "K_aldır"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Open_PGP şifrelemeyi değiştir"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Uçtan uca şifrelemeyi değiştir"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
-#: ../src/roster_window.py:5530
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Ö_zel durum gönder"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "Bir komut y_ürüt"
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Tek Bir İleti Gönder…"
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Kişiyi _işlet"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "_Dosya Gönder…"
+msgid "_Rename..."
+msgstr "Adı _değiştir..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Özel Resim Biçimle…"
+msgid "Edit _Groups..."
+msgstr "_Grupları biçimle…"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Sohbet _Başla"
+msgid "Assign Open_PGP Key..."
+msgstr "Open_PGP anahtarı havale et…"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Uçtan uca şifrelemeyi değiştir"
+msgid "Set Custom _Avatar..."
+msgstr "Özel Resim Biçimle…"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Open_PGP şifrelemeyi değiştir"
+msgid "Add Special _Notification..."
+msgstr "Özel Bildirim Ekle"
 
 #: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "Kişi listeye _ekle…"
+msgid "_Subscription"
+msgstr "_Üyelik"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Ona benim durumu görmeye izin _ver"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Bu kişiye durumu görmeye hak ver"
 
-#: ../data/gui/contact_context_menu.ui.h:18 ../src/roster_window.py:5353
-#: ../src/roster_window.py:5479 ../src/roster_window.py:5609
-msgid "_Block"
-msgstr "_Engelle"
+#: ../data/gui/contact_context_menu.ui.h:18
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Onun durumu görmeye _sor"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "Ona benim durumu görmeye _yasak et"
 
-#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
-msgid "_History"
-msgstr "_Geçmiş"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Yoksay"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Engelle"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "Kişiyi _işlet"
+msgid "_Unignore"
+msgstr "_Yoksaymaktan kadır"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "Adı _değiştir..."
-
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Üyelik"
+msgid "_Ignore"
+msgstr "_Yoksay"
 
-#: ../data/gui/contact_context_menu.ui.h:25 ../src/roster_window.py:5345
-#: ../src/roster_window.py:5473 ../src/roster_window.py:5606
-msgid "_Unblock"
-msgstr "Engellemeyi _Kaldır"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "K_aldır"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Yoksaymaktan kadır"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Geçmiş"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Formu doldur."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Oda Yerleştirme"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Formu doldur."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Grupları biçimle"
@@ -1010,124 +1074,153 @@ msgstr "(<b>EOturum</b> bilgi)"
 msgid "_Verify"
 msgstr "_Doğrula"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Özellikler:"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Özellikler:"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Bir çalışan, tamamlanmış ile durdurulmuş dosya aktarma listesi"
+msgid "File Transfers"
+msgstr "Dosya Aktarımları"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Dosya transferi iptal et"
+msgid "Shows a list of file transfers between you and others"
+msgstr ""
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Seçilmiş dosya aktarımı iptal ediyor"
+msgid "file transfers list"
+msgstr "dosya aktarımların listesi"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Bir çalışan, tamamlanmış ile durdurulmuş dosya aktarma listesi"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Temizle"
+#, fuzzy
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Dosya aktarımı tamamlandığında beni uyar"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Dosya Aktarımları"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Pencereyi gizler"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr ""
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Dosya aktarımları listeden sil."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
+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:10
-msgid "Shows a list of file transfers between you and others"
-msgstr ""
+msgid "Clean _up"
+msgstr "Temizle"
 
 #: ../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 "_Pause"
+msgstr "_Durakla"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr ""
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Seçilmiş dosya aktarımı iptal ediyor"
 
 #: ../data/gui/filetransfers.ui.h:13
-#, fuzzy
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Dosya aktarımı tamamlandığında beni uyar"
+msgid "Cancel file transfer"
+msgstr "Dosya transferi iptal et"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Pause"
-msgstr "_Durakla"
+msgid "Cancels the selected file transfer"
+msgstr "Seçilmiş dosya aktarımı iptal ediyor"
 
 #: ../data/gui/filetransfers.ui.h:15
-msgid "file transfers list"
-msgstr "dosya aktarımların listesi"
+msgid "Hides the window"
+msgstr "Pencereyi gizler"
 
-#: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Sohbetdurum Tab Renkleri</b>"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Devam"
 
-#: ../data/gui/gajim_themes_window.ui.h:2
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+#, fuzzy
+msgid "_Open Containing Folder"
+msgstr "Gmail Gelen Kutusunu _Aç"
+
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "Account row"
 msgstr "Hesap sırası"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
-msgid "Bold"
-msgstr "Kalın"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "Grup sırası"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "Kişi sırası"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "Sohbet Sancak"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Yazar"
+msgid "Gajim Themes Customization"
+msgstr "Gajim Tema Uyarlamak"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "Kişi sırası"
+msgid "Text _color:"
+msgstr "Metin _rengi"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Yazıtipi tarzı:"
+msgid "_Background:"
+msgstr "_Artalan:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim Tema Uyarlamak"
+msgid "Text _font:"
+msgstr "Metin _yazıtipi:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Gitti"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "Grup sırası"
+msgid "Font style:"
+msgstr "Yazıtipi tarzı:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Pasif"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Kalın"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Italik"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Duraklatıldı"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Yazar"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Pasif"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Sohbetdurum Tab Renkleri</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Gitti"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1135,7 +1228,7 @@ msgstr ""
 "MUC\n"
 "İletler"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1143,195 +1236,323 @@ msgstr ""
 "Yönetilmiş MUC\n"
 "İletler"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Duraklatıldı"
+#: ../data/gui/gc_control_popup_menu.ui.h:1
+#, fuzzy
+msgid "Change _Nickname..."
+msgstr "Takma Ad Ayarla"
 
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Metin _rengi"
+#: ../data/gui/gc_control_popup_menu.ui.h:2
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Yer imlerini işlet"
 
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Metin _yazıtipi:"
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
+msgid "Change _Subject..."
+msgstr "Konuk Değiştiriliyor"
 
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Artalan:"
+#: ../data/gui/gc_control_popup_menu.ui.h:4
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Çevrimiçi Servisler"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:5
+msgid "_Destroy Room"
+msgstr ""
+
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "Kapatınca küçült"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Ses"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Yer imi"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_deratör"
+#, fuzzy
+msgid "_Send Private Message"
+msgstr "Yeni kişisel Mesaj"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "Özel Eylemler"
+msgid "Send _File"
+msgstr "_Dosya Gönder…"
 
 #: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "_Admin"
-msgstr "_Yönetici"
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "Özel Eylemler"
 
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Ban"
-msgstr ""
+msgid "_Voice"
+msgstr "_Ses"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
-msgid "_Kick"
-msgstr ""
+msgid "Mo_derator"
+msgstr "Mo_deratör"
 
 #: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Üyesidir"
 
 #: ../data/gui/gc_occupants_menu.ui.h:7
+msgid "_Admin"
+msgstr "_Yönetici"
+
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Owner"
 msgstr "_Sahibi"
 
-#: ../data/gui/gc_occupants_menu.ui.h:8
-msgid "_Voice"
-msgstr "_Ses"
+#: ../data/gui/gc_occupants_menu.ui.h:9
+msgid "_Kick"
+msgstr ""
+
+#: ../data/gui/gc_occupants_menu.ui.h:10
+msgid "_Ban"
+msgstr ""
+
+#: ../data/gui/gc_occupants_menu.ui.h:12
+#, fuzzy
+msgid "_Add to Roster"
+msgstr "Kişi listeye _ekle…"
+
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bu odayi yer imle"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Yeni posta yarat"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Gönderen"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Gönderen:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Konu"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:4
+msgid "Subject:"
+msgstr "Konu:"
 
 #: ../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."
-msgstr ""
+msgid "Gajim History Logs Manager"
+msgstr "Kayıt Tarihleri Yöneticisi"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gajim Kayıt Tarihleri Yöneticisine Hoşgeldiniz</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "Dışa Aktar"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Kayıt Tarihleri Yöneticisi"
+#: ../data/gui/history_manager.ui.h:3
+msgid ""
+"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."
+msgstr ""
 
 #: ../data/gui/history_manager.ui.h:6
 msgid ""
-"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."
+"<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."
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:9
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "Veritabanı _Ara"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "Bütün Sohbet Kayıtları"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Sohbet Kayıtları"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Dışa Aktar"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "JID veya Kişi adı girdir"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr ""
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "Bütün Sohbet Kayıtları"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Sohbet Kayıtları"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Ara:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Sohbet kayıtı _kaydet"
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Odalara Göz At"
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "save"
+msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+#, fuzzy
+msgid "otr"
+msgstr "Sıcak"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+#, fuzzy
+msgid "body"
+msgstr "herkez"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+msgid "message"
+msgstr "mesaj"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+msgid "stream"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "require"
+msgstr ""
+
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Grup Sohbete Katıl"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr ""
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Oda:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Takma Ad:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Son Kullanılan:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Son Kullanılan:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr ""
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Oda:"
+msgid "_Bookmark this room"
+msgstr "Bu odayi yer imle"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Sunuc:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "Bu odayi yer imle"
+msgid "Bro_wse Rooms"
+msgstr "Odalara Göz At"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
-#: ../src/disco.py:1787
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Katıl"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Kendiliğinden Katıl"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Yer imlerini işlet"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Kendilinden Katılınca Küçült"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Başlık:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Durumu göster:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Kendiliğinden Katıl"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Başlık:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Kendilinden Katılınca Küçült"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1342,983 +1563,1151 @@ msgid "_Configure"
 msgstr "_Yerleştir"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Ayarları</b>"
+msgid "HTTP Connect"
+msgstr "HTTP Bağlantı"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Ayarları</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP Bağlantı"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Vekil Sunuc Profili İşlet"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "_Türü:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Şif_re:"
+msgid "_Name:"
+msgstr "_Ad:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Vekil _Makine:"
+msgid "<b>Properties</b>"
+msgstr "<b>Ayarları</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Vekil _Portası:"
+msgid "Use HTTP prox_y"
+msgstr "HTTP _vekili kullan"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "HTTP _vekili kullan"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Vergil do_ğrulama kullan"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Kullanıcı ismi"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "Şif_re:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Ad:"
+msgid "Proxy _Host:"
+msgstr "Vekil _Makine:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Türü:"
+msgid "Proxy _Port:"
+msgstr "Vekil _Portası:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Kullanıcı ismi"
+msgid "<b>Settings</b>"
+msgstr "<b>Ayarları</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Kişileri eşzamana getir"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Şifre"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "Install from zip"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Runtime Sürümü"
+
+#: ../data/gui/plugins_window.ui.h:5
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Authors:"
+msgstr "AU ayırıcı"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Ana Sayfa:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "homepage url"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Description:"
+msgstr "Açıklama: "
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+#, fuzzy
+msgid "Configure"
+msgstr "_Yerleştir"
+
+#: ../data/gui/plugins_window.ui.h:12
+#, fuzzy
+msgid "Installed"
+msgstr " [ %i%% ] (askıda)"
+
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/popup_notification_window.ui.h:1
+#, fuzzy
+msgid "Event Type"
+msgstr "Olay"
+
+#: ../data/gui/popup_notification_window.ui.h:2
+#, fuzzy
+msgid "Event desc"
+msgstr "Olay"
+
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>İlerlemiş Ayarlama Editörü</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Herzaman öntanımlı KDE uygulamaları kullan"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Uygulamalar</b>"
+msgid "Custom"
+msgstr "Özel"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Ses</b>"
+msgid "All chat states"
+msgstr "Bütün sohbet durumlar"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Otomatik Durumlar</b>"
+msgid "Composing only"
+msgstr "Sadece yazıştırıyor"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Sohbet Görünümü</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Geçersizleşti"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Sohbet Çizgi Renkleri</b>"
+msgid "Never"
+msgstr "Asla"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Sohbet durum bildirimler</b>"
+msgid "Only when pending events"
+msgstr "Sadece bekleyen olaylarda"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>Bağlantı</b>"
+msgid "Always"
+msgstr "Herzaman"
+
+#: ../data/gui/preferences_window.ui.h:9
+#, fuzzy
+msgid "Pop it up"
+msgstr "Olaylamak için bir daha tuşla:"
 
-#. 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>Özel</b>"
+msgid "Notify me about it"
+msgstr "Ona dair bana haber ver"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Yazıtipi</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Kişi listesindeki olayları göster"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Seçenekleri</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
+#, fuzzy
+msgid "Single window for everything"
+msgstr "Pencere başlığı için arkaplan rengi"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Gizlilik</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Kişi Listesi Görünümü</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Son durum: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Durum İletler</b>"
+#, fuzzy
+msgid "Preferences"
+msgstr "Tercihler"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Temalar</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Görsel Bildirimler</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(örnek: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "İlerlemiş"
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "İlerlemiş…"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "All chat states"
-msgstr "Bütün sohbet durumlar"
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "Port numarasına göre sırala"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "_İşletim sistem bilgi göndermeye izin ver"
+#, fuzzy
+msgid "in _roster"
+msgstr "Kişi listesindeki olayları göster"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr ""
+#, fuzzy
+msgid "in _group chats"
+msgstr "grupdaki herkez"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Kişi Listesi Görünümü</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Meşgulsem ses vermeye izin ver"
+#, fuzzy
+msgid "_Window behavior:"
+msgstr "Varolan açılan penceryi _engelle"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "Herzaman"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr "Daima Gnome varsayılan programlarını kullan"
+msgid "_Emoticons:"
+msgstr "Duygu _Simgeler:"
 
 #: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr "Herzaman öntanımlı KDE uygulamaları kullan"
+msgid "Ma_ke message windows compact"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr "Daima Xfce varsayılan programlarını kullan"
+msgid "Hide all buttons in chat windows"
+msgstr "Konuşma penceresinde tüm düğmeleri gizle"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Ask status message when I:"
-msgstr "Durum ileti sor ben buysam:"
+msgid "_Ignore rich content in incoming messages"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
-msgid "Audio / Video"
-msgstr "Ses / Video"
+#: ../data/gui/preferences_window.ui.h:35
+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:36
-msgid "Audio input device"
-msgstr "Ses giriş aygıtı"
+msgid "_Highlight misspelled words"
+msgstr "Yazım hatalarını _vurgula"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Audio output device"
-msgstr "Ses çıkış aygıtı"
+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:38
-msgid "Autodetect on every Gajim startup"
-msgstr "Gajim açılırken kendilinden belirle"
+msgid "_Show roster on startup:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Chat message:"
-msgstr "Sohbet İleti:"
-
-#: ../data/gui/preferences_window.ui.h:40
-msgid "Check on startup if Gajim is the _default Jabber client"
+msgid "Show icon when your messages are received"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Composing only"
-msgstr "Sadece yazıştırıyor"
+#: ../data/gui/preferences_window.ui.h:40
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Sohbet Görünümü</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Configure color and font of the interface"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Yeni olay alınca:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Contact's message:"
-msgstr "Kişinin İleti:"
+msgid "Notify me about contacts that sign _in"
+msgstr "_Giren kişilerden haber ver"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Contact's nickname:"
-msgstr "Kişinin takma adı"
+msgid "Notify me about contacts that sign _out"
+msgstr "_Çıkan kişilerden haber ver"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Custom"
-msgstr "Özel"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:46
-msgid "Detached roster with chat grouped by account"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify on new _GMail email"
+msgstr "Yeni _GMail e-postadan haber ver"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Detached roster with detached chats"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:49
-msgid "Detached roster with single chat"
-msgstr ""
+#, fuzzy
+msgid "Display _extra email details"
+msgstr "Halen Kayıtlı Olan E-posta Adreslerini Göster"
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:653
-msgid "Disabled"
-msgstr "Geçersizleşti"
+#: ../data/gui/preferences_window.ui.h:50
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display _activity of contacts in roster"
-msgstr ""
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Seçenekleri</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-#, fuzzy
-msgid "Display _extra email details"
-msgstr "Halen Kayıtlı Olan E-posta Adreslerini Göster"
+msgid "Show notification area icon:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display _location of contacts in roster"
-msgstr ""
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Görsel Bildirimler</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-msgid "Display _tunes of contacts in roster"
-msgstr ""
+msgid "Play _sounds"
+msgstr "_Sesleri çal"
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid "Display a_vatars of contacts in roster"
-msgstr ""
+msgid "Ma_nage..."
+msgstr "Yön_et..."
 
 #: ../data/gui/preferences_window.ui.h:56
-msgid "Display m_ood of contacts in roster"
-msgstr ""
+msgid "Allow sound when I'm _busy"
+msgstr "Meşgulsem ses vermeye izin ver"
 
 #: ../data/gui/preferences_window.ui.h:57
-msgid "Display status _messages of contacts in roster"
-msgstr ""
+msgid "<b>Sounds</b>"
+msgstr "<b>Sesler</b>"
 
 #: ../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 ""
+msgid "Notifications"
+msgstr "Bildirimler"
 
 #: ../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."
+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 ""
 
 #: ../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"
+msgid "_Display chat state notifications:"
+msgstr "Sohbet durum bildirimleri _göster:"
+
+#: ../data/gui/preferences_window.ui.h:61
+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 ""
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid "Hide all buttons in chat windows"
-msgstr "Konuşma penceresinde tüm düğmeleri gizle"
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Sohbet durum haberleri _göster:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr ""
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Sohbet durum bildirimler</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr ""
+msgid "Personal Events"
+msgstr "Kişisel Olaylar"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
+msgid "_Away after:"
+msgstr "Bu zamandan sonra _uzakta:"
 
 #: ../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"
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr ""
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Hiç bir hesap bulunmiyor"
 
 #: ../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"
+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:69
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
+msgid "minutes"
+msgstr "dakika"
 
 #: ../data/gui/preferences_window.ui.h:70
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:71
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:72
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
+msgid ""
+"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 ""
 
 #: ../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 ""
-
-#: ../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 ""
-
-#: ../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."
+msgid ""
+"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 ""
 
 #: ../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 ""
+msgid "<b>Auto Status</b>"
+msgstr "<b>Otomatik Durumlar</b>"
 
 #: ../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 ""
+msgid "Ask status message when I:"
+msgstr "Durum ileti sor ben buysam:"
 
 #: ../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 ""
+msgid "Sign _in"
+msgstr "_Bağlan"
 
 #: ../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 ""
+msgid "Sign _out"
+msgstr "_Çık"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Log _encrypted chat session"
-msgstr "Şifrelenmiş sohbet oturumu kaygıtla"
+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:81
-msgid "Ma_ke message windows compact"
-msgstr ""
+msgid "<b>Status Messages</b>"
+msgstr "<b>Durum İletler</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Ma_nage..."
-msgstr "Yön_et..."
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Never"
-msgstr "Asla"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Durum"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notifications"
-msgstr "Bildirimler"
+msgid "Use system _default"
+msgstr "Sistem _öntanımlıyı kullan"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Notify me about contacts that sign _in"
-msgstr "_Giren kişilerden haber ver"
+msgid "Chat message:"
+msgstr "Sohbet İleti:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Notify me about contacts that sign _out"
-msgstr "_Çıkan kişilerden haber ver"
+msgid "<b>Font</b>"
+msgstr "<b>Yazıtipi</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Notify me about it"
-msgstr "Ona dair bana haber ver"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "G_PG acenta kullan"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Notify on new _GMail email"
-msgstr "Yeni _GMail e-postadan haber ver"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Only when pending events"
-msgstr "Sadece bekleyen olaylarda"
+msgid "Status _iconset:"
+msgstr "Durum simgeler:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid "Personal Events"
-msgstr "Kişisel Olaylar"
+msgid "Configure color and font of the interface"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:91
-msgid "Play _sounds"
-msgstr "_Sesleri çal"
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "Pop it up"
-msgstr "Olaylamak için bir daha tuşla:"
+msgid "<b>Themes</b>"
+msgstr "<b>Temalar</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-#, fuzzy
-msgid "Preferences"
-msgstr "Tercihler"
+msgid "Contact's nickname:"
+msgstr "Kişinin takma adı"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Your nickname:"
+msgstr "Senin takma adın:"
+
+#: ../data/gui/preferences_window.ui.h:95
+msgid "_Status message:"
+msgstr "_Durum ileti:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "STUN server:"
-msgstr "STUN Sunuc:"
+#, fuzzy
+msgid "_URL highlight:"
+msgstr "Yazım hatalarını _vurgula"
 
 #: ../data/gui/preferences_window.ui.h:97
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Kişi listesindeki olayları göster"
+msgid "_Reset to Default Colors"
+msgstr "Öntanımlı değerlerine geri al"
 
 #: ../data/gui/preferences_window.ui.h:98
-#, fuzzy
-msgid "Show systray:"
-msgstr "_XML Konsolu Göster"
+msgid "Contact's message:"
+msgstr "Kişinin İleti:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sign _in"
-msgstr "_Bağlan"
+msgid "Your message:"
+msgstr "Senin mesajın:"
 
 #: ../data/gui/preferences_window.ui.h:100
-msgid "Sign _out"
-msgstr "_Çık"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "%s grup sohbete katıldı"
 
 #: ../data/gui/preferences_window.ui.h:101
-#, fuzzy
-msgid "Single window for everything"
-msgstr "Pencere başlığı için arkaplan rengi"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Sohbet Çizgi Renkleri</b>"
 
 #: ../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 ""
+msgid "Style"
+msgstr "Biçem"
 
 #: ../data/gui/preferences_window.ui.h:103
-#, fuzzy
-msgid "Sort contacts by status"
-msgstr "Port numarasına göre sırala"
+msgid "Audio input device"
+msgstr "Ses giriş aygıtı"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
-msgid "Status"
-msgstr "Durum"
+#: ../data/gui/preferences_window.ui.h:104
+msgid "Audio output device"
+msgstr "Ses çıkış aygıtı"
 
 #: ../data/gui/preferences_window.ui.h:105
-msgid "Status _iconset:"
-msgstr "Durum simgeler:"
+msgid "<b>Audio</b>"
+msgstr "<b>Ses</b>"
 
 #: ../data/gui/preferences_window.ui.h:106
-msgid "Style"
-msgstr "Biçem"
+msgid "Video input device"
+msgstr "Video giriş aygıtı"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Video output device"
+msgstr "Video çıkış aygıtı"
 
 #: ../data/gui/preferences_window.ui.h:108
-msgid ""
-"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"
+#, fuzzy
+msgid "Video framerate"
+msgstr "Video testi"
+
+#: ../data/gui/preferences_window.ui.h:109
+#, fuzzy
+msgid "Video size"
+msgstr "Video testi"
+
+#: ../data/gui/preferences_window.ui.h:110
+msgid "View own video source"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid ""
-"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 ""
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
 
-#: ../data/gui/preferences_window.ui.h:114
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "G_PG acenta kullan"
+#: ../data/gui/preferences_window.ui.h:112
+msgid "STUN server:"
+msgstr "STUN Sunuc:"
 
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Use system _default"
-msgstr "Sistem _öntanımlıyı kullan"
+#: ../data/gui/preferences_window.ui.h:113
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(örnek: stunserver.org)</i>"
+
+#: ../data/gui/preferences_window.ui.h:114
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video input device"
-msgstr "Video giriş aygıtı"
+msgid "<b>Connection</b>"
+msgstr "<b>Bağlantı</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "Video output device"
-msgstr "Video çıkış aygıtı"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Ses / Video"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "When new event is received:"
-msgstr "Yeni olay alınca:"
+msgid "_File manager:"
+msgstr "_Dosya yönetici"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your message:"
-msgstr "Senin mesajın:"
+#, fuzzy
+msgid "_Mail client:"
+msgstr "?Client:Bilinmez"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "Your nickname:"
-msgstr "Senin takma adın:"
-
-#: ../data/gui/preferences_window.ui.h:121
-msgid "_Away after:"
-msgstr "Bu zamandan sonra _uzakta:"
-
-#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Browser:"
 msgstr "_Tarayıcı:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/gui/preferences_window.ui.h:122
+msgid "<b>Custom</b>"
+msgstr "<b>Özel</b>"
+
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Display chat state notifications:"
-msgstr "Sohbet durum bildirimleri _göster:"
+msgid "<b>Applications</b>"
+msgstr "<b>Uygulamalar</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_Emoticons:"
-msgstr "Duygu _Simgeler:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_File manager:"
-msgstr "_Dosya yönetici"
+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:126
-msgid "_Highlight misspelled words"
-msgstr "Yazım hatalarını _vurgula"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "_İşletim sistem bilgi göndermeye izin ver"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore events from contacts not in the roster"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Ignore rich content in incoming messages"
-msgstr ""
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "_İşletim sistem bilgi göndermeye izin ver"
 
 #: ../data/gui/preferences_window.ui.h:129
-#, fuzzy
-msgid "_Log status changes of contacts"
-msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Mail client:"
-msgstr "?Client:Bilinmez"
+msgid "Log _encrypted chat session"
+msgstr "Şifrelenmiş sohbet oturumu kaygıtla"
 
 #: ../data/gui/preferences_window.ui.h:131
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Hiç bir hesap bulunmiyor"
+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:132
-msgid "_Open..."
-msgstr "_Aç..."
+msgid "Allow my _idle time to be sent"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:133
-#, fuzzy
-msgid "_Reset to Default Colors"
-msgstr "Öntanımlı değerlerine geri al"
-
-#: ../data/gui/preferences_window.ui.h:134
-#, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Sohbet durum haberleri _göster:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Status message:"
-msgstr "_Durum ileti:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Gizlilik</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
 #, fuzzy
-msgid "_URL highlight:"
-msgstr "Yazım hatalarını _vurgula"
+msgid "_Log status changes of contacts"
+msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "_Window behavior:"
-msgstr "Varolan açılan penceryi _engelle"
-
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
-msgid "in _group chats"
-msgstr "grupdaki herkez"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:139
-#, fuzzy
-msgid "in _roster"
-msgstr "Kişi listesindeki olayları göster"
+msgid "_Open..."
+msgstr "_Aç..."
 
 #: ../data/gui/preferences_window.ui.h:140
-msgid "minutes"
-msgstr "dakika"
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>İlerlemiş Ayarlama Editörü</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "İlerlemiş"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Kişisel Gizlilik Listesi:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
 #, fuzzy
-msgid "<b>Add / Edit a rule</b>"
-msgstr "Kişisel ilanlar sayfayı yazımla"
-
-#: ../data/gui/privacy_list_window.ui.h:2
-#, fuzzy
-msgid "<b>List of rules</b>"
+msgid "Privacy List"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../data/gui/privacy_list_window.ui.h:3
+#: ../data/gui/privacy_list_window.ui.h:2
 #, fuzzy
 msgid "<i>Privacy List</i>"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 #, fuzzy
 msgid "Active for this session"
 msgstr "Bu olay için varolan sesi _engelle"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 #, fuzzy
 msgid "Active on each startup"
 msgstr "Gajim açılırken bağlan"
 
-#: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Hepsi"
+#: ../data/gui/privacy_list_window.ui.h:5
+#, fuzzy
+msgid "<b>List of rules</b>"
+msgstr "Geçersiz Liste İsmi"
 
-#: ../data/gui/privacy_list_window.ui.h:7
+#: ../data/gui/privacy_list_window.ui.h:6
 #, fuzzy
-msgid "All (including subscription)"
-msgstr "Üyelik ileti _kaydet"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "Kişisel ilanlar sayfayı yazımla"
 
-#: ../data/gui/privacy_list_window.ui.h:8
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "Allow"
 msgstr "İzin ver"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Reddet"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Jabber kimliği"
 
-#: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Sıralama:"
-
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
-#, fuzzy
-msgid "Privacy List"
-msgstr "Geçersiz Liste İsmi"
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "grupdaki herkez"
 
-#: ../data/gui/privacy_list_window.ui.h:13
+#: ../data/gui/privacy_list_window.ui.h:11
 #, fuzzy
 msgid "all by subscription"
 msgstr "Üyelik ileti _kaydet"
 
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Hepsi"
+
+#: ../data/gui/privacy_list_window.ui.h:13
+msgid "to send me messages"
+msgstr "bana mesaj göndermek için"
+
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "grupdaki herkez"
+#, fuzzy
+msgid "to send me queries"
+msgstr "bana mesaj göndermek için"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "ikiside"
+#, fuzzy
+msgid "to view my status"
+msgstr "Onun durumu görmeye _sor"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "gönderen"
+#, fuzzy
+msgid "to send me status"
+msgstr "bana mesaj göndermek için"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "hiç biri"
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "Üyelik ileti _kaydet"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "kime"
+msgid "Order:"
+msgstr "Sıralama:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "bana mesaj göndermek için"
+msgid "none"
+msgstr "hiç biri"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-#, fuzzy
-msgid "to send me queries"
-msgstr "bana mesaj göndermek için"
+msgid "both"
+msgstr "ikiside"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-#, fuzzy
-msgid "to send me status"
-msgstr "bana mesaj göndermek için"
+msgid "from"
+msgstr "gönderen"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-#, fuzzy
-msgid "to view my status"
-msgstr "Onun durumu görmeye _sor"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adres</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Resim:</b>"
+msgid "to"
+msgstr "kime"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Doğumgünü:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Şehir:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Ayle:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Firma:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Yurt:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Orta:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Departman:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+#, fuzzy
+msgid "<b>Prefix:</b>"
+msgstr "Önek"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Ekstra Adres:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+#, fuzzy
+msgid "<b>Given:</b>"
+msgstr "Adres verilmedi"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Ayle:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "B<-s, --suffix >I<STRING>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Bütün isim</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Cadde:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-#, fuzzy
-msgid "<b>Given:</b>"
-msgstr "Adres verilmedi"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Şehir:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Ana Sayfa:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Kent:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Ekstra Adres:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Orta:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Posta Kodu:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>İsim:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Yurt:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Takma ad:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adres</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Telefon numara:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Ana Sayfa:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-#, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Konum</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>İsim:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Posta Kodu:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Takma ad:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Telefon numara:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "Önek"
+msgid "Format: YYYY-MM-DD"
+msgstr "geçersiz saat, format SS:DD şeklinde olmalı"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
-msgid "<b>Role:</b>"
-msgstr "<b>rol:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Doğumgünü:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Kent:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Cadde:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Resim:</b>"
 
-#. Suffix in Name
-#: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/profile_window.ui.h:28
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "B<-s, --suffix >I<STRING>"
+msgid "Click to set your avatar"
+msgstr "Tercihlerinizi ayarlayabileceğiniz pencereyi açar"
+
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Kişimsel Bilgisi"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Firma:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:43
 #, fuzzy
-msgid "About"
-msgstr "Hakkında"
+msgid "<b>Position:</b>"
+msgstr "<b>Konum</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-#, fuzzy
-msgid "Click to set your avatar"
-msgstr "Tercihlerinizi ayarlayabileceğiniz pencereyi açar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Departman:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-#, fuzzy
-msgid "Format: YYYY-MM-DD"
-msgstr "geçersiz saat, format SS:DD şeklinde olmalı"
+msgid "<b>Role:</b>"
+msgstr "<b>rol:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Kişimsel Bilgisi"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "İş"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Ne yapmak istiyorsun?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+#, fuzzy
+msgid "About"
+msgstr "Hakkında"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 #, fuzzy
 msgid "Remove account _only from Gajim"
 msgstr "İstemciyi hesap yöneticisi kontrolünden çıkarır."
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr ""
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Ne yapmak istiyorsun?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
-#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Kaldır"
 
 #: ../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 ""
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "Kişi listesindeki olayları göster"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
 msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Kişi listesindeki olayları göster"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Tamam"
 
-#: ../data/gui/roster_window.ui.h:1
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Aktionlar"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
-msgid "Frequently Asked Questions (online)"
-msgstr "Sık sorulan soruların bir listesini görüntüler"
+msgid "Add _Contact..."
+msgstr "Kişi _ekle"
 
-#: ../data/gui/roster_window.ui.h:3
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "Düz_en"
+
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
-msgid "Help online"
-msgstr "Çevrede / Sohbete hazır"
+msgid "_Accounts"
+msgstr "Hesaplar"
+
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr ""
 
-#: ../data/gui/roster_window.ui.h:4
+#: ../data/gui/roster_window.ui.h:12
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Görünüm"
+
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "_Çevredışı Kişileri Göster"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Sadece _Çecredeki Kişileri Göster"
 
-#: ../data/gui/roster_window.ui.h:5
+#: ../data/gui/roster_window.ui.h:16
 #, fuzzy
-msgid "Show Trans_ports"
+msgid "Show T_ransports"
 msgstr "_XML Konsolu Göster"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Show _Offline Contacts"
-msgstr "_Çevredışı Kişileri Göster"
-
-#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "Kişi Listesini Göster"
 
-#. 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:8
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Aktionlar"
-
-#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
-msgid "_Edit"
-msgstr "Düz_en"
+#: ../data/gui/roster_window.ui.h:18
+#, fuzzy
+msgid "File _Transfers"
+msgstr "Dosya Aktarımları"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:20
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "_View"
-msgstr "_Görünüm"
+#: ../data/gui/roster_window.ui.h:21
+#, fuzzy
+msgid "_Contents"
+msgstr "Mutlu"
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Lütfen bekle arama formu alırken…"
+#: ../data/gui/roster_window.ui.h:22
+#, fuzzy
+msgid "Help online"
+msgstr "Çevrede / Sohbete hazır"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/roster_window.ui.h:23
+msgid "_FAQ"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:24
+#, fuzzy
+msgid "Frequently Asked Questions (online)"
+msgstr "Sık sorulan soruların bir listesini görüntüler"
+
+#: ../data/gui/roster_window.ui.h:25
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:26
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Özellikler:"
+
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Ara"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Lütfen bekle arama formu alırken…"
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Kişi _ekle"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Bilgi"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Ara"
 
@@ -2339,164 +2728,164 @@ msgstr "Bunu %s buna %s gönder"
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Gönderen:"
-
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Bu ilete cevapla"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Kime:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "Gön_der"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Mesajı gönder"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Bu ileti gönder ve pencereyi kapat"
-
 #: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Konu:"
+msgid "_Reply"
+msgstr "_Cevap"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Kime:"
+msgid "Reply to this message"
+msgstr "Bu ilete cevapla"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Cevap"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Gönder & Kapat"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Bu ileti gönder ve pencereyi kapat"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-#, fuzzy
-msgid "Au_thorize"
-msgstr "AU ayırıcı"
+msgid "Subscription Request"
+msgstr "Üyelik İsteği"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
+msgid "_Deny"
+msgstr "_Reddet"
 
 #: ../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
-msgid "Subscription Request"
-msgstr "Üyelik İsteği"
+#: ../data/gui/subscription_request_window.ui.h:6
+#, fuzzy
+msgid "Au_thorize"
+msgstr "AU ayırıcı"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Reddet"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Kişileri eşzamana getir"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
-msgid "Select the contacts you want to synchronise"
-msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
+msgid "Synchronise : select contacts"
+msgstr "<b>Lütfen sunucu seçiniz</b>"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
-msgid "Synchronise : select contacts"
-msgstr "<b>Lütfen sunucu seçiniz</b>"
+msgid "Select the contacts you want to synchronise"
+msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
 #: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Sesi Kapat"
+msgid "Sta_tus"
+msgstr ""
 
-#: ../data/gui/systray_context_menu.ui.h:2
+#: ../data/gui/systray_context_menu.ui.h:3
+#, fuzzy
+msgid "_Group Chat"
+msgstr "Grup Sohbetler"
+
+#: ../data/gui/systray_context_menu.ui.h:4
+#, fuzzy
+msgid "Send Single _Message"
+msgstr "Tek bir İlet gönder"
+
+#: ../data/gui/systray_context_menu.ui.h:5
 msgid "Show All Pending _Events"
 msgstr "Bütün Bekleyen _Olayları Göster"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Sor:</b>"
-
-#: ../data/gui/vcard_information_window.ui.h:6
-#, fuzzy
-msgid "<b>Client:</b>"
-msgstr "?Client:Bilinmez"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Sesi Kapat"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "?Time:Bilinmez"
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kişisel Bilgisi"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber kimliği:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Kaynak:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Durum:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Üyelik:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+#, fuzzy
+msgid "<b>Client:</b>"
+msgstr "?Client:Bilinmez"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Sistem:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
-msgid "Comments"
-msgstr "Yorumlar"
+msgid "<b>Contact time:</b>"
+msgstr "?Time:Bilinmez"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
-msgid "Configured avatar:"
-msgstr "Avatarı değiştir"
+msgid "<b>User avatar:</b>"
+msgstr "<b>Resim:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
-msgid "Contact"
-msgstr "kişi(ler)"
+msgid "<b>Configured avatar:</b>"
+msgstr "Avatarı değiştir"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kişisel Bilgisi"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Üyelik:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Sor:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Daha Fazla"
 
-#: ../data/gui/vcard_information_window.ui.h:48
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
 #, fuzzy
-msgid "User avatar:"
-msgstr "Avatarı değiştir"
+msgid "Contact"
+msgstr "kişi(ler)"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Filtre</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+#, fuzzy
+msgid "Comments"
+msgstr "Yorumlar"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 #, fuzzy
 msgid "<b>Jabber Traffic</b>"
 msgstr "_Jabber kimliği:"
 
-#: ../data/gui/xml_console_window.ui.h:3
-#, fuzzy
-msgid "<b>XML Input</b>"
-msgstr "ses girdisi"
-
 #: ../data/gui/xml_console_window.ui.h:4
 #, fuzzy
 msgid "Hide IN stanzas"
@@ -2504,395 +2893,357 @@ msgstr "Buna davet _et"
 
 #: ../data/gui/xml_console_window.ui.h:5
 #, fuzzy
-msgid "Hide IQ stanzas"
-msgstr "Menüyi gizle"
+msgid "Hide OUT stanzas"
+msgstr "%(nickname)s Çıktı"
 
 #: ../data/gui/xml_console_window.ui.h:6
 #, fuzzy
-msgid "Hide Message stanzas"
-msgstr "Üyelik ileti _kaydet"
+msgid "Hide Presence stanzas"
+msgstr "Menüyi gizle"
 
 #: ../data/gui/xml_console_window.ui.h:7
 #, fuzzy
-msgid "Hide OUT stanzas"
-msgstr "%(nickname)s Çıktı"
+msgid "Hide IQ stanzas"
+msgstr "Menüyi gizle"
 
 #: ../data/gui/xml_console_window.ui.h:8
 #, fuzzy
-msgid "Hide Presence stanzas"
-msgstr "Menüyi gizle"
+msgid "Hide Message stanzas"
+msgstr "Üyelik ileti _kaydet"
 
 #: ../data/gui/xml_console_window.ui.h:9
+msgid "<b>Filter</b>"
+msgstr "<b>Filtre</b>"
+
+#. 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:11
+msgid "_IQ"
+msgstr "_IQ"
+
+#: ../data/gui/xml_console_window.ui.h:12
 msgid "Info/Query"
 msgstr "Bilgi/Sorgu"
 
-#. 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"
+msgid "_Presence"
+msgstr "_Bulunma"
 
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_İleti"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Bulunma"
+#: ../data/gui/xml_console_window.ui.h:16
+#, fuzzy
+msgid "<b>XML Input</b>"
+msgstr "ses girdisi"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_context_menu.ui.h:2
+msgid "_Modify Account..."
+msgstr ""
+
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Yerel jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Kişisel"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Kaynak:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Durum:"
 
-#: ../data/gajim.desktop.in.in.h:1
-#, fuzzy
-msgid "A GTK+ Jabber client"
-msgstr "Geçersiz Jabber kimliği"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Kişisel"
 
 #: ../data/gajim.desktop.in.in.h:2
 #, fuzzy
-msgid "Gajim Instant Messenger"
-msgstr "Gajim'den gerçekten çıkılsın mı?"
+msgid "Jabber IM Client"
+msgstr "Geçersiz Jabber kimliği"
 
 #: ../data/gajim.desktop.in.in.h:3
 #, fuzzy
-msgid "Jabber IM Client"
+msgid "A GTK+ Jabber client"
 msgstr "Geçersiz Jabber kimliği"
 
-#: ../src/adhoc_commands.py:298
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Dosya transferi iptal et"
 
-#: ../src/adhoc_commands.py:299
-msgid "You are in process of executing command. Do you really want to cancel it?"
+#: ../src/adhoc_commands.py:326
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
+#: ../src/adhoc_commands.py:372
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Geçersiz oda"
+
+#: ../src/adhoc_commands.py:373
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
+
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 #, fuzzy
 msgid "Service sent malformed data"
 msgstr "Karalı servisin TXT verisi"
 
-#: ../src/adhoc_commands.py:340
+#: ../src/adhoc_commands.py:401
 #, fuzzy
 msgid "Service changed the session identifier."
 msgstr "geçerli oturumun geçerli kullanıcısını tanımla"
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-Hoc Komutlar - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:441
+#: ../src/adhoc_commands.py:516
 #, fuzzy
 msgid "Service returned an error."
 msgstr "<b>Bir hata oluştu:</b>"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Activated"
 msgstr "Etkin çıkışta"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Boolean"
 msgstr "Mantıksal Değer"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 #, fuzzy
 msgid "Integer"
 msgstr "Tamsayı"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Metin"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Renk"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 #, fuzzy
 msgid "Preference Name"
 msgstr "İlk Ad:"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 #, fuzzy
 msgid "Value"
 msgstr "anahtar=değer"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 #, fuzzy
 msgid "Type"
 msgstr "_Türü:"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Hiçbiri)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Gizli"
 
-#: ../src/atom_window.py:119
+#: ../src/atom_window.py:123
 #, python-format
 msgid "You have received new entries (and %d not displayed):"
 msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] ""
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ;
-#. done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
-msgid "English"
-msgstr "İngilizce"
-
-#: ../src/chat_control.py:75
-msgid "Belarusian"
-msgstr "Beyaz Rusça"
-
-#: ../src/chat_control.py:75
-msgid "Bulgarian"
-msgstr "Bulgarca"
-
-#: ../src/chat_control.py:75
-msgid "Breton"
-msgstr "Bretonca"
-
-#: ../src/chat_control.py:75
-msgid "Czech"
-msgstr "Çekçe"
-
-#: ../src/chat_control.py:75
-msgid "German"
-msgstr "Almanca"
-
-#: ../src/chat_control.py:75
-msgid "Greek"
-msgstr "Yünanca"
-
-#: ../src/chat_control.py:75
-msgid "British"
-msgstr "İngilizce (Britanya)"
-
-#: ../src/chat_control.py:75
-#, fuzzy
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:75
-msgid "Spanish"
-msgstr "İspanyolca"
-
-#: ../src/chat_control.py:75
-msgid "Basque"
-msgstr "Baskça"
-
-#: ../src/chat_control.py:75
-msgid "French"
-msgstr "Fransızca"
-
-#: ../src/chat_control.py:75
-msgid "Croatian"
-msgstr "Hırvatça"
-
-#: ../src/chat_control.py:75
-msgid "Italian"
-msgstr "İtalyanca"
-
-#: ../src/chat_control.py:75
-msgid "Norwegian (b)"
-msgstr "Norveççe"
-
-#: ../src/chat_control.py:75
-msgid "Dutch"
-msgstr "Flemenkçe"
-
-#: ../src/chat_control.py:75
-msgid "Norwegian"
-msgstr "Norveççe"
-
-#: ../src/chat_control.py:75
-msgid "Polish"
-msgstr "Polonyaca"
-
-#: ../src/chat_control.py:75
-msgid "Portuguese"
-msgstr "Portekizce"
-
-#: ../src/chat_control.py:75
-msgid "Brazilian Portuguese"
-msgstr "Brezilya Portekizce"
-
-#: ../src/chat_control.py:75
-msgid "Russian"
-msgstr "Rusça"
-
-#: ../src/chat_control.py:75
-msgid "Serbian"
-msgstr "Sırpça"
-
-#: ../src/chat_control.py:75
-msgid "Slovak"
-msgstr "Slovakça"
-
-#: ../src/chat_control.py:75
-msgid "Swedish"
-msgstr "İsveççe"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:75
-msgid "Chinese (Ch)"
-msgstr "Çince (Çin)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:450
-#, fuzzy
-msgid "Spelling language"
-msgstr "Tercih ettiğiniz dil:"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Hata."
 
 #. we are not connected
-#: ../src/chat_control.py:482 ../src/chat_control.py:691
+#: ../src/chat_control.py:800
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: ../src/chat_control.py:483 ../src/chat_control.py:692
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Altçizgili"
 
-#: ../src/chat_control.py:886
+#: ../src/chat_control.py:1048
 #, fuzzy
 msgid "Strike"
 msgstr "Ü&stü Çizili"
 
-#: ../src/chat_control.py:909
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Yazıtipi"
 
-#: ../src/chat_control.py:918
+#: ../src/chat_control.py:1080
 #, fuzzy
 msgid "Clear formating"
 msgstr "Işareti temizle"
 
-#: ../src/chat_control.py:996
+#: ../src/chat_control.py:1157
 #, fuzzy
 msgid "Really send file?"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: ../src/chat_control.py:997
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
 #, fuzzy
-msgid "GPG encryption enabled"
+msgid "OpenPGP encryption enabled"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+msgid "This contact does not support HTML"
+msgstr ""
+
 #. Add to roster
-#: ../src/chat_control.py:1475 ../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:2069
-#: ../src/dialogs.py:2098 ../src/gui_interface.py:673
-#: ../src/gui_menu_builder.py:251 ../src/gui_menu_builder.py:394
-#: ../src/roster_window.py:1609 ../src/roster_window.py:1611
-#: ../src/roster_window.py:1939 ../src/roster_window.py:3286
-#: ../src/roster_window.py:3313
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 #, fuzzy
 msgid "Not in Roster"
 msgstr "Kişi listesindeki olayları göster"
 
-#: ../src/chat_control.py:1519
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+msgid "Feature not available, see Help->Features"
+msgstr ""
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Gönder %s"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr ""
 
-#: ../src/chat_control.py:1522
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1611
+#: ../src/chat_control.py:1906
 #, fuzzy, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "Sohbet durum haberleri _göster:"
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:2098
 #, 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:1927 ../src/dialogs.py:4814
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
 #, fuzzy
-msgid "No GPG key assigned"
+msgid "No OpenPGP key assigned"
 msgstr "GPG anahtara güvenilmiyor"
 
-#: ../src/chat_control.py:1928
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
+#: ../src/chat_control.py:2230
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:1937
+#: ../src/chat_control.py:2239
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: ../src/chat_control.py:1963
+#: ../src/chat_control.py:2265
 #, fuzzy
 msgid "Session WILL be logged"
 msgstr "oturum kullanıcısı kaldıramaz"
 
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2267
 #, fuzzy
 msgid "Session WILL NOT be logged"
 msgstr "%s: OID (-o) 0 olamaz\n"
 
 #. encryption %s active
-#: ../src/chat_control.py:1982
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "ol"
 
-#: ../src/chat_control.py:1982
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "olma"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1984
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "olacak"
 
-#: ../src/chat_control.py:1984
+#: ../src/chat_control.py:2286
 #, fuzzy
 msgid "will NOT"
 msgstr "Mevcut Değil"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1988
+#: ../src/chat_control.py:2290
 #, fuzzy
 msgid "and authenticated"
 msgstr "bir ses ve video"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1992
+#: ../src/chat_control.py:2294
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Rahatsız etmeyin"
@@ -2900,1397 +3251,2097 @@ msgstr "Rahatsız etmeyin"
 #. 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:1999
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2139
+#: ../src/chat_control.py:2439
 #, fuzzy
 msgid "Session negotiation cancelled"
 msgstr "Kullanıcı vazgeçti"
 
-#: ../src/chat_control.py:2148
+#: ../src/chat_control.py:2449
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2451
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "%s: OID (-o) 0 olamaz\n"
+
+#: ../src/chat_control.py:2460
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "      --ssl         ssl ile şifrelenmiş oturumu etkinleştir\n"
 
-#: ../src/chat_control.py:2151
+#: ../src/chat_control.py:2463
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "bir ses ve video"
 
-#: ../src/chat_control.py:2153
+#: ../src/chat_control.py:2465
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "%s: OID (-o) 0 olamaz\n"
 
-#: ../src/chat_control.py:2158
-msgid "Remote contact's identity not verified. Click the shield button for more details."
+#: ../src/chat_control.py:2470
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
 msgstr ""
 
-#: ../src/chat_control.py:2160
+#: ../src/chat_control.py:2472
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "  Spam engelleme etkin değil\n"
 
-#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 #, fuzzy
 msgid "The following message was NOT encrypted"
-msgstr "%s@%s:%d iletisinin uzunluğu beklendiği kadar değil (gerçekte %d != beklenen %d)\n"
+msgstr ""
+"%s@%s:%d iletisinin uzunluğu beklendiği kadar değil (gerçekte %d != beklenen "
+"%d)\n"
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2526
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "Işaretli hıc bir ileti yok."
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2475
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: ../src/chat_control.py:2476
-msgid "If you close this tab and you have history disabled, this message will be lost."
+#: ../src/chat_control.py:2799
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
 msgstr ""
 
-#: ../src/chat_control.py:2619 ../src/common/connection_handlers.py:1578
-#: ../src/common/connection_handlers.py:1629
-#: ../src/common/connection_handlers.py:1824
-#: ../src/common/connection_handlers.py:1974 ../src/common/connection.py:436
-#: ../src/gajim.py:156 ../src/session.py:134
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 #, fuzzy
 msgid "Database Error"
 msgstr "Hata açıklaması…"
 
-#: ../src/chat_control.py:2620
+#: ../src/chat_control.py:2968
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
+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:2858
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:3262
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Dosya Aktarımları"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "%1 (boyut %2)"
+
+#: ../src/chat_control.py:3326
+msgid "_Accept"
+msgstr ""
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+#, fuzzy
+msgid "File transfer completed"
+msgstr "Dosya Gönderme Tamamlandı"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Sadece davetliler"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr ""
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Dosya açılırken hata"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Dosya Gönderme Tamamlandı"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Dosya Gönderme Tamamlandı"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr ""
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Dosyayı bir kişiye gönderir"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s bulunamadı"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Uzakta"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+msgid "Available"
+msgstr "Mevcut"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Pencereyi gizler"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Open_PGP şifrelemeyi değiştir"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Dosyayı bir kişiye gönderir"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "Klasör \"%s\" yazılabilir değil"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Klasör \"%s\" yazılabilir değil"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Hiç bir hesap bulunmiyor"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "[%s sayfasını okuyamazsınız.]"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Geçersiz takma ad"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr "Kişiyle sohbet pencere _aç"
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Kullanıcak takma ad"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "%s mevcut bir grubun ismi değil"
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Bunu %s buna %s gönder"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr ""
+"Şuraya bir yorum gönderiyorsunuz:\n"
+"  "
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Geçersiz sunucu"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "üyelik değişti"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s mevcut bir grubun ismi değil"
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "JID veya Kişi adı girdir"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 #, fuzzy
 msgid "creating logs database"
 msgstr "%s/base/1 içinde template1 veritabanı yaratılıyor. "
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "%s/base/1 içinde template1 veritabanı yaratılıyor. "
 
-#: ../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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr ""
 
-#: ../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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 #, fuzzy
 msgid "Gajim will now exit"
 msgstr "Gajim'den gerçekten çıkılsın mı?"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr ""
 
-#: ../src/common/check_paths.py:337
+#: ../src/common/check_paths.py:366
 #, fuzzy, python-format
 msgid "creating %s directory"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Durum informationu değiştir"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Durumu Değiştir"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Sohbet için Hazır"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Çevrimiçi"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Uzun süreli uzakta"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Rahatsız etmeyin"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 #, fuzzy
 msgid "Offline - disconnect"
 msgstr "çevrimdışı"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Hata açıklaması…"
 
-#: ../src/common/commands.py:149
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 #, fuzzy
 msgid "The status has been changed."
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Tam-Ekrandan Çık"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(room_jid)s daki %(nickname)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "[%s sayfasını okuyamazsınız.]"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 #, fuzzy
 msgid "Choose the groupchats you want to leave"
 msgstr "Lütfen göstermek istediğiniz kaynak dosyasındaki satırı seçiniz:"
 
 #. 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:817
-#: ../src/roster_window.py:1613 ../src/roster_window.py:1615
-#: ../src/roster_window.py:5248
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Grup sohbetler"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Sobetten ayrıldınız."
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Okunmamış iletler var"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:75
+#: ../src/common/commands.py:304
+#, fuzzy
+msgid "Forward unread message then disconnect"
+msgstr "Okunmamış iletler var"
+
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Kişi meşgulsa ses çal"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Kişi listede sadece mevcut ile sohbete hazır olanları göster"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr ""
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr ""
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+msgid "$S will be replaced by current status message, $T by autoxatime."
+msgstr ""
+
+#: ../src/common/config.py:89
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Kullanıcak takma ad"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 #, fuzzy
 msgid "Outgoing nickname color."
 msgstr "Kullanıcak takma ad"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 #, fuzzy
 msgid "Incoming text color."
 msgstr "Metin dolgusu rengi"
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 #, fuzzy
 msgid "Outgoing text color."
 msgstr "Metin dolgusu rengi"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 #, fuzzy
 msgid "Status message text color."
 msgstr "<b>Yeni durum ileti yaz</b>"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+msgid "Contact signed in notification color."
+msgstr ""
+
+#. limegreen
+#: ../src/common/config.py:103
+msgid "Contact signout notification color"
+msgstr ""
+
+#. red
+#: ../src/common/config.py:104
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Dosya Gönderme Soru"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Dosya Gönderme Tamamlandı"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Dosya Gönderme Tamamlandı"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Sadece davetliler"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Kullanıcak takma ad"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Kullanıcak takma ad"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 #, fuzzy
 msgid "Incoming text font."
 msgstr "Seçilen metnin yazıyüzü"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 #, fuzzy
 msgid "Outgoing text font."
 msgstr "Seçilen metnin yazıyüzü"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 #, fuzzy
 msgid "Status message text font."
 msgstr "<b>Yeni durum ileti yaz</b>"
 
-#: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
+#: ../src/common/config.py:116
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:497
-#: ../src/common/optparser.py:287 ../src/common/optparser.py:483
-#: ../src/common/optparser.py:517 ../src/gui_interface.py:3370
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "öntanımlı"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 #, fuzzy
 msgid "Language used by speller"
 msgstr "başka programlarca kullanılan: "
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py: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'."
+#: ../src/common/config.py:125
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 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."
+#: ../src/common/config.py:129
+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)"
+#: ../src/common/config.py:132
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
+#: ../src/common/config.py:141
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
 
-#: ../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."
+#: ../src/common/config.py:142
+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"
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:172
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:177
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+msgstr ""
+
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "* ile [n] kişi listeye eklensin mi?"
 
-#: ../src/common/config.py:166
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+#: ../src/common/config.py:180
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened?"
 msgstr ""
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 
-#: ../src/common/config.py:168
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:169
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
+#: ../src/common/config.py:184
+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 ""
 
-#: ../src/common/config.py:172
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:186
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:191
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
 msgstr ""
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: ../src/common/config.py:181
-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."
+#: ../src/common/config.py:195
+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 ""
 
-#: ../src/common/config.py:182
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+#: ../src/common/config.py:196
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:183
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
+#: ../src/common/config.py:197
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:185
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
+#: ../src/common/config.py:199
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
-#: ../src/common/config.py:187
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
+#: ../src/common/config.py:201
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat JIDs."
 msgstr ""
 
-#: ../src/common/config.py:188
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
+#: ../src/common/config.py:202
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat JIDs."
 msgstr ""
 
-#: ../src/common/config.py:189
-msgid "Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)"
+#: ../src/common/config.py:203
+msgid ""
+"Ask before closing tabbed chat window if there are controls that can lose "
+"data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:192
-msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
+#: ../src/common/config.py:206
+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:194
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: ../src/common/config.py:196
-msgid "Notify of events in the system trayicon."
+#: ../src/common/config.py:210
+msgid "Notify of events in the notification area."
 msgstr ""
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:219
 #, fuzzy
 msgid "Show close button in tab?"
 msgstr "Başlık çubuğu içeriğini sekme çubuğu etiketlerinde göster"
 
-#: ../src/common/config.py:205
-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."
+#: ../src/common/config.py:220
+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 ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:219
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
+#: ../src/common/config.py:246
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 
-#: ../src/common/config.py:220
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
+#: ../src/common/config.py:247
+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 ""
 
-#: ../src/common/config.py:221
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
+#: ../src/common/config.py:248
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 
-#: ../src/common/config.py:222
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
+#: ../src/common/config.py:249
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
 msgstr ""
 
-#: ../src/common/config.py:223
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
+#: ../src/common/config.py:250
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:230
-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."
+#: ../src/common/config.py:257
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
 msgstr ""
 
-#: ../src/common/config.py:231
-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."
+#: ../src/common/config.py:258
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
 msgstr ""
 
-#: ../src/common/config.py:232
-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."
+#: ../src/common/config.py:259
+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 ""
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:237
-msgid "If True, restored messages will use a smaller font than the default one."
+#: ../src/common/config.py:265
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:240
-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."
+#: ../src/common/config.py:268
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
 msgstr ""
 
-#: ../src/common/config.py:242
-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."
+#: ../src/common/config.py:270
+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 ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:245
+#: ../src/common/config.py:273
 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) is sent to a "
+"specific window."
 msgstr ""
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 
-#: ../src/common/config.py:252
-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."
+#: ../src/common/config.py:281
+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:253
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr ""
 
-#: ../src/common/config.py:255
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
+#: ../src/common/config.py:284
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:257
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr ""
-
-#: ../src/common/config.py:258
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
+#: ../src/common/config.py:286
+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 custom status dialog or not? Empty string means we never show the dialog."
+#: ../src/common/config.py:287
+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 "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."
+#: ../src/common/config.py:288
+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, Gajim will use Gnome Keyring (if available) to store account passwords."
+#: ../src/common/config.py:289
+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 KDE Wallet (if kwalletcli is available) to store account passwords."
+#: ../src/common/config.py:290
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
 msgstr ""
 
-#: ../src/common/config.py:263
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
+#: ../src/common/config.py:291
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
 msgstr ""
 
-#: ../src/common/config.py:264
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
+#: ../src/common/config.py:292
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
+#: ../src/common/config.py:293
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
+#: ../src/common/config.py:294
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:268
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
+#: ../src/common/config.py:296
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr ""
 
-#: ../src/common/config.py:269
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
+#: ../src/common/config.py:297
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:298
 #, fuzzy
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Denetimler arasındaki süre %lu saniye olarak belirleniyor\n"
 
-#: ../src/common/config.py:271
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
+#: ../src/common/config.py:299
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:272
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
+#: ../src/common/config.py:300
+msgid ""
+"Ask offline status message to all offline contacts when connection to an "
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:273
-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!"
+#: ../src/common/config.py:301
+msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
-msgid "If True, completion in groupchats will be like a shell auto-completion"
+#: ../src/common/config.py:302
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:275
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
+#: ../src/common/config.py:307
+msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
-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."
+#: ../src/common/config.py:308
+msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
+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 ""
+
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:284
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
+#: ../src/common/config.py:314
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:296
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
 msgstr ""
 
-#: ../src/common/config.py:304
-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"
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:332
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+
+#: ../src/common/config.py:340
+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:341
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:307
-msgid "If True, Contacts requesting authorization will be automatically accepted."
+#: ../src/common/config.py:343
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:308
-msgid "If False, this account will be disabled and will not appear in roster window."
+#: ../src/common/config.py:344
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 
-#: ../src/common/config.py:311
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
+#: ../src/common/config.py:347
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:315
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
+#: ../src/common/config.py:351
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:316
-msgid "Show a warning dialog before sending password on an plaintext connection."
+#: ../src/common/config.py:352
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:318
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
+#: ../src/common/config.py:354
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
+"Bunu işaretleyince Gajim göndermeden sorar parolayı tehlikeli bir bağlantı "
+"üzerinden göndersin mi diye."
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 #, fuzzy
 msgid "Whitespace sent after inactivity"
 msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
+#: ../src/common/config.py:371
+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:338
+#: ../src/common/config.py:375
 #, fuzzy
 msgid "Jabberd2 workaround"
 msgstr "Bug'ları hallet"
 
-#: ../src/common/config.py:341
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
+#: ../src/common/config.py:378
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:393
 #, fuzzy
 msgid "Answer to receipt requests"
 msgstr "matematik probleminin yanıtını yaz"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:394
 #, fuzzy
 msgid "Sent receipt requests"
 msgstr "     İsteklerin gideceği adres: %(requestaddr)s"
 
-#: ../src/common/config.py:366
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
+#: ../src/common/config.py:403
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
 msgstr ""
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s size bir dosya göndermek istiyor."
+
+#: ../src/common/config.py:405
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr ""
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:409
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Kimliksiz kimlik doğrulaması"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Kimliksiz kimlik doğrulaması"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Bu dizin için seçici erişim etkinleştirilmemiş"
 
-#: ../src/common/config.py:432
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
+#: ../src/common/config.py:478
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
 msgstr ""
 
-#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:442
-msgid "all or space separated status"
+#: ../src/common/config.py:483
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
 msgstr ""
 
-#: ../src/common/config.py:443
-#, fuzzy
-msgid "'yes', 'no', or 'both'"
-msgstr "Cevap \"evet\" ya da \"hayır\""
+#: ../src/common/config.py:484
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:444 ../src/common/config.py:446
-#: ../src/common/config.py:447 ../src/common/config.py:450
-#: ../src/common/config.py:451
-#, fuzzy
-msgid "'yes', 'no' or ''"
-msgstr "Hiçbir anahtar seçilmedi"
+#: ../src/common/config.py:487
+msgid ""
+"State whether plugins should be activated on startup (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:457 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 #, fuzzy
 msgid "Sleeping"
 msgstr "Uyuyan bir kapibara."
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:493
 #, fuzzy
 msgid "Back soon"
 msgstr "Geri Düğme"
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:493
 #, fuzzy
 msgid "Back in some minutes."
 msgstr "Bekleme süresi (dakikalar)"
 
-#: ../src/common/config.py:459 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Yemelik"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Yemek yiyorum, bu yüzden bana bir mesaj brak."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Filim"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Bir filim bakiyorum."
 
-#: ../src/common/config.py:461 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr " Çalışılıyor"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr " Çalışılıyorum"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Telefondayım"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Dış"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:498
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "%(nickname)s Çıktı"
 
-#: ../src/common/config.py:474
+#: ../src/common/config.py:509
 #, fuzzy
 msgid "I'm available."
 msgstr "Mevcut Değil"
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Sohbet için Hazırım"
 
-#: ../src/common/config.py:476 ../src/config.py:1576
+#: ../src/common/config.py:511 ../src/config.py:1646
 #, fuzzy
 msgid "Be right back."
 msgstr "Hemen Dönecek"
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:512
 #, fuzzy
 msgid "I'm not available."
 msgstr "Mevcut Değil"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Rahatsız Etme."
 
-#: ../src/common/config.py:479 ../src/common/config.py:480
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Güle Güle!"
 
-#: ../src/common/config.py:490
-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."
+#: ../src/common/config.py:526
+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:491
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:500 ../src/common/optparser.py:301
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "yeşil"
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:287
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "bakkal"
 
-#: ../src/common/config.py:508
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "insan"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "denizcilik"
 
-#: ../src/common/connection_handlers.py:84
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+#: ../src/common/config.py:555
 #, fuzzy
-msgid "Unable to load idle module"
-msgstr "Yüklenecek Lua arayüz modülü"
+msgid "Tor"
+msgstr "Kime"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers_events.py:370
 #, python-format
-msgid "Registration information for transport %s has not arrived in time"
+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 ""
 
-#: ../src/common/connection_handlers.py:124
-#, fuzzy
-msgid "Registration succeeded"
-msgstr "Onay başarılı oldu."
-
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers_events.py:825
 #, fuzzy, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
+msgid "unsubscribe request from %s"
+msgstr "Dosya Gönderme Soru"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 #, fuzzy
-msgid "Registration failed"
-msgstr "Bağlantı Kurulamıyor"
+msgid "Disk Write Error"
+msgstr "<b>Bir hata oluştu:</b>"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, python-format
-msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)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 ""
 
-#: ../src/common/connection_handlers.py:438
-#: ../src/common/connection_handlers.py:1576
-#: ../src/common/connection_handlers.py:1627
-#: ../src/common/connection_handlers.py:1821
-#: ../src/common/connection_handlers.py:1972 ../src/common/connection.py:433
-#: ../src/gajim.py:345
-#, fuzzy
-msgid "Disk Write Error"
-msgstr "<b>Bir hata oluştu:</b>"
-
-#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
 #, fuzzy
-msgid "Invisibility not supported"
-msgstr "Rahatsız etmeyin"
+msgid "Room has been destroyed"
+msgstr "Yeni bir oda yaratılmıştır"
 
-#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
-#, fuzzy, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "Dalga %s biçimini desteklemiyor..."
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:1397 ../src/common/connection.py:248
-#: ../src/config.py:2045 ../src/config.py:2054 ../src/config.py:2113
-#: ../src/config.py:3502 ../src/dataforms_widget.py:577 ../src/dialogs.py:2922
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Geçersiz Jabber kimliği"
 
-#: ../src/common/connection_handlers.py:1398
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1579
-#: ../src/common/connection_handlers.py:1630
-#: ../src/common/connection_handlers.py:1825
-#: ../src/common/connection_handlers.py:1975 ../src/common/connection.py:437
-#: ../src/gajim.py:157 ../src/session.py:135
-#, 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)."
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "Kişisel ilet gönderimi başarısız"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers_events.py:1608
 #, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Rahatsız etmeyin"
+msgid "Unknown SSL error: %d"
+msgstr "<b>Bir hata oluştu:</b>"
 
-#. maximum user number reached
-#. we are banned
-#. group chat does not exist
-#: ../src/common/connection_handlers.py:1771
-#: ../src/common/connection_handlers.py:1779
-#: ../src/common/connection_handlers.py:1785
-#: ../src/common/connection_handlers.py:1788
-#: ../src/common/connection_handlers.py:1791
-#: ../src/common/connection_handlers.py:1795 ../src/gui_interface.py:138
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 #, fuzzy
-msgid "Unable to join group chat"
-msgstr "Grup eklenemedi: grup zaten var"
+msgid "New Single Message"
+msgstr "Tek Bir İleti Gönder…"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "\"%s\"den yeni bir ileti aldın"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Yeni kişisel Mesaj"
 
-#: ../src/common/connection_handlers.py:1772
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "New Private Message from group chat %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1780
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
-msgid "You are banned from group chat %s."
-msgstr ""
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/connection_handlers.py:1786
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "grup %s yok - root kullanılacak\n"
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "%(nickname)s yazdı"
 
-#: ../src/common/connection_handlers.py:1789
-msgid "Group chat creation is restricted."
-msgstr ""
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Yeni Mesaj"
 
-#: ../src/common/connection_handlers.py:1792
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr ""
+msgid "New Message from %(nickname)s"
+msgstr "%(nickname)s den Yeni İlet alındı"
 
-#: ../src/common/connection_handlers.py:1796
+#: ../src/common/connection_handlers_events.py:2375
 #, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr ""
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Durumu değiştirdi"
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1840
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s durumu şimdi %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
 #, fuzzy
-msgid "Room has been destroyed"
-msgstr "Yeni bir oda yaratılmıştır"
+msgid "Contact Changed Status"
+msgstr "%(nick)s Durumu değiştirdi"
 
-#: ../src/common/connection_handlers.py:1848
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Girdi"
 
-#: ../src/common/connection_handlers.py:1884
-msgid "I would like to add you to my roster."
-msgstr "Seni benim kişi listeye eklemek isterdim"
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+#, fuzzy
+msgid "Contact Signed In"
+msgstr "%(nickname)s Girdi"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1905
-#, fuzzy, python-format
-msgid "we are now subscribed to %s"
-msgstr "Şu an \"%s\" veritabanına bağlısınız"
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Çıktı"
 
-#: ../src/common/connection_handlers.py:1907
-#, fuzzy, python-format
-msgid "unsubscribe request from %s"
-msgstr "Dosya Gönderme Soru"
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+#, fuzzy
+msgid "Contact Signed Out"
+msgstr "%(nickname)s Çıktı"
 
-#: ../src/common/connection_handlers.py:1909
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Yüklenecek Lua arayüz modülü"
+
+#: ../src/common/connection_handlers.py:127
 #, python-format
-msgid "we are now unsubscribed from %s"
+msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:135
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Onay başarılı oldu."
+
+#: ../src/common/connection_handlers.py:136
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
+
+#: ../src/common/connection_handlers.py:145
+#, fuzzy
+msgid "Registration failed"
+msgstr "Bağlantı Kurulamıyor"
+
+#: ../src/common/connection_handlers.py:146
 #, 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"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Rahatsız etmeyin"
+
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
+#, fuzzy, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr "Dalga %s biçimini desteklemiyor..."
+
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Seni benim kişi listeye eklemek isterdim"
+
+#: ../src/common/connection.py:70
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 #, fuzzy
 msgid "CRL signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 #, fuzzy
 msgid "Certificate is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 #, fuzzy
 msgid "CRL has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 #, fuzzy
 msgid "Out of memory"
 msgstr "%(nickname)s Çıktı"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 #, fuzzy
 msgid "Self signed certificate"
 msgstr "%(nickname)s Girdi"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 #, fuzzy
 msgid "Self signed certificate in certificate chain"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 #, fuzzy
 msgid "Unable to get local issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Unable to verify the first certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Certificate chain too long"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 #, fuzzy
 msgid "Certificate revoked"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Geçersiz Jabber kimliği"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 #, fuzzy
 msgid "Path length constraint exceeded"
 msgstr "Kağıt Uçağın Gideceği Yol Uzunluğu"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 #, fuzzy
 msgid "Unsupported certificate purpose"
 msgstr "Sertifika doğrulama hatası (%s)"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 #, fuzzy
 msgid "Certificate not trusted"
 msgstr "GPG anahtara güvenilmiyor"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "^Rededilmiş durumunu değiştir"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 #, fuzzy
 msgid "Subject issuer mismatch"
 msgstr "ifade yığıtı uyumsuzluğu"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 #, fuzzy
 msgid "Application verification failure"
 msgstr "'%s' çözülürken geçici bozukluk"
 
-#: ../src/common/connection.py:249 ../src/dialogs.py:2923
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 
-#: ../src/common/connection.py:271
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:274
+#: ../src/common/connection.py:307
 #, 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:322
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr ""
 
-#: ../src/common/connection.py:423
+#: ../src/common/connection.py:507
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
 "%(message)s"
 msgstr "iletinin konusu"
 
-#: ../src/common/connection.py:789
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:790
+#: ../src/common/connection.py:931
 #, fuzzy
 msgid "Reconnect manually."
 msgstr "_Elle gir"
 
-#: ../src/common/connection.py:802
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:836
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:849
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "<b>Bir hata oluştu:</b>"
-
-#. wrong answer
-#: ../src/common/connection.py:864
+#: ../src/common/connection.py:1001
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Geçersiz takma ad"
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
-#: ../src/common/connection.py:1766
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1297
 #, fuzzy, python-format
-msgid "Could not connect to \"%s\""
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Resim acılamadı"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Resim acılamadı"
 
-#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr ""
 
-#: ../src/common/connection.py:1152
+#: ../src/common/connection.py:1307
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "MUC sunucusu"
 
-#: ../src/common/connection.py:1165
+#: ../src/common/connection.py:1322
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "\"%s\" veritabanına bağlantı başarısız oldu: %s"
 
-#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "%s: %s veritabanına bağlanılamadı\n"
 
-#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 
-#: ../src/common/connection.py:1222
+#: ../src/common/connection.py:1388
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "sertifika elde edilemedi: %s\n"
 
-#: ../src/common/connection.py:1225
+#: ../src/common/connection.py:1391
 #, fuzzy, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr "Hata açıklaması…"
 
-#: ../src/common/connection.py:1227
+#: ../src/common/connection.py:1393
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: ../src/common/connection.py:1276
-msgid "Check your connection or try again later"
-msgstr ""
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "sertifika elde edilemedi: %s\n"
 
-#: ../src/common/connection.py:1307
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, fuzzy, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Resim acılamadı"
+
+#: ../src/common/connection.py:1498
 #, fuzzy, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Kimliksiz kimlik doğrulaması"
 
-#: ../src/common/connection.py:1309
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr ""
 
-#: ../src/common/connection.py:1378
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr ""
 
-#: ../src/common/connection.py:1379
+#: ../src/common/connection.py:1575
 #, 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."
+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:1632
+#: ../src/common/connection.py:2067
 #, fuzzy, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Kişinin bağlantısı kesildi"
 
-#: ../src/common/connection.py:1635
+#: ../src/common/connection.py:2070
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kişileri eşzamana getir"
 
-#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2219
+#: ../src/common/connection.py:2826
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: ../src/common/connection.py:2220
+#: ../src/common/connection.py:2827
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Sunucuyla iletişimde kurulurken hata oluştu. Bağlantı kapatılıyor."
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:673
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "İzlemci"
 
-#: ../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:1501 ../src/gui_interface.py:423
-#: ../src/roster_window.py:856 ../src/roster_window.py:1524
-#: ../src/roster_window.py:1605 ../src/roster_window.py:1607
-#: ../src/roster_window.py:1766
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Taşıma"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 #, fuzzy
 msgid "Not in roster"
 msgstr "Kişi listesindeki olayları göster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr ""
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr ""
 
@@ -4303,7 +5354,7 @@ msgstr "Dosya okunamıyor (%s)\n"
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 
@@ -4369,8 +5420,7 @@ msgstr "on"
 msgid "eleven"
 msgstr "onbir"
 
-#. 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
 #, fuzzy, python-format
@@ -4490,251 +5540,297 @@ msgstr "Ayrıştırmayı bitir"
 msgid "Weekend!"
 msgstr "Hafta sonu!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:158
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:163
 #, fuzzy
 msgid "Invalid character in username."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: ../src/common/helpers.py:156
-#, fuzzy
-msgid "Server address required."
-msgstr "<b>Lütfen sunucu seçiniz</b>"
+#: ../src/common/helpers.py:169
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:174
 #, fuzzy
 msgid "Invalid character in hostname."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:176
+#, fuzzy
+msgid "Server address required."
+msgstr "<b>Lütfen sunucu seçiniz</b>"
+
+#: ../src/common/helpers.py:180
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:185
 #, fuzzy
 msgid "Invalid character in resource."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Meşgul"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Meşgul"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Mevcut Değil"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Mevcut Değil"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "Sohbet için _Hazır"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Sohbet için Hazır"
 
-#: ../src/common/helpers.py:224
-msgid "_Available"
-msgstr "_Mevcut Değil"
+#: ../src/common/helpers.py:240
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?transfer status:Duraklanıldı"
 
-#: ../src/common/helpers.py:226 ../src/features_window.py:114
-msgid "Available"
-msgstr "Mevcut"
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?transfer status:Duraklanıldı"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "_Uzakta"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "Bağlı _değil"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Bağlı değil"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "Görünmez"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Görünmez"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Bilinmez"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Hatalı"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Hiç biri"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Kime"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:274
+msgid "From"
+msgstr "Gönderen"
+
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "İkisi de"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Hiç biri"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Üye yap"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatör"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderatör"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Katılanlar"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Katılan"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Ziyaretçiler"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Ziyaretçi"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Hiç biri"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Sahibi"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Yönetici"
 
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Üye"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "sobete dikkat veriyor"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "başka bir şey yapıyor"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "ilet yazıyor…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "ilet yazarken durdu"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr ""
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Ileti alınıyor"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " gönderen oda %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " gönderen kişi %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " gönderen %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, fuzzy, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "Kişi listesindeki olayları göster"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "Merhaba, benim adım $name."
 
-#: ../src/common/jingle_rtp.py:106
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Resimi Farklı Kaydet..."
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Resim çok büyük"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "Sertifika henüz geçerli değil"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Resimi Farklı Kaydet..."
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Hata açıklaması…"
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -4746,103 +5842,129 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:299
+#: ../src/common/jingle_rtp.py:220
+msgid "GStreamer error"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:220
+#, fuzzy, python-format
+msgid ""
+"Error: %s\n"
+"Debug: %s"
+msgstr "Ileti alınıyor"
+
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "ses girdisi"
 
-#: ../src/common/jingle_rtp.py:302
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "ses çıktısı"
 
-#: ../src/common/jingle_rtp.py:331
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "video girdisi"
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "video çıktısı"
 
-#: ../src/common/latex.py:109
-#, fuzzy, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "<b>Bir hata oluştu:</b>"
-
 #: ../src/common/logging_helpers.py:33
 #, fuzzy, python-format
 msgid "%s is not a valid loglevel"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Ses giriş aygıtı"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:53
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Ses testi"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:56
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:82
-#: ../src/common/multimedia_helpers.py:99
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 #, fuzzy
 msgid "Autodetect"
 msgstr "Otomatik belirle"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:59
-#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Dosya: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:67
-#: ../src/common/multimedia_helpers.py:94
+#: ../src/common/multimedia_helpers.py:79
 #, fuzzy
 msgid "Fake audio output"
 msgstr "Ses çıkış aygıtı"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Video testi"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:84
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:96
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "yeşil"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "video çıktısı"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X Pencere Sistemi (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X Window System (Xv'sis)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
-#, fuzzy, python-format
-msgid "error: cannot open %s for reading"
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
+#, python-format
+msgid "Error: cannot open %s for reading"
 msgstr "Hata: %s okumak için açılamıyor"
 
-#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 #, fuzzy
 msgid "cyan"
 msgstr "turkuaz"
 
-#: ../src/common/optparser.py:376
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -5514,97 +6636,186 @@ msgstr "Okumakta"
 msgid "Writing"
 msgstr "%s yazılıyor..."
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "öntanımlı"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "denizcilik"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Saklanmada"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Hesap"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Hesap sırası"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Açıklama"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Hata"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "bir"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "oda"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "?Client:Bilinmez"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 #, fuzzy
 msgid "Unknown Title"
 msgstr "?Client:Bilinmez"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 #, fuzzy
 msgid "Unknown Source"
 msgstr "?Client:Bilinmez"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, fuzzy, python-format
-msgid "Unable to bind to port %s."
-msgstr "PORT komutu gönderilemiyor"
-
-#: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr ""
-
 #. 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.]"
+#: ../src/common/stanza_session.py:425
+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:193
 #, fuzzy
 msgid "Avahi error"
 msgstr "Hata açıklaması…"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, 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:206
 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:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 #, fuzzy
 msgid "Could not start local service"
 msgstr "%s: \"%s\" servisi başlatılamadı: Hata kodu %d\n"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "PORT komutu gönderilemiyor"
 
-#: ../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:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Durum satırı okunamadı"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 #, fuzzy
 msgid "Your message could not be sent."
-msgstr "İleti gönderilmemiş olabilir çünkü görünmez iken yollamaya izin verilmiyor:"
+msgstr ""
+"İleti gönderilmemiş olabilir çünkü görünmez iken yollamaya izin verilmiyor:"
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:334
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 #, fuzzy
 msgid "Contact is offline. Your message could not be sent."
 msgstr "İleti gönderilmemiş olabilir çünkü kullanıcı çevrimdışı:"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:359
-msgid "Connection to host could not be established: Timeout while sending data."
+#: ../src/common/zeroconf/connection_zeroconf.py:394
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
 msgstr ""
 
 #: ../src/common/zeroconf/zeroconf_avahi.py:192
@@ -5613,289 +6824,298 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Eklentilerin etkinleştirilmesinde hata #%d."
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Öntanımlı İlet"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 #, fuzzy
 msgid "Enabled"
 msgstr "Etkin"
 
-#: ../src/config.py:721 ../src/dialogs.py:1394
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
+msgid "Default"
+msgstr "Öntanımlı"
+
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Oynatıcı için erişim türü kullanılır değil: %s\n"
 
-#: ../src/config.py:722
+#: ../src/config.py:748
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1190
+#: ../src/config.py:1226
 #, fuzzy
 msgid "status message title"
 msgstr "Durum ileti değiştir"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1226
 #, fuzzy
 msgid "status message text"
 msgstr "Durum ileti değiştir"
 
 #. Name column
-#: ../src/config.py:1490 ../src/dialogs.py:2374 ../src/dialogs.py:2440
-#: ../src/dialogs.py:3207 ../src/disco.py:868 ../src/disco.py:1727
-#: ../src/disco.py:2029 ../src/history_window.py:90
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Adı"
 
-#: ../src/config.py:1585
+#: ../src/config.py:1656
 #, fuzzy
 msgid "Relogin now?"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: ../src/config.py:1586
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1722 ../src/config.py:1847
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr ""
 
-#: ../src/config.py:1887 ../src/config.py:1934
+#: ../src/config.py:1990 ../src/config.py:2039
 #, fuzzy
 msgid "Unread events"
 msgstr "Okunmamış iletler var"
 
-#: ../src/config.py:1888
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1917
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr ""
 
-#: ../src/config.py:1918
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 #, fuzzy
 msgid "You are currently connected to the server"
 msgstr "Şuanda bu sunuca bağlanmış kişilere bir ilet gönder"
 
-#: ../src/config.py:1931
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1935
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 
-#: ../src/config.py:1941
+#: ../src/config.py:2046
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Benim _kullanmak istediyim bir hesapım var bile"
 
-#: ../src/config.py:1942
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:2047
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr ""
 
-#: ../src/config.py:1946 ../src/config.py:1950
+#: ../src/config.py:2051 ../src/config.py:2056
 #, fuzzy
 msgid "Invalid account name"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../src/config.py:1947
+#: ../src/config.py:2052
 #, fuzzy
 msgid "Account name cannot be empty."
 msgstr "ayraç bir boş dizge olamaz"
 
-#: ../src/config.py:1951
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr ""
 
-#: ../src/config.py:2026
+#: ../src/config.py:2138
 #, fuzzy
 msgid "Rename Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: ../src/config.py:2027
+#: ../src/config.py:2139
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Grup %s için yeni isim giriniz: "
 
-#: ../src/config.py:2055
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:2263 ../src/config.py:3548
+#: ../src/config.py:2394 ../src/config.py:3726
 #, fuzzy
 msgid "Invalid entry"
 msgstr "Geçersiz takma ad"
 
-#: ../src/config.py:2264 ../src/config.py:3549
+#: ../src/config.py:2395 ../src/config.py:3727
 #, fuzzy
 msgid "Custom port must be a port number."
 msgstr "url portu bir sayı olmalı\n"
 
-#: ../src/config.py:2285
+#: ../src/config.py:2417
 #, fuzzy
 msgid "Failed to get secret keys"
 msgstr "geçerli bağlam almada başarısız"
 
-#: ../src/config.py:2286
+#: ../src/config.py:2418
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "İzleyen anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n"
 
-#: ../src/config.py:2320
+#: ../src/config.py:2456
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Hiçbir anahtar seçilmedi"
 
-#: ../src/config.py:2321
+#: ../src/config.py:2457
 #, fuzzy
 msgid "Choose your OpenPGP key"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: ../src/config.py:2328
+#: ../src/config.py:2465
 #, fuzzy
 msgid "No such account available"
 msgstr "Eski revizyon bulunmamakta!"
 
-#: ../src/config.py:2329
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "Önce bir Hesap yapman lazım kişisel ilanlar sayfayı yazımlamak için."
 
-#: ../src/config.py:2336 ../src/dialogs.py:2127 ../src/dialogs.py:2362
-#: ../src/dialogs.py:2548 ../src/disco.py:511 ../src/profile_window.py:325
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: ../src/config.py:2341
-msgid "Your server doesn't support Vcard"
-msgstr ""
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
+msgstr "Dalga %s biçimini desteklemiyor..."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Sunuc kişisel ilanlar sayfayı kaydet edemedi"
 
-#: ../src/config.py:2455 ../src/config.py:2491
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:2460
+#: ../src/config.py:2604
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Dosyası zaten var"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2618
+#: ../src/config.py:2766
 #, fuzzy, python-format
 msgid "Edit %s"
 msgstr "Düz_en"
 
-#: ../src/config.py:2620
+#: ../src/config.py:2768
 #, fuzzy, python-format
 msgid "Register to %s"
 msgstr "Bunu %s buna %s gönder"
 
 #. list at the beginning
-#: ../src/config.py:2656
+#: ../src/config.py:2804
 #, fuzzy
 msgid "Ban List"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2805
 #, fuzzy
 msgid "Member List"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2805
 #, fuzzy
 msgid "Owner List"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2806
 #, fuzzy
 msgid "Administrator List"
 msgstr "Geçersiz Liste İsmi"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2718
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Neden"
 
-#: ../src/config.py:2725
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Takma Ad"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2893
 #, fuzzy
 msgid "Role"
 msgstr "<b>rol:</b>"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr ""
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2760
+#: ../src/config.py:2922
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
-#: ../src/config.py:2762
+#: ../src/config.py:2924
 #, fuzzy
 msgid "Adding Member..."
 msgstr "Zaten listeye üye"
 
-#: ../src/config.py:2763
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2765
+#: ../src/config.py:2927
 #, fuzzy
 msgid "Adding Owner..."
 msgstr "Sahip geçersiz"
 
-#: ../src/config.py:2766
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2768
+#: ../src/config.py:2930
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "liste yöneticisi"
 
-#: ../src/config.py:2769
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2770
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5905,46 +7125,46 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2871
+#: ../src/config.py:3033
 #, fuzzy, python-format
 msgid "Removing %s account"
 msgstr "XMPP hesabı %s@%s"
 
-#: ../src/config.py:2886
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Dosya boş"
 
-#: ../src/config.py:2887
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2900 ../src/gui_interface.py:1130
-#: ../src/gui_interface.py:1227
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 #, fuzzy
 msgid "Password Required"
 msgstr "Şifre gerekli"
 
-#: ../src/config.py:2901 ../src/gui_interface.py:1207
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, fuzzy, python-format
 msgid "Enter your password for account %s"
 msgstr "Gadu-Gudu hesabı için parola değiştir"
 
-#: ../src/config.py:2902 ../src/gui_interface.py:1227
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 #, fuzzy
 msgid "Save password"
 msgstr "Parolayı Değiştir"
 
-#: ../src/config.py:2912
+#: ../src/config.py:3074
 #, fuzzy, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "ping:  Bağlanılan sunucuya PING at."
 
-#: ../src/config.py:2913
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2927
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr ""
@@ -5952,106 +7172,103 @@ msgstr ""
 "\n"
 "Bekleyiniz lütfen..."
 
-#: ../src/config.py:2928
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Seni benim kişi listeye eklemek isterdim"
 
-#: ../src/config.py:2929
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Gruptan kullanıcı çıkart:"
 
-#: ../src/config.py:2930
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3023
-msgid "Default"
-msgstr "Öntanımlı"
-
-#: ../src/config.py:3023
+#: ../src/config.py:3185
 #, fuzzy
 msgid "?print_status:All"
 msgstr "grupdaki herkez"
 
-#: ../src/config.py:3024
+#: ../src/config.py:3186
 #, fuzzy
 msgid "Enter and leave only"
 msgstr "ve 'boşluk' ya da 'enter' tuşuna bas."
 
-#: ../src/config.py:3025
+#: ../src/config.py:3187
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Durumu a_yarla"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3246
 #, fuzzy
 msgid "New Group Chat"
 msgstr "_Yeni Bir Grup Sohbeti"
 
-#: ../src/config.py:3128
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:3129
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:3280
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#. invalid char
-#: ../src/config.py:3247 ../src/dialogs.py:1925
-msgid "Invalid nickname"
-msgstr "Geçersiz takma ad"
-
-#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Rahatsız etmeyin"
 
-#: ../src/config.py:3261 ../src/config.py:3524
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Geçersiz sunucu"
 
-#: ../src/config.py:3275
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Geçersiz oda"
 
-#: ../src/config.py:3441
+#: ../src/config.py:3614
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "'%s' (%d) öğesi zaten bir görüntüye eklenmiş"
 
-#: ../src/config.py:3442 ../src/config.py:3448
-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."
+#: ../src/config.py:3615 ../src/config.py:3621
+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:3447
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr ""
 
-#: ../src/config.py:3485
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Geçersiz kullanıcı adı"
 
-#: ../src/config.py:3487
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: ../src/config.py:3525
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr ""
 
-#: ../src/config.py:3581 ../src/gui_interface.py:1886
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Dosyası zaten var"
 
-#: ../src/config.py:3582 ../src/gui_interface.py:1887
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3655
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6061,7 +7278,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3661 ../src/gui_interface.py:1914
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6071,764 +7288,851 @@ msgstr ""
 "Bu doğruluk belgeyi bilinen doğruluk belgelere kat.\n"
 "SHA1 doğruluk belgenin parmakizi:\n"
 
-#: ../src/config.py:3691 ../src/config.py:3724
+#: ../src/config.py:3888 ../src/config.py:3922
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Aralık yeniden konumlandırılması sırasında bir hata oluştu."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3987
 #, fuzzy
 msgid "Account name is in use"
 msgstr "Bu sohbet adı zaten kullanımda"
 
-#: ../src/config.py:3792
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr ""
 
-#: ../src/config.py:3945
+#: ../src/config.py:4118
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:4119
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Yerleştir"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktif"
 
-#: ../src/config.py:3953
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Olay"
 
-#: ../src/config.py:3988
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Üyelik ileti _kaydet"
+
+#: ../src/config.py:4206
 #, fuzzy
 msgid "First Message Received"
 msgstr "Üyelik ileti _kaydet"
 
-#: ../src/config.py:3989
+#: ../src/config.py:4207
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4209
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4210
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Kişinin bağlantısı kesildi"
 
-#: ../src/config.py:3993
+#: ../src/config.py:4211
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Kişinin bağlantısı kesildi"
 
-#: ../src/config.py:3994
+#: ../src/config.py:4212
 #, fuzzy
 msgid "Message Sent"
 msgstr "Ileti alınıyor"
 
-#: ../src/config.py:3995
+#: ../src/config.py:4213
 #, fuzzy
 msgid "Group Chat Message Highlight"
 msgstr "%s grup sohbete katıldı"
 
-#: ../src/config.py:3996
+#: ../src/config.py:4214
 #, fuzzy
 msgid "Group Chat Message Received"
 msgstr "%s grup sohbete katıldı"
 
-#: ../src/config.py:3997
+#: ../src/config.py:4215
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Yeni _GMail e-postadan haber ver"
 
-#: ../src/conversation_textview.py:599
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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:618
+#: ../src/conversation_textview.py:673
 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:738
+#: ../src/conversation_textview.py:793
 #, fuzzy
 msgid "_Quote"
 msgstr "Alıntı"
 
-#: ../src/conversation_textview.py:745
+#: ../src/conversation_textview.py:800
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "%s hesapına"
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:813
 #, fuzzy
 msgid "Read _Wikipedia Article"
 msgstr "Makale okunmuş"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr ""
 
-#: ../src/conversation_textview.py:779
+#: ../src/conversation_textview.py:835
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:792
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr ""
 
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:851
 #, fuzzy
 msgid "Web _Search for it"
 msgstr "Olaylamak için bir daha tuşla:"
 
-#: ../src/conversation_textview.py:801
+#: ../src/conversation_textview.py:857
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Dosya Farklı Kaydet..."
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1292
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Konu: %s\n"
 
-#: ../src/dataforms_widget.py:581
+#: ../src/dataforms_widget.py:575
+#, fuzzy
+msgid "Unable to load image"
+msgstr "Yüklenecek Lua arayüz modülü"
+
+#: ../src/dataforms_widget.py:577
+#, fuzzy, python-format
+msgid "Media type not supported: %s"
+msgstr "Rahatsız etmeyin"
+
+#: ../src/dataforms_widget.py:592
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber kimliği zaten listede"
 
-#: ../src/dataforms_widget.py:582
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:593
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "yeni@jabber.kimliği"
 
-#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "yeni%d@jabber.kimliği"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "İlk Ad:"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber kimliği: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grup"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "Grupda"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:299
 #, fuzzy
 msgid "KeyID"
 msgstr "%s için anahtar numarasını belirleyin: "
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:304
 #, fuzzy
 msgid "Contact name"
 msgstr "İlk Ad:"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Ruh Halini Ayarla"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:599
 #, fuzzy, python-format
 msgid "%s Status Message"
 msgstr "durum ileti"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:613
 #, fuzzy
 msgid "Status Message"
 msgstr "durum ileti"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Durum ileti değiştir"
 
-#: ../src/dialogs.py:794
-msgid "This name is already used. Do you want to overwrite this status message?"
+#: ../src/dialogs.py:805
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr ""
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM Adres:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Numara:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Numara:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN Adres:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adres:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:886
 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:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 #, fuzzy
 msgid "Invalid User ID"
 msgstr "Geçersiz Jabber kimliği"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr ""
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1106
 #, fuzzy
 msgid "Contact already in roster"
 msgstr "Kişi listesindeki olayları göster"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr ""
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Kullanıcı kimliği:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1279
 #, fuzzy
-msgid "A GTK+ jabber client"
+msgid "A GTK+ Jabber/XMPP client"
 msgstr "Geçersiz Jabber kimliği"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1280
 #, fuzzy
 msgid "GTK+ Version:"
 msgstr "GTK+ Runtime Sürümü"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1281
 #, fuzzy
 msgid "PyGTK Version:"
 msgstr "<b>Kurulu Sürüm</b>"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1291
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Şu Anki Geliştiriciler"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1293
 #, fuzzy
 msgid "Past Developers:"
 msgstr "Şu Anki Geliştiriciler"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "Teşekkürler:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1305
 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:1317
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/dialogs.py:1395
+#: ../src/dialogs.py:1500
 #, 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 ""
 
-#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Tehlikeli bağlantı"
+
+#: ../src/dialogs.py:1846
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Evet, gerçekten tehlikeli bağlanmak istiyorum"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "_Do not ask me again"
+msgstr "Bu iletişim kutusunu bir daha _gösterme"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
 
-#: ../src/dialogs.py:2044
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2280
 #, fuzzy, python-format
 msgid "Subscription request from %s"
 msgstr "Dosya Gönderme Soru"
 
-#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr ""
 
-#: ../src/dialogs.py:2128
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: ../src/dialogs.py:2169
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:2300
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Adres yanlış"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "%s mevcut bir grubun ismi değil"
+
+#: ../src/dialogs.py:2598
 #, fuzzy
 msgid "Invalid Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: ../src/dialogs.py:2301
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2599
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
 msgstr ""
 
-#: ../src/dialogs.py:2312
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Geçersiz Takma ad"
 
-#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
-#: ../src/groupchat_control.py:1758
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Geçersiz grup sohbet Jabber kimliği"
 
-#: ../src/dialogs.py:2318
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 
-#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 
-#: ../src/dialogs.py:2331
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: ../src/dialogs.py:2332
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: ../src/dialogs.py:2363
+#: ../src/dialogs.py:2663
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:2676
 #, fuzzy
 msgid "Server"
 msgstr "_Sunuc:"
 
-#: ../src/dialogs.py:2412
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2738
 #, fuzzy
 msgid "Synchronise"
 msgstr "Kişileri eşzamana getir"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2799
 #, fuzzy, python-format
 msgid "Start Chat with account %s"
 msgstr "Kişiyle sohbet pencere _aç"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2801
 #, fuzzy
 msgid "Start Chat"
 msgstr "Sohbet _Başla"
 
-#: ../src/dialogs.py:2501
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 
 #. if offline or connecting
-#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 #, fuzzy
 msgid "Connection not available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Yerel jid:"
 
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2842
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Durumu a_yarla"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2851
 #, fuzzy
 msgid "Without a connection, you can not change your password."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: ../src/dialogs.py:2568
+#: ../src/dialogs.py:2870
 #, fuzzy
 msgid "Invalid password"
 msgstr "Parolayı Değiştir"
 
-#: ../src/dialogs.py:2568
+#: ../src/dialogs.py:2870
 #, fuzzy
 msgid "You must enter a password."
 msgstr "Odaya girmek için gerekli parola"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2874
 #, fuzzy
 msgid "Passwords do not match"
 msgstr "Bu iletişim kutusunu bir daha _gösterme"
 
-#: ../src/dialogs.py:2573
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#. default value
-#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
-#, fuzzy
-msgid "Contact Signed In"
-msgstr "%(nickname)s Girdi"
-
-#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
-#, fuzzy
-msgid "Contact Signed Out"
-msgstr "%(nickname)s Çıktı"
-
-#. chat message
-#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
-#: ../src/notify.py:507
-msgid "New Message"
-msgstr "Yeni Mesaj"
-
-#. single message
-#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
-#: ../src/notify.py:507
-#, fuzzy
-msgid "New Single Message"
-msgstr "Tek Bir İleti Gönder…"
-
-#. private message
-#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
-#: ../src/notify.py:508
-msgid "New Private Message"
-msgstr "Yeni kişisel Mesaj"
-
-#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Yeni E-mail"
 
-#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 #, fuzzy
 msgid "File Transfer Request"
 msgstr "Dosya Gönderme Soru"
 
-#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
-#: ../src/gui_interface.py:1374 ../src/notify.py:512
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 #, fuzzy
 msgid "File Transfer Error"
 msgstr "Dosya okunurken hata:"
 
-#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
-#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
-#: ../src/notify.py:514
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 #, fuzzy
 msgid "File Transfer Completed"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 #, fuzzy
 msgid "File Transfer Stopped"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
-#, fuzzy
-msgid "Groupchat Invitation"
-msgstr "Sadece davetliler"
-
-#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
-#, fuzzy
-msgid "Contact Changed Status"
-msgstr "%(nick)s Durumu değiştirdi"
-
-#: ../src/dialogs.py:2827
+#: ../src/dialogs.py:3132
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "tek duyarlıklı hesap"
 
-#: ../src/dialogs.py:2829
+#: ../src/dialogs.py:3134
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Ileti cevap da içerilsin mi?"
 
-#: ../src/dialogs.py:2831
+#: ../src/dialogs.py:3136
 #, fuzzy
 msgid "Single Message"
 msgstr "Tek Bir İleti Gönder…"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2834
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Gönder %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2857
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Alındı %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2880
+#: ../src/dialogs.py:3185
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Form"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3268
 #, fuzzy, python-format
 msgid "RE: %s"
 msgstr "Adı _değiştir"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:3269
 #, fuzzy, python-format
 msgid "%s wrote:\n"
 msgstr "Yazıldı: %s\n"
 
-#: ../src/dialogs.py:3018
+#: ../src/dialogs.py:3329
 #, fuzzy, python-format
 msgid "XML Console for %s"
 msgstr "_XML Konsolu Göster"
 
-#: ../src/dialogs.py:3020
+#: ../src/dialogs.py:3331
 #, fuzzy
 msgid "XML Console"
 msgstr "_XML Konsolu Göster"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3151
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "ekle"
 
-#: ../src/dialogs.py:3151
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "~Düzenle"
 
-#: ../src/dialogs.py:3152
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "kaldır"
 
-#: ../src/dialogs.py:3180
+#: ../src/dialogs.py:3508
 #, python-format
-msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
-msgid "Add"
-msgstr "Ekle"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 #, fuzzy
 msgid "Modify"
 msgstr "Düzenle"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
-msgid "Delete"
-msgstr "Sil"
-
-#: ../src/dialogs.py:3204
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber kimliği"
 
-#: ../src/dialogs.py:3210
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Gruplar"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3318
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 
-#: ../src/dialogs.py:3332
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Kişileri eşzamana getir"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Kişileri eşzamana getir"
 
-#: ../src/dialogs.py:3369
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Kişileri eşzamana getir"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Kişileri eşzamana getir"
+
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3779
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Geçersiz Liste İsmi"
 
-#: ../src/dialogs.py:3422
+#: ../src/dialogs.py:3780
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3827
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:4047
+#, fuzzy
+msgid "There is an error"
+msgstr "<b>Bir hata oluştu:</b>"
+
+#: ../src/dialogs.py:4115
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../src/dialogs.py:3426
+#: ../src/dialogs.py:4119
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Sohbet için Hazır"
 
-#: ../src/dialogs.py:3482
+#: ../src/dialogs.py:4186
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "  Etiket     Tip                          İsim/Değer\n"
 
-#: ../src/dialogs.py:3487
+#: ../src/dialogs.py:4191
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Desteklenmeyen eylem '%s'"
 
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:4242
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Kural ekle</b>"
 
-#: ../src/dialogs.py:3642
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Kural ekle</b>"
 
-#: ../src/dialogs.py:3742
+#: ../src/dialogs.py:4452
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Kişisel Gizlilik Listesini biçimle"
 
-#: ../src/dialogs.py:3744
+#: ../src/dialogs.py:4454
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Kişisel Gizlilik Listesini biçimle"
 
-#: ../src/dialogs.py:3814
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../src/dialogs.py:3815
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: ../src/dialogs.py:3847
+#: ../src/dialogs.py:4580
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr ""
 "Şuraya bir yorum gönderiyorsunuz:\n"
 "  "
 
-#: ../src/dialogs.py:3850
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:3852
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4593
 #, fuzzy, python-format
 msgid "Comment: %s"
 msgstr "Yorum:"
 
-#: ../src/dialogs.py:3862
+#: ../src/dialogs.py:4595
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
-#: ../src/dialogs.py:3923
-msgid "Choose Sound"
-msgstr "Ses seç"
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
+msgid "Choose Client Cert #PCKS12"
+msgstr ""
 
-#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Tüm dosyalar"
 
-#: ../src/dialogs.py:3938
+#: ../src/dialogs.py:4679
+msgid "PKCS12 Files"
+msgstr ""
+
+#: ../src/dialogs.py:4706
+msgid "Choose Sound"
+msgstr "Ses seç"
+
+#: ../src/dialogs.py:4721
 #, fuzzy
 msgid "Wav Sounds"
 msgstr "Sesi Kapat"
 
-#: ../src/dialogs.py:3976
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Resim seç"
 
-#: ../src/dialogs.py:3994
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Resimler"
 
-#: ../src/dialogs.py:4061
+#: ../src/dialogs.py:4847
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Resim seç"
+
+#: ../src/dialogs.py:4865
+#, fuzzy
+msgid "Zip files"
+msgstr "Tüm dosyalar"
+
+#: ../src/dialogs.py:4891
 #, fuzzy, python-format
 msgid "When %s becomes:"
 msgstr "ben burdaysam"
 
-#: ../src/dialogs.py:4063
+#: ../src/dialogs.py:4893
 #, fuzzy, python-format
 msgid "Adding Special Notification for %s"
 msgstr "bildiriyi beklemeyi durdur"
 
-#: ../src/dialogs.py:4138
-#, fuzzy
-msgid "Condition"
-msgstr "Tanımlanmamış Koşul"
-
-#: ../src/dialogs.py:4258
-#, fuzzy
-msgid "when I am "
-msgstr "ben burdaysam"
-
-#: ../src/dialogs.py:4734
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6836,592 +8140,667 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4737
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 #, fuzzy
 msgid "Contact's identity verified"
 msgstr "Yeni Kişi Ekle"
 
-#: ../src/dialogs.py:4749
+#: ../src/dialogs.py:5128
 #, fuzzy
 msgid "Verify again..."
 msgstr "Tekrar dene ? [e/H] "
 
-#: ../src/dialogs.py:4754
-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."
+#: ../src/dialogs.py:5133
+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:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 #, fuzzy
 msgid "Contact's identity NOT verified"
 msgstr "Passport hesabı henüz doğrulanmadı"
 
-#: ../src/dialogs.py:4762
+#: ../src/dialogs.py:5141
 #, fuzzy
 msgid "Verify..."
 msgstr "Doğrulama "
 
-#: ../src/dialogs.py:4773
+#: ../src/dialogs.py:5152
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "%s ile iletişim kurmak istiyor musunuz?"
 
-#: ../src/dialogs.py:4774
+#: ../src/dialogs.py:5153
 #, 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 ""
 
-#: ../src/dialogs.py:4775
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4809
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4815
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4822
-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."
+#: ../src/dialogs.py:5202
+msgid ""
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:4828
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
+#: ../src/dialogs.py:5208
+msgid ""
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4893
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "bir ses ve video"
 
-#: ../src/dialogs.py:4895
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "bir ses"
 
-#: ../src/dialogs.py:4897
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "bir video"
 
-#: ../src/dialogs.py:4901
+#: ../src/dialogs.py:5281
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "%s hesapına"
+
+#: ../src/dialogs.py:5376
 #, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "sertifika hükümsüz kılınmış"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Diğer"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferans"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: ../src/disco.py:591
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr ""
 
-#: ../src/disco.py:593
+#: ../src/disco.py:605
 #, fuzzy
 msgid "Service Discovery"
 msgstr "Avahi Keşif"
 
-#: ../src/disco.py:743
+#: ../src/disco.py:761
 #, fuzzy
 msgid "The service could not be found"
 msgstr "Paket bulunamadı"
 
-#: ../src/disco.py:744
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
+#: ../src/disco.py:762
+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:748 ../src/disco.py:1084
+#: ../src/disco.py:768 ../src/disco.py:1109
 #, fuzzy
 msgid "The service is not browsable"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: ../src/disco.py:749
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:788 ../src/disco.py:798
+#: ../src/disco.py:810 ../src/disco.py:820
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Geçersiz Liste İsmi"
 
-#: ../src/disco.py:852
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: ../src/disco.py:896
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Göz at"
 
-#: ../src/disco.py:1085
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:1325
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "Komuta _Yürüt"
 
-#: ../src/disco.py:1335 ../src/disco.py:1506
+#: ../src/disco.py:1388 ../src/disco.py:1560
 #, fuzzy
 msgid "Re_gister"
 msgstr "Adı _değiştir"
 
-#: ../src/disco.py:1547
+#: ../src/disco.py:1601
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "İndirilen dosya: %(current)li  / %(total)li"
 
 #. Users column
-#: ../src/disco.py:1737
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Kullanıcılar"
 
 #. Description column
-#: ../src/disco.py:1745
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Açıklama"
 
 #. Id column
-#: ../src/disco.py:1753
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1783
-msgid "_Bookmark"
-msgstr "_Yer imi"
-
-#: ../src/disco.py:1818 ../src/gui_interface.py:3180
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Yer imi zaten kuruldu"
 
-#: ../src/disco.py:1819 ../src/gui_interface.py:3181
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr ""
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3195
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Yer imi başarılı eklendi"
 
-#: ../src/disco.py:1829 ../src/gui_interface.py:3196
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 
-#: ../src/disco.py:2038
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Üyeldi"
 
-#: ../src/disco.py:2046
+#: ../src/disco.py:2106
 #, fuzzy
 msgid "Node"
 msgstr "Ağ Sil"
 
-#: ../src/disco.py:2110
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Yeni posta"
 
-#: ../src/disco.py:2116
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Üye yap"
 
-#: ../src/disco.py:2122
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Üyelikten çık"
 
-#: ../src/features_window.py:48
+#: ../src/features_window.py:50
 #, fuzzy
-msgid "SSL certificat validation"
+msgid "SSL certificate validation"
 msgstr "`%s' geçerlilik modeli bilinmiyor\n"
 
-#: ../src/features_window.py:49
-msgid "A library used to validate server certificates to ensure a secure connection."
+#: ../src/features_window.py:51
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:50 ../src/features_window.py:51
+#: ../src/features_window.py:52 ../src/features_window.py:53
 #, fuzzy
-msgid "Requires python-pyopenssl."
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Python Programlama Dili"
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
 #, fuzzy
 msgid "Requires python-avahi."
 msgstr "Avahi Zeroconf Tarayıcı"
 
-#: ../src/features_window.py:55
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "Command line"
 msgstr "Bir komut y_ürüt"
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
 #, fuzzy
 msgid "Requires python-dbus."
 msgstr "Dbus Denetim Altyapısı"
 
-#: ../src/features_window.py:59 ../src/features_window.py:63
-#: ../src/features_window.py:67 ../src/features_window.py:71
-#: ../src/features_window.py:75 ../src/features_window.py:83
-#: ../src/features_window.py:87 ../src/features_window.py:107
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr ""
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Üyelik ileti _kaydet"
 
-#: ../src/features_window.py:61
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
+msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
+
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
 
-#: ../src/features_window.py:62
-msgid "Requires gpg and python-GnuPGInterface."
+#: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
 msgstr ""
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Network-manager"
 msgstr "Paket Yöneticisi"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:67
 #, fuzzy
 msgid "Autodetection of network status."
 msgstr "Durumu a_yarla"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Oturum Yönetimi"
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
 #, fuzzy
 msgid "Requires python-gnome2."
 msgstr "Python Programlama Dili"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
 #, fuzzy
 msgid "Password encryption"
 msgstr "Parolayı Değiştir"
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
 #, fuzzy
 msgid "Requires dnsutils."
 msgstr " (yetki gerektirir)"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
 #, fuzzy
 msgid "Spell Checker"
 msgstr "Tamamlanmamış yazım denetimi kaydı"
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:83
 #, fuzzy
 msgid "Spellchecking of composed messages."
 msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr " (yetki gerektirir)"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr " (yetki gerektirir)"
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Bildirim"
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:86
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
+#: ../src/features_window.py:88
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Otomatik durum"
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:92
 #, fuzzy
 msgid "Requires libxss library."
 msgstr "Çıktı dosyası için paylaşımlı kitaplık `%s' gerekli\n"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr " (yetki gerektirir)"
 
-#: ../src/features_window.py:92
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:93
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
 #: ../src/features_window.py:94
-msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-
-#: ../src/features_window.py:96
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "  Uçtan uca şifreleme varsayılıyor.\n"
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
 
-#: ../src/features_window.py:98 ../src/features_window.py:99
+#: ../src/features_window.py:96 ../src/features_window.py:97
 #, fuzzy
 msgid "Requires python-crypto."
 msgstr "Python Programlama Dili"
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "RST Generator"
 msgstr "sequence üretecinin tanımını değiştir"
 
-#: ../src/features_window.py:101
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+#: ../src/features_window.py:99
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:102 ../src/features_window.py:103
+#: ../src/features_window.py:100 ../src/features_window.py:101
 #, fuzzy
 msgid "Requires python-docutils."
 msgstr "Python Programlama Dili"
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
 #: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
+msgid "Requires python-gupnp-igd."
 msgstr "Python Programlama Dili"
 
-#: ../src/features_window.py:121
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Dbus Denetim Altyapısı"
+
+#: ../src/features_window.py:120
+#, fuzzy
+msgid "?features:Available"
+msgstr "Mevcut"
+
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Özellik"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Dosya"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Süre"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "İlerleme"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosya adı: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, fuzzy, python-format
 msgid "Size: %s"
 msgstr "%1 (boyut %2)"
 
 #. 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/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Sen"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Gönderen: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:700
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Alıcı:"
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, fuzzy, python-format
 msgid "Saved in: %s"
 msgstr "ben burdaysam"
 
-#: ../src/filetransfers_window.py:203
-#, fuzzy
-msgid "File transfer completed"
-msgstr "Dosya Gönderme Tamamlandı"
-
-#: ../src/filetransfers_window.py:205
-#, fuzzy
-msgid "_Open Containing Folder"
-msgstr "Gmail Gelen Kutusunu _Aç"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Dosya Gönderme Tamamlandı"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr ""
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Alıcı: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Ileti alınıyor"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Dosya Gönderme Tamamlandı"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 #, fuzzy
 msgid "Choose File to Send..."
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Açıklama: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 #, fuzzy
 msgid "Gajim cannot access this file"
 msgstr "%s sunucu konfigurasyon dosyasına \"%s\" erişilemiyor: %s\n"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr ""
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Dosya: %s"
-
-#: ../src/filetransfers_window.py:326
-#, fuzzy, python-format
-msgid "Type: %s"
-msgstr "_Türü:"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Açıklama: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s size bir dosya göndermek istiyor:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "\"%s\" mevcut dosyanın üzerine yazılamıyor"
 
-#: ../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:390 ../src/gtkgui_helpers.py:852
+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:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Dosyası zaten var"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "What do you want to do?"
 msgstr "Ne yapmak istiyorsun?"
 
-#. 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
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Dosya Farklı Kaydet..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Dosya: %s"
+
+#: ../src/filetransfers_window.py:456
+#, fuzzy, python-format
+msgid "Type: %s"
+msgstr "_Türü:"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Açıklama: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s size bir dosya göndermek istiyor:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Profil gönderiliyor…"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Dosya okunurken hata:"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7429,446 +8808,502 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Geçersiz Dosya"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Dosya: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "İsim: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Gönderen"
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Duraklat"
 
-#: ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Devam"
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "mesaj"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "Duygu _Simgeler:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
 
 #: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Kişi listesindeki olayları göster"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "İlerlemiş Ayarlama Editörü"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Hata açıklaması…"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:143
+#: ../src/gajim.py:213
 #, fuzzy, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: ../src/gajim.py:183
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr ""
 
-#: ../src/gajim.py:184
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:186
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+msgid "Gajim needs GTK 2.22 or above"
 msgstr ""
 
-#: ../src/gajim.py:187
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:269
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "   --dry-run              Çalıştırılması gerekenleri gösterir\n"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:270
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
 msgstr ""
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:320
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Başka bir Gajim zaten çalışıyor "
 
-#: ../src/gajim.py:321
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Belirtilen komutla ilgili yardımı gösterir"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "komut"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "komut yardımını göster"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 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"
+#: ../src/gajim-remote.py:94
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
 msgstr ""
 
-#: ../src/gajim-remote.py: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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "hesap"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "sadece bu hesapın kişilerini göster"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr ""
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "durum"
 
-#: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use accoun't previous status"
+#: ../src/gajim-remote.py:110
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's 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"
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
 msgstr "mesaj"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "durum ileti"
 
-#: ../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"
+#: ../src/gajim-remote.py:112
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "öncelik"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 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"
+#: ../src/gajim-remote.py:122
+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.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr ""
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:135
 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 ''."
+#: ../src/gajim-remote.py:140
+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 ""
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "iletinin içindekiler"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp anahtarı"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 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 ''."
+#: ../src/gajim-remote.py:153
+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 ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "konu"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "iletinin konusu"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Kişinin JIDsi"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr ""
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Hesapın ismi"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Dosyayı bir kişiye gönderir"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "dosya"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Dosya yolu"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr ""
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "'key'in değerini 'value' değere kurar"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "anahtar=değer"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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.py:208
 #, fuzzy
 msgid "Deletes a preference item"
 msgstr "Günün İletisini Sil"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "anahtar"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 #, fuzzy
 msgid "name of the preference to be deleted"
 msgstr "Lütfen eklemek istediğiniz grubun adını girin."
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Kişiyi listeden sil"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Kişiyi listeye ekle"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
+#: ../src/gajim-remote.py:243
+msgid ""
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Kaç okunmamış ileti sayısını geri ver"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Özel XML gönder"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "gönderilenecek 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"
+#: ../src/gajim-remote.py:263
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "Avatarı değiştir"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "Kullanılacak resim"
 
-#: ../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"
+#: ../src/gajim-remote.py:272
+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
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Adres verilmedi"
 
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "URI to handle"
 msgstr "Durumu a_yarla"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "İletin içindekiler"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Sohbet odasına katıl"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "oda"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "Oda JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "takma ad"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "Kullanıcak takma ad"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "parola"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "Odaya girmek için gerekli parola"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:297
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Paket sisteminin kilitli olup olmadığını kontrol edin."
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr ""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 #, fuzzy
 msgid "Missing argument \"contact_jid\""
 msgstr "JID veya Kişi adı girdir"
 
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 #, fuzzy
 msgid "You have no active account"
 msgstr "Bir hesap seçmek zorundasınız."
 
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote.py:433
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7877,41 +9312,43 @@ msgstr ""
 "Kullanım: %s [komut satır yordamları reddedildi]\n"
 "  veya:  %s OPTION\n"
 
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argümanlar:"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s bulunamadı"
 
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:447
 #, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "Adres verilmedi"
 
-#: ../src/gajim-remote.py:540
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "Adres yanlış"
 
@@ -7937,199 +9374,234 @@ msgid "You cannot delete your current theme"
 msgstr ""
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+msgid "Please first choose another theme as your current theme."
+msgstr ""
+
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:166
+#: ../src/groupchat_control.py:238
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Takma Ad girdir"
 
-#: ../src/groupchat_control.py:614
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Sohbet"
 
-#: ../src/groupchat_control.py:616
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Devam edilen sohbet"
 
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "Değerin maskenin sğında fazladan bitler var."
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 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:1216
+#: ../src/groupchat_control.py:1289
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1291
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in
+#. gajim.py)
+#: ../src/groupchat_control.py:1592
 #, fuzzy
 msgid "Room logging is enabled"
 msgstr "Konumlaştırma kapalıdır."
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1227
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1606
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1241
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1245
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Adınızı %s olarak değiştirdiniz"
 
-#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr ""
-
-#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
-#: ../src/groupchat_control.py:1320
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "üyelik değişti"
 
-#: ../src/groupchat_control.py:1317
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "sistem kapanıyor"
 
-#: ../src/groupchat_control.py:1401
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1405
+#: ../src/groupchat_control.py:1799
 #, fuzzy, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: ../src/groupchat_control.py:1420
+#: ../src/groupchat_control.py:1814
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1424
+#: ../src/groupchat_control.py:1818
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s ayrıldı"
 
-#: ../src/groupchat_control.py:1458
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s grup sohbete katıldı"
 
-#: ../src/groupchat_control.py:1460 ../src/gui_interface.py:945
-#: ../src/history_window.py:442 ../src/notify.py:252
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s durumu şimdi %(status)s"
-
-#: ../src/groupchat_control.py:1688
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr ""
 
-#: ../src/groupchat_control.py:1690
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:2126
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr ""
 
-#: ../src/groupchat_control.py:1694 ../src/gui_interface.py:1200
-#: ../src/gui_interface.py:1974 ../src/gui_interface.py:2011
-#: ../src/gui_interface.py:2046 ../src/message_window.py:222
-#: ../src/roster_window.py:2736 ../src/roster_window.py:3396
-#: ../src/roster_window.py:4120
-msgid "Do _not ask me again"
-msgstr "Bu iletişim kutusunu bir daha _gösterme"
-
-#: ../src/groupchat_control.py:1727
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Konuk Değiştiriliyor"
 
-#: ../src/groupchat_control.py:1728
+#: ../src/groupchat_control.py:2166
 #, fuzzy
 msgid "Please specify the new subject:"
 msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
 
-#: ../src/groupchat_control.py:1735
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Takma Ad Ayarla"
 
-#: ../src/groupchat_control.py:1736
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1765
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1766
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1768
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1952
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2275
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr ""
@@ -8139,7 +9611,9 @@ msgid "A programming error has been detected"
 msgstr "Bir programlama hata meydana çıktı"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
 msgstr ""
 
 #: ../src/gtkexcepthook.py:54
@@ -8150,212 +9624,242 @@ msgstr "_Hata Bildir"
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "Hata: %s okumak için açılamıyor"
-
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Dosya okunurken hata:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:352
 #, fuzzy
 msgid "Error parsing file:"
 msgstr "Dosya okunurken hata:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:393
 #, 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:767
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:836
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Rahatsız etmeyin"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:837
 #, 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:873
 msgid "Save Image as..."
 msgstr "Resimi Farklı Kaydet..."
 
-#: ../src/gui_interface.py:139
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Grup eklenemedi: grup zaten var"
+
+#: ../src/gui_interface.py:135
 #, 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 ""
 
-#: ../src/gui_interface.py:142
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Ricayı kabul ediyor musunuz?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr ""
 
-#: ../src/gui_interface.py:212 ../src/notify.py:523
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
+#: ../src/gui_interface.py:287
 #, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "Hata %(code)s: %(msg)s"
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
+#: ../src/gui_interface.py:299
+#, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:308
 #, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "Kişisel ilet gönderimi başarısız"
+msgid "You are banned from group chat <b>%s</b>."
+msgstr ""
+"Şuraya bir yorum gönderiyorsunuz:\n"
+"  "
+
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "grup %s yok - root kullanılacak\n"
+
+#: ../src/gui_interface.py:317
+msgid "Group chat creation is restricted."
+msgstr ""
+
+#: ../src/gui_interface.py:320
+#, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
+msgstr ""
+
+#: ../src/gui_interface.py:325
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr ""
+
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
+#, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "Hata %(code)s: %(msg)s"
 
-#: ../src/gui_interface.py:662 ../src/notify.py:525
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Üyelik isteği"
 
-#: ../src/gui_interface.py:687
+#: ../src/gui_interface.py:499
 #, fuzzy
 msgid "Authorization accepted"
 msgstr "Değer kabul edildi!"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 
-#: ../src/gui_interface.py:701
+#: ../src/gui_interface.py:508
 #, fuzzy, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:509
 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:726 ../src/notify.py:527
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Üyelikten çıkarıldı"
 
-#: ../src/gui_interface.py:753
+#: ../src/gui_interface.py:541
 #, fuzzy, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "işlem 'pmuls' ile birleştirilemez"
 
-#: ../src/gui_interface.py:1013
-#, fuzzy, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "Değerin maskenin sğında fazladan bitler var."
-
-#: ../src/gui_interface.py:1081
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:1083
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gui_interface.py:1085
-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:1089
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:1091
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:1093
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:1096
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:1099
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:629
 #, python-format
-msgid "A Password is required to join the room %s. Please type it."
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:1164
-msgid "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:658
+msgid ""
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
-#: ../src/gui_interface.py:1168
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Senin şifren hatalı"
 
-#: ../src/gui_interface.py:1172
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Senin OpenGPG şifren hatalı"
 
-#: ../src/gui_interface.py:1198
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Bu anahtarın kullanım süresi dolmuş"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Gadu-Gudu hesabı için parola değiştir"
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG anahtara güvenilmiyor"
 
-#: ../src/gui_interface.py:1198
-msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
+#: ../src/gui_interface.py:704
+msgid ""
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:717
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
 msgstr ""
 
-#: ../src/gui_interface.py:1210
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
 msgstr ""
 
-#: ../src/gui_interface.py:1319
+#: ../src/gui_interface.py:856
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Yeni _GMail e-postadan haber ver"
 
-#: ../src/gui_interface.py:1321
+#: ../src/gui_interface.py:858
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "\"%s\"den yeni bir ileti aldın"
 
-#: ../src/gui_interface.py:1334
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -8365,321 +9869,329 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1403
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
-msgid "Remote contact stopped transfer"
-msgstr ""
-
-#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
-msgid "Error opening file"
-msgstr "Dosya açılırken hata"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Dosya Gönderme Tamamlandı"
 
-#: ../src/gui_interface.py:1475
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr ""
 
-#. ft stopped
-#: ../src/gui_interface.py:1479
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: ../src/gui_interface.py:1492
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr ""
+
+#: ../src/gui_interface.py:1080
 #, fuzzy, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gönderdiğiniz iletide yazacak adın rengi."
 
-#. ft stopped
-#: ../src/gui_interface.py:1496
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: ../src/gui_interface.py:1608
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Gönderdiğiniz iletide yazacak adın rengi."
 
-#: ../src/gui_interface.py:1615
+#: ../src/gui_interface.py:1163
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mesaj ayrıştırılamıyor"
 
-#: ../src/gui_interface.py:1686
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Kullanan ad Çarpışması"
 
-#: ../src/gui_interface.py:1687
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr ""
 
-#: ../src/gui_interface.py:1700
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1713
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1724
-msgid "Error."
-msgstr "Hata."
-
-#: ../src/gui_interface.py:1752
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Kaynak Çarpışması"
 
-#: ../src/gui_interface.py:1753
-msgid "You are already connected to this account with the same resource. Please type a new one"
+#: ../src/gui_interface.py:1192
+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:1800
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr ""
 
-#: ../src/gui_interface.py:1803
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Dosya Gönderme Soru"
 
-#: ../src/gui_interface.py:1909
+#: ../src/gui_interface.py:1337
 #, fuzzy
 msgid "Error verifying SSL certificate"
 msgstr "      --sslcert     ssl istemci sertifikası\n"
 
-#: ../src/gui_interface.py:1910
+#: ../src/gui_interface.py:1338
 #, 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 ""
 
-#: ../src/gui_interface.py:1918
+#: ../src/gui_interface.py:1347
 #, fuzzy
 msgid "Ignore this error for this certificate."
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
-#: ../src/gui_interface.py:1938
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "<b>Bir hata oluştu:</b>"
+
+#: ../src/gui_interface.py:1374
 #, fuzzy
 msgid "SSL certificate error"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: ../src/gui_interface.py:1939
+#: ../src/gui_interface.py:1375
 #, 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 ""
 
-#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
-#: ../src/gui_interface.py:2042
-msgid "Insecure connection"
-msgstr "Tehlikeli bağlantı"
-
-#: ../src/gui_interface.py:1970
-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:1973 ../src/gui_interface.py:2010
-#: ../src/gui_interface.py:2045
-msgid "Yes, I really want to connect insecurely"
-msgstr "Evet, gerçekten tehlikeli bağlanmak istiyorum"
-
-#: ../src/gui_interface.py:2007
-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:2043
-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:2064
-msgid "PEP node was not removed"
+#: ../src/gui_interface.py:1447
+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:2065
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
+#: ../src/gui_interface.py:1489
+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:2622 ../src/gui_interface.py:2645
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Devre dışı bırakılmış rule'lar:"
 
-#: ../src/gui_interface.py:2623
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
+#: ../src/gui_interface.py:1996
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2646
-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."
+#: ../src/gui_interface.py:2019
+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:2677 ../src/roster_window.py:3557
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:3056
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Şifre gerekli"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3044
 #, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: ../src/gui_interface.py:3607
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3059
 #, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Yanlış Şifre"
 
-#: ../src/gui_interface.py:3618
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Yeni Bir Grup Sohbeti"
 
-#: ../src/gui_menu_builder.py:409
+#: ../src/gui_menu_builder.py:436
 #, fuzzy
 msgid "I would like to add you to my roster"
 msgstr "Seni benim kişi listeye eklemek isterdim"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "Klasör \"%s\" yazılabilir değil"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr ""
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kişiler"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Tarih"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Takma ad"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "İleti"
 
-#: ../src/history_manager.py:241
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+#. holds subject
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
+msgid "Subject"
+msgstr "Konu"
+
+#: ../src/history_manager.py:262
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 ""
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Hata açıklaması…"
+
+#: ../src/history_manager.py:487
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Her checkpoint işlemini kaydeder"
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../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] ""
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
+
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Bu sertifika geçerlidir"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Dosya transferi iptal et"
+
+#: ../src/history_manager.py:644
 #, fuzzy
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, fuzzy, python-format
 msgid "Conversation History with %s"
 msgstr "Beni bir açılan pencereyle _haberle"
 
-#: ../src/history_window.py:350
+#: ../src/history_window.py:358
 #, fuzzy
 msgid "Disk Error"
 msgstr "Hata açıklaması…"
 
-#: ../src/history_window.py:438
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:449
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Hata: %s"
 
-#: ../src/history_window.py:451
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Hata"
 
-#: ../src/history_window.py:453
+#: ../src/history_window.py:466
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:469
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Resimi Farklı Kaydet..."
+msgid "Loading"
+msgstr "Kodlamada"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Resim çok büyük"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
 #: ../src/message_window.py:220
 msgid "You are going to close several tabs"
@@ -8690,19 +10202,19 @@ msgstr ""
 msgid "Do you really want to close them all?"
 msgstr "Tüm yer imlerini kaldırmak istediğinizden emin misiniz?"
 
-#: ../src/message_window.py:482
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Sohbetler"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Grup Sohbetler"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Kişisel Sohbetler"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "İletler"
 
@@ -8716,345 +10228,401 @@ msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
 msgid "- messages will not be logged"
 msgstr "Iletiler yazdırılımadı"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Durumu değiştirdi"
-
-#: ../src/notify.py:260
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Girdi"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Yoksay"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Çıktı"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:279
+#: ../src/plugins/gui.py:151
 #, fuzzy, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "\"%s\"den yeni bir ileti aldın"
+msgid "Warning: %s"
+msgstr "ben burdaysam"
 
-#: ../src/notify.py:286
-#, python-format
-msgid "New Private Message from group chat %s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Bağlantı Kurulamıyor"
+
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: ../src/notify.py:288
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Karalı servisin TXT verisi"
 
-#: ../src/notify.py:291
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "%(nickname)s yazdı"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Dosyası zaten var"
 
-#: ../src/notify.py:297
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "%(nickname)s den Yeni İlet alındı"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:566
-msgid "Ignore"
-msgstr "Yoksay"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Oda Yerleştirme"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:57
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Dosya boş"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Profil alınıyor…"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2932
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Dosya boş"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2935
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Dosya mevcut değil"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Resim acılamadı"
 
-#: ../src/profile_window.py:255
+#: ../src/profile_window.py:235
+#, fuzzy
+msgid "Wrong date format"
+msgstr "Kişisel Bilgisi"
+
+#: ../src/profile_window.py:236
+#, fuzzy
+msgid "Format of the date must be YYYY-MM-DD"
+msgstr "geçersiz saat, format SS:DD şeklinde olmalı"
+
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Bilgi alındı"
 
-#: ../src/profile_window.py:326
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: ../src/profile_window.py:339
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Profil gönderiliyor…"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:404
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Rahatsız etmeyin"
 
-#: ../src/profile_window.py:361
+#: ../src/profile_window.py:411
 #, fuzzy
 msgid "vCard publication failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: ../src/profile_window.py:362
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Kişisel ilanlar sayfayı yayınlarken bir hata çıktı, sonra bir daha prova et."
+#: ../src/profile_window.py:412
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Kişisel ilanlar sayfayı yayınlarken bir hata çıktı, sonra bir daha prova et."
 
-#: ../src/roster_window.py:283 ../src/roster_window.py:1028
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 #, fuzzy
 msgid "Merged accounts"
 msgstr "Hesapları bir_leştir"
 
-#: ../src/roster_window.py:1916
+#: ../src/roster_window.py:2059
 #, fuzzy
 msgid "Authorization has been sent"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: ../src/roster_window.py:1917
+#: ../src/roster_window.py:2060
 #, fuzzy, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:2083
 #, fuzzy
 msgid "Subscription request has been sent"
 msgstr "Onay e-postası gönderildi."
 
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: ../src/roster_window.py:1955
+#: ../src/roster_window.py:2098
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: ../src/roster_window.py:1956
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1983
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG kullanılmiyor"
 
-#: ../src/roster_window.py:1984
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:2197 ../src/roster_window.py:3494
-msgid "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:2335 ../src/roster_window.py:3826
+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:2361
 #, fuzzy
 msgid "desync'ed"
 msgstr "-e  --ed  Bir ed betiği çıktılar."
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Gajim'den gerçekten çıkılsın mı?"
 
-#: ../src/roster_window.py:2286
+#: ../src/roster_window.py:2428
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: ../src/roster_window.py:2287
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Gajimi her zaman kapat"
 
-#: ../src/roster_window.py:2370
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: ../src/roster_window.py:2371
-msgid "If you quit now, the file(s) being transfered will be stopped. Do you still want to quit?"
+#: ../src/roster_window.py:2520
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Okunmamış iletler var"
 
-#: ../src/roster_window.py:2403
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
+#: ../src/roster_window.py:2552
+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:2651
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2992
 #, fuzzy, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "%d paket kaldırılacak\n"
 
-#: ../src/roster_window.py:2655
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
+#: ../src/roster_window.py:2993
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2996
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "%d paket kaldırılacak\n"
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:3001
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
 msgstr ""
 
-#: ../src/roster_window.py:2731
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:2733
-msgid "This contact will see you offline and you will not receive messages he will send you."
+#: ../src/roster_window.py:3045
+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:2824
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: ../src/roster_window.py:2825
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Bu kişi için %s yeni bir takma ad girin."
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Grupu yeniden adlandır"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Grup %s için yeni isim giriniz: "
 
-#: ../src/roster_window.py:2878
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Grubu Sil"
 
-#: ../src/roster_window.py:2879
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
-#: ../src/roster_window.py:2880
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Bide bütün grupdaki kişileri listeden sil"
 
-#: ../src/roster_window.py:2919
+#: ../src/roster_window.py:3179
 #, fuzzy
 msgid "Assign OpenPGP Key"
 msgstr "Hiçbir anahtar seçilmedi"
 
-#: ../src/roster_window.py:2920
+#: ../src/roster_window.py:3180
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Sesi kapatmak için bir tuş seçin."
 
-#: ../src/roster_window.py:3303
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3310
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
+#: ../src/roster_window.py:3642
+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:3316
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Devam etmek istiyor musunuz?"
 
-#: ../src/roster_window.py:3320
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
+#: ../src/roster_window.py:3652
+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:3323
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Silindikten sonra bu kişi benim durumu bilsin"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3327
+#: ../src/roster_window.py:3659
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: ../src/roster_window.py:3332
+#: ../src/roster_window.py:3664
 #, 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:3390
-msgid "You are about to send a custom status. Are you sure you want  to continue?"
+#: ../src/roster_window.py:3722
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3724
 #, 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."
+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:3411
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: ../src/roster_window.py:3412
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:4020
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4022
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
+#: ../src/roster_window.py:4458
+msgid ""
+"Your server does not support storing metacontacts information. So this "
+"information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4114
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4550
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:4116
-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."
+#: ../src/roster_window.py:4552
+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:4231
+#: ../src/roster_window.py:4673
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Adres verilmedi"
 
-#: ../src/roster_window.py:4243
+#: ../src/roster_window.py:4685
 #, 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] "Yapmak istediğiniz şey bu mu?"
 
-#: ../src/roster_window.py:4358
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Bunu %s buna %s gönder"
 
-#: ../src/roster_window.py:4364
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "bir ses ve video"
+
+#: ../src/roster_window.py:4834
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "bir ses ve video"
@@ -9064,186 +10632,176 @@ msgstr "bir ses ve video"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4813 ../src/roster_window.py:4886
-#: ../src/roster_window.py:4895 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "%s hesapı kullanıp"
 
 #. add
-#: ../src/roster_window.py:4902
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "%s hesapına"
 
 #. disco
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "%s hesapı kullanıp"
 
-#: ../src/roster_window.py:4945 ../src/statusicon.py:309
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Yer İmlerini _Yönet"
 
 #. profile, avatar
-#: ../src/roster_window.py:4965
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "%s hesaptan"
 
-#: ../src/roster_window.py:5006
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "%s hesapına"
 
-#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "Durum ileti değiştir"
 
-#: ../src/roster_window.py:5099
+#: ../src/roster_window.py:5562
 #, fuzzy
 msgid "Publish Tune"
 msgstr "Albüm Ayarı"
 
-#: ../src/roster_window.py:5101
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr " B - DosyaKilidi konumu"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5567
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Çevrimiçi Servisler"
 
-#: ../src/roster_window.py:5249
+#: ../src/roster_window.py:5715
 #, fuzzy
 msgid "_Maximize All"
 msgstr "Bütün durumlar"
 
-#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "grupdaki herkez"
 
-#: ../src/roster_window.py:5267
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Tüm kullanıcılara"
 
-#: ../src/roster_window.py:5271
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Tüm çevredeki kullanıcılara"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5453
+#: ../src/roster_window.py:5918
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Kişileri eşzamana getir"
 
 #. Edit Groups
-#: ../src/roster_window.py:5462
+#: ../src/roster_window.py:5927
 #, fuzzy
 msgid "Edit _Groups"
 msgstr "Kişisel ilanlar sayfayı yazımla"
 
 #. Send single message
-#: ../src/roster_window.py:5517
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Tek bir İlet gönder"
 
 #. Execute Command
-#: ../src/roster_window.py:5564
+#: ../src/roster_window.py:6029
 #, fuzzy
 msgid "Execute Command..."
 msgstr "<b>Yürütecek komutayı seç</b>"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5574
+#: ../src/roster_window.py:6039
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Aktarım protokolü"
 
 #. Modify Transport
-#: ../src/roster_window.py:5583
+#: ../src/roster_window.py:6048
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Aktarım protokolü"
 
 #. Rename
-#: ../src/roster_window.py:5593
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Ad Değiştir"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:6118
 #, fuzzy
 msgid "_Maximize"
 msgstr "Ekranı kapla"
 
-#: ../src/roster_window.py:5662
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Yeniden bağlan"
 
-#: ../src/roster_window.py:5669
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "Bağlantıyı _kes"
 
 #. History manager
-#: ../src/roster_window.py:5751
+#: ../src/roster_window.py:6228
 #, fuzzy
 msgid "History Manager"
 msgstr "Paket Yöneticisi"
 
-#: ../src/roster_window.py:5762
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "Yeni grup sohbete _katıl"
 
-#: ../src/roster_window.py:5934
+#: ../src/roster_window.py:6471
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Durum ileti değiştir"
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 #, fuzzy
 msgid "Waiting for results"
 msgstr "Sohbet için Hazır"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 #, fuzzy
 msgid "Error in received dataform"
 msgstr "Komuta satrında hata: %s\n"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 #, fuzzy
 msgid "No result"
 msgstr "<b>Telefon numara:</b>"
 
-#: ../src/session.py:132
-#, fuzzy
-msgid "Disk WriteError"
-msgstr "Disk Görüntüleri"
-
-#: ../src/session.py:254
-#, python-format
-msgid "Subject: %s"
-msgstr "Konu: %s"
-
-#: ../src/session.py:429 ../src/session.py:464
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:431
+#: ../src/session.py:411
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:465
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9253,187 +10811,498 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Bu dizin için seçici erişim etkinleştirilmemiş"
+
+#: ../src/statusicon.py:241
 #, fuzzy
 msgid "_Change Status Message..."
 msgstr "Durum ileti değiştir"
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "<b>Kişi Listesi Görünümü</b>"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Menüyi gizle"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:562
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber kimliği:"
 
-#: ../src/tooltips.py:354 ../src/tooltips.py:566
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 #, fuzzy
 msgid "Resource: "
 msgstr "<b>Kaynak:</b>"
 
-#: ../src/tooltips.py:359
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:511
 #, fuzzy
 msgid " [blocked]"
 msgstr "Engellenmiş"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:515
 #, fuzzy
 msgid " [minimized]"
 msgstr "Küçültülmüş"
 
-#: ../src/tooltips.py:478 ../src/tooltips.py:735
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Durum:"
 
-#: ../src/tooltips.py:522
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Son durum: %s"
 
-#: ../src/tooltips.py:524 ../src/tooltips.py:587
+#: ../src/tooltips.py:577
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Üye olduğu süre:"
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Bağlantılı"
 
-#: ../src/tooltips.py:544
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Bağlantızıs"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:573
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Üyelik:"
 
-#: ../src/tooltips.py:583
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP:"
 
-#: ../src/tooltips.py:662
+#: ../src/tooltips.py:659
+#, fuzzy, python-format
+msgid "Idle since %s"
+msgstr "Üye olduğu süre:"
+
+#: ../src/tooltips.py:660
+#, fuzzy, python-format
+msgid "Idle for %s"
+msgstr "_XML Konsolu Göster"
+
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "Ruh Hali:"
+
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "Etkinlik:"
+
+#: ../src/tooltips.py:722
 #, fuzzy
-msgid "Tune:"
+msgid "Tune: "
 msgstr "Albüm Ayarı"
 
-#: ../src/tooltips.py:667
-msgid "Location:"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Yer:"
 
-#: ../src/tooltips.py:693
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Yükleme"
 
-#: ../src/tooltips.py:699
+#: ../src/tooltips.py:757
 #, fuzzy
 msgid "Upload"
 msgstr "Gönder"
 
-#: ../src/tooltips.py:706
+#: ../src/tooltips.py:764
 #, fuzzy
 msgid "Type: "
 msgstr "_Türü:"
 
-#: ../src/tooltips.py:710
+#: ../src/tooltips.py:770
 #, fuzzy
 msgid "Transferred: "
 msgstr "%d bayt aktarıldı"
 
-#: ../src/tooltips.py:713 ../src/tooltips.py:734
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Başlatılmadı"
 
-#: ../src/tooltips.py:717
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Durduruldu"
 
-#: ../src/tooltips.py:719 ../src/tooltips.py:722
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Tamamlanıldı"
 
-#: ../src/tooltips.py:726
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Duraklanıldı"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:730
+#: ../src/tooltips.py:786
 #, fuzzy
 msgid "Stalled"
 msgstr " [ %i%% ] (askıda)"
 
-#: ../src/tooltips.py:732
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Transfer ediliyor"
 
-#: ../src/tooltips.py:770
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:773
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 msgstr ""
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Client:Bilinmez"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Unknown?OS:Bilinmez"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Time:Bilinmez"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Üye olduğu süre:"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:396
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: ../src/vcard.py:400
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "üyelik değişti"
 
-#: ../src/vcard.py:343
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+#: ../src/vcard.py:408
+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:410
+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:412
 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"
+#: ../src/vcard.py:414
+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:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Bekleyen üyelemek soru yok."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 #, fuzzy
 msgid " resource with priority "
 msgstr "Beni bir açılan pencereyle _haberle"
+
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Aksiyonlar</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Şartlar</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "İlerlemiş aksiyonlar"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "İlerlemiş bildirim kontrolü"
+
+#~ msgid "All statuses"
+#~ msgstr "Bütün durumlar"
+
+#~ msgid "Busy "
+#~ msgstr "Meşgul"
+
+#~ msgid "Contact Change Status "
+#~ msgstr "Kişinin Değişme Durumu"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kişinin bağlantısı kesildi"
+
+#~ msgid "Don't have "
+#~ msgstr "Yok"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Dosya gönderme başlandı"
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Grup Sohbet İleti Vurgula"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Grup Sohbet İleti Alındı"
+
+#~ msgid "Have "
+#~ msgstr "Sahip"
+
+#~ msgid "Launch a command"
+#~ msgstr "Bir komut yürüt"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Bir veya daha fazla değişik durumlar…"
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Çevrede / Sohbete hazır"
+
+#~ msgid "Play a sound"
+#~ msgstr "Bir ses çal"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Ileti alınıyor"
+
+#~ msgid "When "
+#~ msgstr "Ne zaman"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "Sohbet pencereyi kendilinden acılmasını _engelle"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "Varolan açılan penceryi _engelle"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "Bu olay için varolan sesi _engelle"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "Kişi listedeki olayları _engelle"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "Sistem tepsisinde gösterilen olayları _engelle"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "Beni bir açılan pencereyle _haberle"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Kişi listesindeki olayları göster"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Sistem tepsisinde gösterilen olayları göster"
+
+#~ msgid "and I "
+#~ msgstr "ve ben"
+
+#~ msgid "contact(s)"
+#~ msgstr "kişi(ler)"
+
+#~ msgid "for "
+#~ msgstr "için"
+
+#~ msgid "group(s)"
+#~ msgstr "grup(lar)"
+
+#~ msgid "when I'm in"
+#~ msgstr "ben burdaysam"
+
+#~ msgid "Mic volume:"
+#~ msgstr "Mikrofon ses şiddeti:"
+
+#~ msgid "Sound volume:"
+#~ msgstr "Ses şiddeti:"
+
+#~ msgid "label"
+#~ msgstr "etiket"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Ona benim durumu görmeye izin _ver"
+
+#~ msgid "Advanced..."
+#~ msgstr "İlerlemiş…"
+
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Daima Gnome varsayılan programlarını kullan"
+
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Daima Xfce varsayılan programlarını kullan"
+
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Gajim açılırken kendilinden belirle"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "_XML Konsolu Göster"
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Avatarı değiştir"
+
+#, fuzzy
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim'den gerçekten çıkılsın mı?"
+
+#~ msgid "English"
+#~ msgstr "İngilizce"
+
+#~ msgid "Belarusian"
+#~ msgstr "Beyaz Rusça"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarca"
+
+#~ msgid "Breton"
+#~ msgstr "Bretonca"
+
+#~ msgid "Czech"
+#~ msgstr "Çekçe"
+
+#~ msgid "German"
+#~ msgstr "Almanca"
+
+#~ msgid "Greek"
+#~ msgstr "Yünanca"
+
+#~ msgid "British"
+#~ msgstr "İngilizce (Britanya)"
+
+#, fuzzy
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "İspanyolca"
+
+#~ msgid "Basque"
+#~ msgstr "Baskça"
+
+#~ msgid "French"
+#~ msgstr "Fransızca"
+
+#~ msgid "Croatian"
+#~ msgstr "Hırvatça"
+
+#~ msgid "Italian"
+#~ msgstr "İtalyanca"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norveççe"
+
+#~ msgid "Dutch"
+#~ msgstr "Flemenkçe"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norveççe"
+
+#~ msgid "Polish"
+#~ msgstr "Polonyaca"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portekizce"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brezilya Portekizce"
+
+#~ msgid "Russian"
+#~ msgstr "Rusça"
+
+#~ msgid "Serbian"
+#~ msgstr "Sırpça"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovakça"
+
+#~ msgid "Swedish"
+#~ msgstr "İsveççe"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Çince (Çin)"
+
+#, fuzzy
+#~ msgid "Spelling language"
+#~ msgstr "Tercih ettiğiniz dil:"
+
+#, fuzzy
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "Cevap \"evet\" ya da \"hayır\""
+
+#, fuzzy
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "Hiçbir anahtar seçilmedi"
+
+#, fuzzy
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Rahatsız etmeyin"
+
+#, fuzzy
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "Şu an \"%s\" veritabanına bağlısınız"
+
+#~ msgid "_Available"
+#~ msgstr "_Mevcut Değil"
+
+#, fuzzy
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "<b>Bir hata oluştu:</b>"
+
+#, fuzzy
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "Hata: %s okumak için açılamıyor"
+
+#, fuzzy
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "PORT komutu gönderilemiyor"
+
+#, fuzzy
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Geçersiz Jabber kimliği"
+
+#, fuzzy
+#~ msgid "Condition"
+#~ msgstr "Tanımlanmamış Koşul"
+
+#, fuzzy
+#~ msgid "when I am "
+#~ msgstr "ben burdaysam"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Python Programlama Dili"
+
+#~ msgid "Contacts"
+#~ msgstr "Kişiler"
+
+#, fuzzy
+#~ msgid "Disk WriteError"
+#~ msgstr "Disk Görüntüleri"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Konu: %s"
diff --git a/po/uk.po b/po/uk.po
index dfa220fc8..10f98fd9a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-03 01:18+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2012-02-03 01:43+0200\n"
 "Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
@@ -19,329 +19,301 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.2\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Стан"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Особисті події"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Почати балачку..."
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Приєднатись до _групової балачки"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Додати контакт..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "Ви_явити служби"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Виконати команду..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Змінити обліковий запис"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "Ві_дкрити «Вхідні» Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Особисті події"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Почати балачку..."
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Стан"
+msgid "_Modify Account"
+msgstr "_Змінити обліковий запис"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Майстер створення облікових записів"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>З’єднання з сервером</b>\n"
-"\n"
-"Будь ласка, зачекайте..."
+"Для з’єднання з мережею Jabber вам потрібен обліковий\n"
+"запис."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "I already have an account I want to _use"
+msgstr "Я вже маю обліковий запис, який бажаю _використовувати"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "Я бажаю _зареєструвати новий обліковий запис"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Будь ласка, оберіть один з наступних варіантів:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Будь ласка, вкажіть відомості щодо вашого облікового запису</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Будь ласка, виберіть сервер</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Password:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Додати цей сертифікат до переліку довірених сертифікатів.\n"
-"SHA1 відбиток сертифікату:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Зберегти _пароль"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Анонімна авторизація"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового "
+"запису"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "З'єднатись після натискання кнопки «Завершити»"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Майстер створення облікових записів"
+msgid "Anon_ymous authentication"
+msgstr "Анонімна авторизація"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "Я вже маю обліковий запис, який бажаю _використовувати"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Будь ласка, виберіть сервер</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "Я бажаю _зареєструвати новий обліковий запис"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim will remember the password for this account"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового "
-"запису"
+msgid "Prox_y:"
+msgstr "Прокс_і:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Керування..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:41 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284
-#: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746
-#: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406
-#: ../src/config.py:2419 ../src/config.py:3699 ../src/config.py:3774
-#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
-#: ../src/dialogs.py:532 ../src/roster_window.py:3139
-#: ../src/roster_window.py:3145 ../src/roster_window.py:3150
-msgid "None"
-msgstr "Немає"
+msgid "Use custom hostname/port"
+msgstr "Використовувати інші вузол/порт"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Прокс_і:"
+msgid "_Hostname:"
+msgstr "Назва _вузла:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Save pass_word"
-msgstr "Зберегти _пароль"
+msgid "_Port:"
+msgstr "_Порт:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Налаштувати мій профіль після з’єднання"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "Д_одатково"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Використовувати інші вузол/порт"
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Для з’єднання з мережею Jabber вам потрібен обліковий\n"
-"запис."
+"Додати цей сертифікат до переліку довірених сертифікатів.\n"
+"SHA1 відбиток сертифікату:\n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:17
-msgid "_Advanced"
-msgstr "Д_одатково"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Завершити"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Назва _вузла:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>З’єднання з сервером</b>\n"
+"\n"
+"Будь ласка, зачекайте..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "З'єднатись після натискання кнопки «Завершити»"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:65
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "_Password:"
-msgstr "_Password:"
+msgid "Set my profile when I connect"
+msgstr "Налаштувати мій профіль після з’єднання"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "_Finish"
+msgstr "_Завершити"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Різне</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Немає"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Особиста інформація</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Проксі</b>"
-
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "_Узгодити зі станом"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Обліковий запис"
-
-#: ../data/gui/accounts_window.ui.h:7
 msgid "Accounts"
 msgstr "Облікові записи"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3384
-#: ../src/dialogs.py:3430
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
 msgid "Add"
 msgstr "Додати"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Administration operations"
-msgstr "Адміністративні дії"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Вилучити"
 
-#: ../data/gui/accounts_window.ui.h:10
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Пере_йменувати"
+
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Увімкнути"
+
+#: ../data/gui/accounts_window.ui.h:7
 msgid "Anonymous authentication"
 msgstr "Анонімна аутентифікація"
 
+#: ../data/gui/accounts_window.ui.h:8
+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 на дві або "
+"більше частини, в залежності від кількості клієнтів під'єднаних до сервера з "
+"одним обліковим записом. Таким чином ви можете з'єднатись одночасно з "
+"обліковим записом з ресурсів «Домівка» або «Робота». Ресурс з найвищім "
+"пріоритетом буде отримувати усі повідомлення та події. (Див. нижче)"
+
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
+
+#: ../data/gui/accounts_window.ui.h:10
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Синхронізувати контакти"
+
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Auto-reconnect when connection is lost"
-msgstr "Автоматично відновлювати втрачене з'єднання"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Натисніть, щоб запитати уповноваження від усіх контактів іншого облікового "
+"запису"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "Browse..."
-msgstr "Перегляд..."
+msgid "Chan_ge Password"
+msgstr "_Змінити пароль"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "C_onnect on Gajim startup"
-msgstr "_З'єднуватись після запуску Gajim"
+msgid "Click to change account's password"
+msgstr "Натисніть. щоб змінити пароль цього облікового запису"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Certificate is e_ncrypted"
-msgstr "Сертифікат зашифровано"
+msgid "Administration operations"
+msgstr "Адміністративні дії"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Chan_ge Password"
-msgstr "_Змінити пароль"
-
-#: ../data/gui/accounts_window.ui.h:16
 msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
+"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 ""
-"Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через "
-"незахищеним з’єднанням."
+"Пріоритет використовується для того, щоб визначити отримувача повідомлень "
+"від jabber-сервера, якщо з одним обліковим записом з’єднано декілька "
+"клієнтів. Повідомлення про події отримує клієнт з найвищим пріоритетом"
+
+#: ../data/gui/accounts_window.ui.h:16
+msgid "A_djust to status"
+msgstr "_Узгодити зі станом"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Choose _Key..."
-msgstr "Обрати _ключ..."
+msgid "Priority will change automatically according to your status."
+msgstr "Пріоритет змінюватиметься залежно від вашого стану."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to change account's password"
-msgstr "Натисніть. щоб змінити пароль цього облікового запису"
+msgid "Priori_ty:"
+msgstr "Пріорите_т:"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Click to request authorization to all contacts of another account"
-msgstr ""
-"Натисніть, щоб запитати уповноваження від усіх контактів іншого облікового "
-"запису"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Client certificate"
-msgstr "Клієнтський сертифікат"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Co_nnect on Gajim startup"
-msgstr "_З'єднуватись після запуску Gajim"
-
-#: ../data/gui/accounts_window.ui.h:22
-msgid "Connection"
-msgstr "З'єднання"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3388
-#: ../src/dialogs.py:3485
-msgid "Delete"
-msgstr "Вилучити"
+msgid "Resour_ce:"
+msgstr "Ресур_с:"
 
 #: ../data/gui/accounts_window.ui.h:24
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Ел. пошта:"
+msgid "_Client Cert File:"
+msgstr "Файл клієнтського _сертифікату:"
 
 #: ../data/gui/accounts_window.ui.h:25
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Ім'я:"
+msgid "Browse..."
+msgstr "Перегляд..."
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:26 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1168 ../src/common/helpers.py:1180
-#: ../src/notify.py:314 ../src/notify.py:337 ../src/notify.py:387
-#: ../src/notify.py:403
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:26
+msgid "Certificate is e_ncrypted"
+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:27 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
-#: ../src/roster_window.py:3081 ../src/roster_window.py:4148
-#: ../src/roster_window.py:5738
-msgid "General"
-msgstr "Загальне"
+#: ../data/gui/accounts_window.ui.h:27
+msgid "Client certificate"
+msgstr "Клієнтський сертифікат"
 
 #: ../data/gui/accounts_window.ui.h:28
-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/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Обліковий запис"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, "
-"наприклад, seahorse."
-
-#: ../data/gui/accounts_window.ui.h:31
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim надсилатиме порожні пакети для "
-"запобігання простою з'єднання (такий простій може призводити до від'єднання)"
+msgid "C_onnect on Gajim startup"
+msgstr "_З'єднуватись після запуску Gajim"
 
-#: ../data/gui/accounts_window.ui.h:32
+#: ../data/gui/accounts_window.ui.h:30
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -349,7 +321,19 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim під час запуску буде автоматично "
 "намагатись з'єднатися з вказаним обліковим записом на сервері jabber"
 
+#: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Автоматично відновлювати втрачене з'єднання"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Зберігати _журнал спілкування для усіх контактів"
+
 #: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "_Синхронізувати стан облікового запису з загальним"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -359,172 +343,206 @@ msgstr ""
 "спадним списком у нижній частині вікна реєстру) призведе до відповідних змін "
 "стану цього облікового запису"
 
-#: ../data/gui/accounts_window.ui.h:34
-msgid ""
-"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"
-"Можливо, вам також доведеться змінити параметри брандмауера."
+#: ../data/gui/accounts_window.ui.h:35
+msgid "Use file transfer proxies"
+msgstr "Використовувати проксі передавання файлів"
 
 #: ../data/gui/accounts_window.ui.h:36
-msgid "Information about you, as stored in the server"
-msgstr "Відомості про вас, які зберігаються на сервері"
+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:37
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1869
-#: ../src/dialogs.py:837
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Загальне"
 
 #: ../data/gui/accounts_window.ui.h:38
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Прізвище:"
+msgid "_use HTTP__PROXY environment variable"
+msgstr "використовувати змінну середовища HTTP_PROXY"
 
-#: ../data/gui/accounts_window.ui.h:39
-msgid "Mer_ge accounts"
-msgstr "Об’є_днати облікові записи"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "Керування..."
 
-#: ../data/gui/accounts_window.ui.h:40 ../src/config.py:1842
-#: ../src/config.py:2420
-msgid "No key selected"
-msgstr "Не обрано жодного ключа"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Проксі</b>"
 
-#: ../data/gui/accounts_window.ui.h:42 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Особисті відомості"
+#: ../data/gui/accounts_window.ui.h:41
+msgid "_Warn before using an insecure connection"
+msgstr "_Попереджати перед використанням незахищеного з’єднання"
+
+#: ../data/gui/accounts_window.ui.h:42
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через "
+"незахищеним з’єднанням."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priori_ty:"
-msgstr "Пріорите_т:"
+msgid "Send _keep-alive packets"
+msgstr "Надсилати пакети підтвердження дієздатності"
 
 #: ../data/gui/accounts_window.ui.h:44
 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"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
-"Пріоритет використовується для того, щоб визначити отримувача повідомлень "
-"від jabber-сервера, якщо з одним обліковим записом з’єднано декілька "
-"клієнтів. Повідомлення про події отримує клієнт з найвищим пріоритетом"
+"Якщо буде позначено цей пункт, Gajim надсилатиме порожні пакети для "
+"запобігання простою з'єднання (такий простій може призводити до від'єднання)"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Priority will change automatically according to your status."
-msgstr "Пріоритет змінюватиметься залежно від вашого стану."
+msgid "Use cust_om hostname/port"
+msgstr "Використовувати інші вузол/порт"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5688
-msgid "Re_name"
-msgstr "Пере_йменувати"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "_Hostname: "
+msgstr "Назва _вузла:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Resour_ce:"
-msgstr "Ресур_с:"
+msgid "_Port: "
+msgstr "_Порт:"
 
-#: ../data/gui/accounts_window.ui.h:48
-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:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Різне</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Save conversation _logs for all contacts"
-msgstr "Зберігати _журнал спілкування для усіх контактів"
+msgid "Connection"
+msgstr "З'єднання"
+
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Не обрано жодного ключа"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Send _keep-alive packets"
-msgstr "Надсилати пакети підтвердження дієздатності"
+msgid "Choose _Key..."
+msgstr "Обрати _ключ..."
 
 #: ../data/gui/accounts_window.ui.h:52
-msgid "Synch_ronize account status with global status"
-msgstr "_Синхронізувати стан облікового запису з загальним"
+msgid "Use G_PG Agent"
+msgstr "Використовувати _агент GnuPG"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "Synchroni_ze account status with global status"
-msgstr "_Синхронізувати стан облікового запису з загальним"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, "
+"наприклад, seahorse."
 
 #: ../data/gui/accounts_window.ui.h:54
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Синхронізувати контакти"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use G_PG Agent"
-msgstr "Використовувати _агент GnuPG"
+msgid "_Edit Personal Information..."
+msgstr "Редагувати особисті відомості..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om hostname/port"
-msgstr "Використовувати інші вузол/порт"
+msgid "Information about you, as stored in the server"
+msgstr "Відомості про вас, які зберігаються на сервері"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use cust_om port:"
-msgstr "Використовувати інший порт:"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Особиста інформація</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "Use file transfer proxies"
-msgstr "Використовувати проксі передавання файлів"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Особисті відомості"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Client Cert File:"
-msgstr "Файл клієнтського _сертифікату:"
+msgid "Co_nnect on Gajim startup"
+msgstr "_З'єднуватись після запуску Gajim"
 
 #: ../data/gui/accounts_window.ui.h:60
-msgid "_Edit Personal Information..."
-msgstr "Редагувати особисті відомості..."
+msgid "Synchroni_ze account status with global status"
+msgstr "_Синхронізувати стан облікового запису з загальним"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:61 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "Увімкнути"
+#: ../data/gui/accounts_window.ui.h:61
+msgid "Use cust_om port:"
+msgstr "Використовувати інший порт:"
 
 #: ../data/gui/accounts_window.ui.h:62
-msgid "_Hostname: "
-msgstr "Назва _вузла:"
+msgid ""
+"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"
+"Можливо, вам також доведеться змінити параметри брандмауера."
 
-#: ../data/gui/accounts_window.ui.h:64 ../data/gui/preferences_window.ui.h:133
-msgid "_Manage..."
-msgstr "Керування..."
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Ім'я:"
+
+#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Прізвище:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Port: "
-msgstr "_Порт:"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "Ел. пошта:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_Warn before using an insecure connection"
-msgstr "_Попереджати перед використанням незахищеного з’єднання"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
 
 #: ../data/gui/accounts_window.ui.h:68
-msgid "_use HTTP__PROXY environment variable"
-msgstr "використовувати змінну середовища HTTP_PROXY"
+msgid "Mer_ge accounts"
+msgstr "Об’є_днати облікові записи"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "Обліковий _запис:"
+msgid "Add New Contact"
+msgstr "Додати новий контакт"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Д_озволити цьому контакту бачити мій стан"
+msgid "A_ccount:"
+msgstr "Обліковий _запис:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Додати новий контакт"
+msgid "_Protocol:"
+msgstr "П_ротокол:"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1359
-msgid "I would like to add you to my contact list."
-msgstr "Я хочу додати вас до мого списку контактів."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_Ід. користувача:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Прізвисько:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Група:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Д_озволити цьому контакту бачити мій стан"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "_Зберегти повідомлення підписки"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -536,7 +554,11 @@ msgstr ""
 "з цього протоколу. Натисніть кнопку реєстрації\n"
 "для продовження."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Зареєструвати"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -544,401 +566,368 @@ msgstr ""
 "Ви маєте з’єднатися з транспортом, щоб мати змогу\n"
 "додавати контакти з цього протоколу."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Група:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "_Nickname:"
-msgstr "_Прізвисько:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "П_ротокол:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Зареєструвати"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "_Зберегти повідомлення підписки"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Ід. користувача:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Я хочу додати вас до мого списку контактів."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Сталася помилка:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc команди — Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Оберіть команду для виконання:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Будь ласка, зачекайте на отримання переліку команд..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc команди — Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Оберіть команду для виконання:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Перевірити ще раз"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Опис помилки..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Будь ласка, зачекайте на надсилання команди..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "_Завершити"
+msgid "Please wait..."
+msgstr "Зачекайте, будь ласка..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Будь ласка, зачекайте на отримання переліку команд..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Цей об’єкт jabber не виконує жодних команд."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Будь ласка, зачекайте на надсилання команди..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Сталася помилка:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Зачекайте, будь ласка..."
+msgid "Error description..."
+msgstr "Опис помилки..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Цей об’єкт jabber не виконує жодних команд."
+msgid "F_inish"
+msgstr "_Завершити"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Редактор додаткових налаштувань"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Фільтр:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Опис</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>ЗАУВАЖЕННЯ:</b> Ви маєте перезавантажити Gajim, щоб деякі з параметрів "
 "набули чинності"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Редактор додаткових налаштувань"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Фільтр:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "В_ідновити типові кольори"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Вилучити «Повідомлення дня»"
+msgid "Show _XML Console"
+msgstr "Показати _XML-консоль"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "Вилучає «Повідомлення дня»"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "Редагувати параметри _архівації"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Редагувати _списки конфіденційності..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Адміністратор"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "Надсилає повідомлення усім користувачам, з’єднаним з сервером"
+msgid "_Send Server Message..."
+msgstr "_Надіслати серверне повідомлення..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Встановити «Повідомлення дня»..."
+msgid "Sends a message to users currently connected to this server"
+msgstr "Надсилає повідомлення усім користувачам, з’єднаним з сервером"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Встановлює «Повідомлення дня»"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Показати _XML-консоль"
+msgid "Set MOTD..."
+msgstr "Встановити «Повідомлення дня»..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Оновити «Повідомлення дня»..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Оновлює «Повідомлення дня»"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "Оновити «Повідомлення дня»..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Адміністратор"
+msgid "Delete MOTD"
+msgstr "Вилучити «Повідомлення дня»"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Надіслати серверне повідомлення..."
+msgid "Deletes Message of the Day"
+msgstr "Вилучає «Повідомлення дня»"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr "<i>Автоматичний метод</i>"
+msgid "No"
+msgstr "Ні"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr "<i>Локальний метод</i>"
+msgid "Yes"
+msgstr "Так"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr "<i>Ручний метод</i>"
+msgid "Prefer"
+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
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "Заборонити"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr "<i>Ручний метод</i>"
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "Ні"
+msgid "<i>Method Local</i>"
+msgstr "<i>Локальний метод</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-msgid "Prefer"
-msgstr "Надати перевагу"
+msgid "<i>Method Auto</i>"
+msgstr "<i>Автоматичний метод</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Так"
+msgid "Auto"
+msgstr "Автоматично"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Запис:"
+msgid "New entry received"
+msgstr "Отримано новий запис"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Ви отримали новий запис:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Назва подачі:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Запис:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Востаннє змінено:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Отримано новий запис"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Ви отримали новий запис:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Заблоковані контакти"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5707
-#: ../src/roster_window.py:5834 ../src/roster_window.py:5967
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Повідомлення:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Встановити заняття"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Встановити заняття"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Повідомлення:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Повідомлення:</b> "
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Настрій:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Повідомлення:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Змінити пароль"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Введіть ще раз для підтвердження:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Введіть новий пароль:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Введіть ще раз для підтвердження:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Вкажіть ваше нове повідомлення стану</b>"
+msgid "Save as Preset..."
+msgstr "Зберегти як зразок..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Заняття:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Настрій:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Заняття:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Зразки повідомлень:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Зберегти як зразок..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Вкажіть ваше нове повідомлення стану</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Приєднатись до _групової балачки"
+msgid "_Copy Link Location"
+msgstr "_Копіювати посилання"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Add to Roster..."
-msgstr "_Додати до реєстру..."
+msgid "_Open Link in Browser"
+msgstr "_Відкрити посилання у веб-переглядачі"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Копіювати JID/адресу електронної пошти"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Копіювати посилання"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Відкрити редактор поштових повідомлень"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Відкрити посилання у веб-переглядачі"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Почати балачку"
 
-#: ../data/gui/chat_control.ui.h:1
-msgid "#"
-msgstr "№"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Приєднатись до _групової балачки"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Додати до реєстру..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Показати список емоційок (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Додати цей контакт до реєстру (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Запросити контакти до спілкування (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Запросити контакти до спілкування (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Переглянути журнал балачки (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Показати меню додаткових можливостей (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "№"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Надіслати"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 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+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
-#: ../src/command_system/implementation/standard.py:208
-msgid "Toggle audio session"
-msgstr "Перемкнути аудіо сессію"
-
-#: ../data/gui/chat_control.ui.h:21
-#: ../src/command_system/implementation/standard.py:218
-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:277
-msgid "_Send"
-msgstr "_Надіслати"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "мітка"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "_Запросити"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Запросіть друзів!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Сервер групової балачки"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Будь ласка, оберіть сервер групової балачки."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -946,120 +935,135 @@ msgstr ""
 "Ви маєте намір почати групову балачку.\n"
 "Оберіть контакти, які ви бажаєте запросити"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "З_апитати можливість бачити його/її стан"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Будь ласка, оберіть сервер групової балачки."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Додати особливе _сповіщення"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Сервер групової балачки"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Призначити кл_юч OpenPGP..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "_Запросити"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "Виконати команду..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Почати _балачку"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Редагувати _групи..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Надіслати окреме _повідомлення..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Надіслати _файл..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5643
-#: ../src/roster_window.py:5802
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "За_просити до"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Запросити _контакти"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "M_anage Contact"
-msgstr "К_ерування контактом"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Увімкнути або вимкнути Open_PGP-шифрування"
 
-#: ../data/gui/contact_context_menu.ui.h:9
-msgid "Remo_ve"
-msgstr "В_илучити"
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Увімкнути або вимкнути наскрізне шифрування"
 
-#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5653
-#: ../src/roster_window.py:5891
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Надіслати не_типовий стан"
 
-#: ../data/gui/contact_context_menu.ui.h:11 ../data/gui/roster_window.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Надіслати окреме _повідомлення..."
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "Виконати команду..."
+
+#: ../data/gui/contact_context_menu.ui.h:10
+msgid "M_anage Contact"
+msgstr "К_ерування контактом"
+
+#: ../data/gui/contact_context_menu.ui.h:11
+msgid "_Rename..."
+msgstr "Перей_менувати..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Send _File..."
-msgstr "Надіслати _файл..."
+msgid "Edit _Groups..."
+msgstr "Редагувати _групи..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Set Custom _Avatar..."
-msgstr "Встановити _нетиповий аватар..."
+msgid "Assign Open_PGP Key..."
+msgstr "Призначити кл_юч OpenPGP..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Start _Chat"
-msgstr "Почати _балачку"
+msgid "Set Custom _Avatar..."
+msgstr "Встановити _нетиповий аватар..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle End to End Encryption"
-msgstr "Увімкнути або вимкнути наскрізне шифрування"
+msgid "Add Special _Notification..."
+msgstr "Додати особливе _сповіщення"
 
 #: ../data/gui/contact_context_menu.ui.h:16
-msgid "Toggle Open_PGP Encryption"
-msgstr "Увімкнути або вимкнути Open_PGP-шифрування"
+msgid "_Subscription"
+msgstr "_Підписка"
+
+#: ../data/gui/contact_context_menu.ui.h:17
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Д_озволити цьому контакту бачити мій стан"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-msgid "_Allow him/her to see my status"
-msgstr "_Дозволити йому/їй бачити мій стан"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "З_апитати можливість бачити його/її стан"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5715
-#: ../src/roster_window.py:5840 ../src/roster_window.py:5970
-msgid "_Block"
-msgstr "_Заблокувати"
-
-#: ../data/gui/contact_context_menu.ui.h:20
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "_Заборонити йому/їй бачити мій стан"
 
 #: ../data/gui/contact_context_menu.ui.h:21
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
-#: ../src/roster_window.py:6041
-msgid "_History"
-msgstr "_Журнал"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Заблокувати"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Ignore"
-msgstr "_Ігнорувати"
+msgid "_Unignore"
+msgstr "_Скасувати ігнорування"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "Перей_менувати..."
+msgid "_Ignore"
+msgstr "_Ігнорувати"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Підписка"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "В_илучити"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Скасувати ігнорування"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Журнал"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Заповніть форму."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Налаштування кімнати"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Заповніть форму."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Редагувати групи"
@@ -1072,55 +1076,47 @@ msgstr "(Відомості <b>ESession</b>)"
 msgid "_Verify"
 msgstr "Пере_вірити"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Можливості"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Перелік можливостей Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Можливості"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Перелік активних, завершених та зупинених передач файлів"
+msgid "File Transfers"
+msgstr "Перенесення файлів"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Скасувати передавання файла"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Показує список передавань файлів"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Скасовує обране передавання файла"
+msgid "file transfers list"
+msgstr "перелік передач файлів"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Скасовує обране передавання файла і вилучає файл, що звантажувався"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Перелік активних, завершених та зупинених передач файлів"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Споро_жнити"
+msgid "_Notify me when a file transfer is complete"
+msgstr "П_овідомити мене про завершення передавання файлу"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Перенесення файлів"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Показувати контекстне сповіщення про завершення передавання файла"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Сховати вікно"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Вилучає завершені, скасовані та невдалі передавання файлів зі списку"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Вилучити передавання файла зі списку."
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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"
@@ -1128,80 +1124,105 @@ msgstr ""
 "За допомогою цього пункту можна вилучити окреме передавання файла зі списку. "
 "Якщо це передавання ще триває, його буде зупинено, а потім вже вилучено"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "Споро_жнити"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "П_ризупинити"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Показувати контекстне сповіщення про завершення передавання файла"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Скасовує обране передавання файла і вилучає файл, що звантажувався"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:808
-msgid "_Continue"
-msgstr "_Продовжити"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Скасувати передавання файла"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "П_овідомити мене про завершення передавання файлу"
+msgid "Cancels the selected file transfer"
+msgstr "Скасовує обране передавання файла"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/chat_control.py:3236
-#: ../src/filetransfers_window.py:206
-msgid "_Open Containing Folder"
-msgstr "В_ідкриту теку, яка містить цей файл"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Сховати вікно"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "П_ризупинити"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Продовжити"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "перелік передач файлів"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "В_ідкриту теку, яка містить цей файл"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Кольори вкладки стану балачки</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "Стрічка облікового запису"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1042
-msgid "Bold"
-msgstr "Жирний"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "Стрічка групи"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "Стрічка контакту"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "Шапка балачки"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Створення"
+msgid "Gajim Themes Customization"
+msgstr "Налаштування тем Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "Стрічка контакту"
+msgid "Text _color:"
+msgstr "Колір _тексту:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Тип шрифту:"
+msgid "_Background:"
+msgstr "_Тло:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Налаштування тем Gajim"
+msgid "Text _font:"
+msgstr "_Шрифт тексту:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Пішов"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "Стрічка групи"
+msgid "Font style:"
+msgstr "Тип шрифту:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Неактивний"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Жирний"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1043
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Курсив"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Призупинено"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Створення"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Неактивний"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Кольори вкладки стану балачки</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Пішов"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1209,7 +1230,7 @@ msgstr ""
 "Повідомлення\n"
 "групової балачки"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1217,109 +1238,97 @@ msgstr ""
 "Спрямовані повідомлення\n"
 "групової балачки"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Призупинено"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Колір _тексту:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Шрифт тексту:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Тло:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Змінити _псевдонім..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Керування кімнатою"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Змінити _тему..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Налаштувати _кімнату..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Закладка"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Знищити кімнату"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Керування кімнатою"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Мінімізувати після закриття"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_control_popup_menu.ui.h:7
 msgid "_Request Voice"
 msgstr "_Запит голосу"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Закладка"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "_Send Private Message"
+msgstr "_Надіслати конфіденційне повідомлення"
+
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Mo_derator"
-msgstr "Мо_дератор"
+msgid "Send _File"
+msgstr "Надіслати _файл"
 
 #: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "Дії учасника"
 
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "Send _File"
-msgstr "Надіслати _файл"
+msgid "_Voice"
+msgstr "_Голос"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
-msgid "_Add to Roster"
-msgstr "_Додати до реєстру"
+msgid "Mo_derator"
+msgstr "Мо_дератор"
 
 #: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Учасник"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Адміністратор"
 
-#: ../data/gui/gc_occupants_menu.ui.h:7
-msgid "_Ban"
-msgstr "_Заблокувати"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Власник"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Викинути"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Member"
-msgstr "_Учасник"
+#: ../data/gui/gc_occupants_menu.ui.h:10
+msgid "_Ban"
+msgstr "_Заблокувати"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Owner"
-msgstr "_Власник"
-
-#: ../data/gui/gc_occupants_menu.ui.h:13
-msgid "_Send Private Message"
-msgstr "_Надіслати конфіденційне повідомлення"
-
-#: ../data/gui/gc_occupants_menu.ui.h:15
-msgid "_Voice"
-msgstr "_Голос"
+msgid "_Add to Roster"
+msgstr "_Додати до реєстру"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Показати список інструментів форматування"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Змінити ваш псевдонім (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1331,35 +1340,20 @@ msgid "From:"
 msgstr "Від:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 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."
-msgstr ""
-"<b>УВАГА:</b>\n"
-"Якщо ви плануєте масові вилучення, будь ласка, переконайтеся, що Gajim не "
-"запущено. Взагалі, уникайте вилучення контактів, з якими ви зараз "
-"спілкуєтеся."
+msgid "Gajim History Logs Manager"
+msgstr "Інструмент керування журналами Gajim"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 "<big><b>Ласкаво просимо до інструменту керування журналами Gajim</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "Експортувати"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Інструмент керування журналами Gajim"
-
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1374,26 +1368,41 @@ msgstr ""
 "лівій частині вікна ви можете обрати журнали, пошук у базі даних можна "
 "виконати нижче."
 
-#: ../data/gui/history_manager.ui.h:9
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>УВАГА:</b>\n"
+"Якщо ви плануєте масові вилучення, будь ласка, переконайтеся, що Gajim не "
+"запущено. Взагалі, уникайте вилучення контактів, з якими ви зараз "
+"спілкуєтеся."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Шукати у базі даних"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "Усі журнали балачок"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:324
-msgid "Conversation History"
-msgstr "Журнал спілкування"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Експортувати"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "Введіть JID або ім’я контакту"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr "Історія групових балачок"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "Усі журнали балачок"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Журнал спілкування"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Пошук:"
@@ -1403,144 +1412,147 @@ msgid "_In date search"
 msgstr "_Пошук по даті"
 
 #: ../data/gui/history_window.ui.h:7
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#, fuzzy
+msgid "Searching only in the selected day "
+msgstr "шукати лише зазначений день"
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
-#: ../data/gui/history_window.ui.h:8
-msgid "searching only in the selected day "
-msgstr "шукати лише зазначений день"
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Записувати зміни стану контактів"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
-msgstr "підтвердити"
+msgid "expire"
+msgstr "застаріти"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
-msgstr "тіло"
+msgid "save"
+msgstr "зберегти"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr "припустити"
+msgid "otr"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr "застаріти"
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr "хибне"
+msgid "body"
+msgstr "тіло"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
-msgstr "заборонити"
+msgid "false"
+msgstr "хибне"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../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:8
+msgid "stream"
+msgstr "потік"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
-msgstr "проотиставити"
+msgid "approve"
+msgstr "підтвердити"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
-msgstr "otr"
+msgid "concede"
+msgstr "припустити"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
-msgstr "надати перевагу"
+msgid "forbid"
+msgstr "заборонити"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
-msgstr "вимагати"
+msgid "oppose"
+msgstr "проотиставити"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr "зберегти"
+msgid "prefer"
+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 "_Перегляд кімнат"
+msgid "require"
+msgstr "вимагати"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2334
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "Автоматично заходити до цієї кімнати після з’єднання"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Кімната:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Псевдонім:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Нещодавно:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Нещодавно:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "Автоматично заходити до цієї кімнати після з’єднання"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-msgid "Room:"
-msgstr "Кімната:"
+msgid "_Bookmark this room"
+msgstr "Зробити закладку на цій кімнаті"
 
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1859
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Сервер:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "Зробити закладку на цій кімнаті"
+msgid "Bro_wse Rooms"
+msgstr "_Перегляд кімнат"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "При_єднатися"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "A_uto join"
-msgstr "Автоматичне приєднання"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде приєднуватись до цієї групової "
-"балачки після запуску"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Керування закладками"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimi_ze on Auto Join"
-msgstr "Мінімізувати після автоматичного приєднання"
+msgid "Roo_m:"
+msgstr "Кімната:"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Title:"
+msgstr "_Назва:"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Pr_int status:"
 msgstr "Друкувати стан:"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Roo_m:"
-msgstr "Кімната:"
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "A_uto join"
+msgstr "Автоматичне приєднання"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде приєднуватись до цієї групової "
+"балачки після запуску"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "_Title:"
-msgstr "_Назва:"
+msgid "Minimi_ze on Auto Join"
+msgstr "Мінімізувати після автоматичного приєднання"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1551,124 +1563,129 @@ msgid "_Configure"
 msgstr "_Налаштувати..."
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Властивості</b>"
+msgid "HTTP Connect"
+msgstr "HTTP-з’єднання"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Параметри</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP-з’єднання"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Керування профілями проксі"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "Тип:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Па_роль:"
+msgid "_Name:"
+msgstr "_Назва:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Проксі-_вузол:"
+msgid "<b>Properties</b>"
+msgstr "<b>Властивості</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Проксі-п_орт:"
+msgid "Use HTTP prox_y"
+msgstr "Використовувати HTTP-проксі"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_Адреса URL BOSH:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Використовувати HTTP-проксі"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Використовувати розпізнавання на проксі"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Користувач:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_Адреса URL BOSH:"
+msgid "Pass_word:"
+msgstr "Па_роль:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Назва:"
+msgid "Proxy _Host:"
+msgstr "Проксі-_вузол:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "Тип:"
+msgid "Proxy _Port:"
+msgstr "Проксі-п_орт:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Користувач:"
+msgid "<b>Settings</b>"
+msgstr "<b>Параметри</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "_Керування контактами"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Пароль"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;порожньо&gt;"
+msgid "Plugins"
+msgstr "Додатки"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<порожньо>"
+msgid "Install from zip"
+msgstr "Встановити з архіву zip"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "Автори:"
+msgid "&lt;empty&gt;"
+msgstr "&lt;порожньо&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Configure"
-msgstr "Налаштувати"
+msgid "Version:"
+msgstr "Версія:"
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Description:"
-msgstr "Опис: "
+msgid "<empty>"
+msgstr "<порожньо>"
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Homepage:"
-msgstr "Домашня сторінка:"
+msgid "Authors:"
+msgstr "Автори:"
 
 #: ../data/gui/plugins_window.ui.h:7
-msgid "Install from zip"
-msgstr "Встановити з архіву zip"
+msgid "Homepage:"
+msgstr "Домашня сторінка:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Installed"
-msgstr "Встановлено"
+msgid "homepage url"
+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 "Description:"
+msgstr "Опис: "
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid "Plugins"
-msgstr "Додатки"
-
-#: ../data/gui/plugins_window.ui.h:11
 msgid "Uninstall"
 msgstr "Видалити"
 
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Configure"
+msgstr "Налаштувати"
+
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Version:"
-msgstr "Версія:"
+msgid "Installed"
+msgstr "Встановлено"
 
 #: ../data/gui/plugins_window.ui.h:13
-msgid "homepage url"
-msgstr "адреса домашньої сторінки"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+"Тут має бути показано опис додатка. Цей текст буде видалено при "
+"ініціалізації вікна додатків."
 
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
@@ -1679,214 +1696,279 @@ msgid "Event desc"
 msgstr "Опис події"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Редактор додаткових налаштувань</b>"
+msgid "Use default applications"
+msgstr "Використовувати типові програми"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Програми</b>"
+msgid "Custom"
+msgstr "Нетиповий"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Аудіо</b>"
+msgid "All chat states"
+msgstr "Усі стани балачок"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Автоматичне встановлення стану</b>"
+msgid "Composing only"
+msgstr "Лише друк"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Вигляд вікна балачки</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Вимкнено"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Кольори рядків балачки</b>"
+msgid "Never"
+msgstr "Ніколи"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Сповіщення про стан у балачці</b>"
+msgid "Only when pending events"
+msgstr "Лише події, що очікують уваги"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>З’єднання</b>"
+msgid "Always"
+msgstr "Завжди"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "Підняти це"
 
-#. 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>"
+msgid "Notify me about it"
+msgstr "Сповіщати мене про це"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Шрифт</b>"
+msgid "Show only in roster"
+msgstr "_Показати лише у реєстрі"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Параметри GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr "Відокремлений реєстр з окремими балачками"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "Відокремлений реєстр з єдиним вікном балачок"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Зразки повідомлень про стан</b>"
+msgid "Single window for everything"
+msgstr "Єдине вікно для усього"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Конфіденційність</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+"Відокремлений реєстр з балачками згуртованими відповідно облікових записів"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Вигляд реєстру</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "Відокремлений реєстр з балачками згуртованими відповідно типу"
 
 #: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Звуки</b>"
+msgid "Last state"
+msgstr "Попередній стан: %"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Повідомлення про стан</b>"
+msgid "Preferences"
+msgstr "Параметри"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Теми</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Показувати _аватари контактів у реєстрі"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>Відео</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у "
+"вікні реєстру і групових балачках"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Візуальні сповіщення</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Показувати _повідомлення  про стан контактів з реєстру"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(приклад: stunserver.org)</i>"
+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:23
-msgid "Advanced"
-msgstr "Додатково"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Показувати _положення контактів у реєстрі"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "All chat states"
-msgstr "Усі стани балачок"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
+"реєстру"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "Allow client / _OS information to be sent"
-msgstr "Дозволити надсилання інформації про _операційну систему"
+msgid "Sort contacts by status"
+msgstr "Впорядкувати контакти за станом"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow local system time information to be sent"
-msgstr "Дозволити надсилання інформації про місцевий час"
+msgid "in _roster"
+msgstr "у _реєстрі"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "Дозволити надсилання часу бездіяльності"
+msgid "in _group chats"
+msgstr "у _групових балачках"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Вигляд реєстру</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Дозволити звуки у стані _зайнятий."
+msgid "_Window behavior:"
+msgstr "Пов_едінка вікна:"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "Завжди"
+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:31
-msgid "Ask status message when I:"
-msgstr "Запитувати щодо повідомлення про стан, якщо я:"
+msgid "_Emoticons:"
+msgstr "_Емоційки:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:106
-msgid "Audio / Video"
-msgstr "Аудіо/Відео"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "У_щільнити компонування вікон повідомлень"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "Пристрій введення звуку"
+msgid "Hide all buttons in chat windows"
+msgstr "Сховати усі кнопки у вікнах балачок"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "Пристрій відтворення звуку"
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ігнорувати позначки форматування у вхідних повідомленнях"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Повідомлення балачки:"
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Перевіряти при запуску, чи є Gajim _типовим клієнтом Jabber"
+msgid "_Highlight misspelled words"
+msgstr "_Виділяти слова з помилками"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
-msgstr "Лише друк"
+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:38
-msgid "Configure color and font of the interface"
-msgstr "Налаштувати шрифт та колір інтерфейсу"
+msgid "_Show roster on startup:"
+msgstr "_Показувати реєстр при старті:з"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "Повідомлення контакту:"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "Псевдонім контакту:"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Нетиповий"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Вигляд вікна балачки</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
-"Відокремлений реєстр з балачками згуртованими відповідно облікових записів"
+msgid "When new event is received:"
+msgstr "Якщо отримано нову подію:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr "Відокремлений реєстр з балачками згуртованими відповідно типу"
+msgid "Notify me about contacts that sign _in"
+msgstr "Сповіщати мене про в_хід контактів до мережі"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr "Відокремлений реєстр з окремими балачками"
+msgid "Notify me about contacts that sign _out"
+msgstr "Сповіщати мене про в_ихід контактів з мережі"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr "Відокремлений реєстр з єдиним вікном балачок"
+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:46 ../src/config.py:171
-#: ../src/config.py:683
-msgid "Disabled"
-msgstr "Вимкнено"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Показувати _заняття контактів у реєстрі"
+msgid "Notify on new _GMail email"
+msgstr "Сповіщати про нові листи _GMail"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Показати _подробиці щодо скриньки"
+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:49
-msgid "Display _location of contacts in roster"
-msgstr "Показувати _положення контактів у реєстрі"
+msgid "Display _extra email details"
+msgstr "Показати _подробиці щодо скриньки"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Показувати _музику контактів у реєстрі"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде також додавати інформацію про "
+"авторів листів"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Показувати _аватари контактів у реєстрі"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Параметри GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Показувати _настрій контактів у реєстрі"
+msgid "Show notification area icon:"
+msgstr "Показувати піктограму зони сповіщень"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Показувати _повідомлення  про стан контактів з реєстру"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Візуальні сповіщення</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Відтворювати _звуки"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Ке_рування..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Дозволити звуки у стані _зайнятий."
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Звуки</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+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 "
@@ -1896,7 +1978,11 @@ msgstr ""
 "ви вели з контактом. Тут ви можете вказати стани, які ви бажаєте бачити у "
 "вікні розмови."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Показувати сповіщення стану балачки:"
+
+#: ../data/gui/preferences_window.ui.h:61
 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,696 +1992,615 @@ msgstr ""
 "спілкуванням з контактом. Тут ви можете зазначити стани, які ви бажаєте "
 "надсилати іншому учаснику балачки."
 
-#: ../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 "Global proxy:"
-msgstr "Глобальний проксі:"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid "Hide all buttons in chat windows"
-msgstr "Сховати усі кнопки у вікнах балачок"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, яку "
-"операційну систему ви використовуєте"
-
-#: ../data/gui/preferences_window.ui.h:61
-msgid "If checked, Gajim will allow others to detect the time on your system"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
-"час"
-
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде також додавати інформацію про "
-"авторів листів"
+msgid "_Send chat state notifications:"
+msgstr "_Надсилати сповіщення про стан балачки:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде змінювати стан на «Відсутній», "
-"якщо комп’ютер не використовуватиметься."
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Сповіщення про стан у балачці</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо "
-"на комп’ютері не спостерігатиметься активності користувача довше, ніж"
+msgid "Personal Events"
+msgstr "Особисті події"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у "
-"вікні реєстру і групових балачках"
+msgid "_Away after:"
+msgstr "«_Відсутній» через:"
 
 #: ../data/gui/preferences_window.ui.h:66
 msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде показувати повідомлення про стан "
-"під ім'ям контакту у вікні реєстру і групових балачках"
+"Якщо буде позначено цей пункт, Gajim буде змінювати стан на «Відсутній», "
+"якщо комп’ютер не використовуватиметься."
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim показуватиме рід занять контактів у "
-"вікні реєстру"
+msgid "_Not available after:"
+msgstr "«_Не доступний» через:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Якщо буде позначено цей пункт, Gajim показуватиме положення контактів у "
-"вікні реєстру"
+"Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо "
+"на комп’ютері не спостерігатиметься активності користувача довше, ніж"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
-"реєстру"
+msgid "minutes"
+msgstr "хвилин"
 
 #: ../data/gui/preferences_window.ui.h:70
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim показуватиме музику, яку слухають "
-"контакти у вікні реєстру"
-
-#: ../data/gui/preferences_window.ui.h:71
-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:72
-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"
+"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 ігноруватиме вхідні повідомлення про "
-"події від неуповноважених контактів. Вам слід бути обережним з цією "
-"можливістю, оскільки її за її використання всі повідомлення від контактів, "
-"яких немає у реєстрі, буде заблоковано."
+"Автоматичне повідомлення про відсутність. Якщо ви не вкажете тексту "
+"повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
 #: ../data/gui/preferences_window.ui.h:73
 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:74
-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:75
-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...)"
+"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 буде використовувати специфічні для "
-"протоколу піктограми станів. (Приклад: для контактів MSN будуть використані "
-"відповідні піктограми msn для станів «в мережі», «відсутній» тощо)"
+"Автоматичне повідомлення про недоступність. Якщо ви не вкажете тексту "
+"повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim не запитуватиме про повідомлення стану. "
-"Програма використовуватиме вказане типове повідомлення."
+msgid "<b>Auto Status</b>"
+msgstr "<b>Автоматичне встановлення стану</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr ""
-"Якщо цей пункт буде позначено, Gajim замінюватиме ascii-емоційки, наприклад, "
-"':)' відповідними статичними або анімованими емоційками"
+msgid "Ask status message when I:"
+msgstr "Запитувати щодо повідомлення про стан, якщо я:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Last state"
-msgstr "Попередній стан: %"
+msgid "Sign _in"
+msgstr "Уві_йти"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Log _encrypted chat session"
-msgstr "Записувати до журналу _шифровані сеанси балачки"
+msgid "Sign _out"
+msgstr "Вий_ти"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Ma_ke message windows compact"
-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:81
-msgid "Ma_nage..."
-msgstr "Ке_рування..."
+msgid "<b>Status Messages</b>"
+msgstr "<b>Повідомлення про стан</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Never"
-msgstr "Ніколи"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Зразки повідомлень про стан</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notifications"
-msgstr "Сповіщення"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Стан"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify me about contacts that sign _in"
-msgstr "Сповіщати мене про в_хід контактів до мережі"
+msgid "Use system _default"
+msgstr "Використовувати _типове для системи"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Notify me about contacts that sign _out"
-msgstr "Сповіщати мене про в_ихід контактів з мережі"
+msgid "Chat message:"
+msgstr "Повідомлення балачки:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Notify me about it"
-msgstr "Сповіщати мене про це"
+msgid "<b>Font</b>"
+msgstr "<b>Шрифт</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Notify on new _GMail email"
-msgstr "Сповіщати про нові листи _GMail"
+msgid "Use _transports icons"
+msgstr "Використовувати піктограми _транспортів"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Only when pending events"
-msgstr "Лише події, що очікують уваги"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. 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:89
-msgid "Personal Events"
-msgstr "Особисті події"
+msgid "Status _iconset:"
+msgstr "Набір _піктограм стану:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid "Play _sounds"
-msgstr "Відтворювати _звуки"
+msgid "Configure color and font of the interface"
+msgstr "Налаштувати шрифт та колір інтерфейсу"
 
 #: ../data/gui/preferences_window.ui.h:91
-msgid "Pop it up"
-msgstr "Підняти це"
+msgid "T_heme:"
+msgstr "Т_ема:"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "Preferences"
-msgstr "Параметри"
+msgid "<b>Themes</b>"
+msgstr "<b>Теми</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
-"Ім’я серверу STUN. Якщо нічого не вказано\n"
-"Gajim спробує отримати значення з серверу."
+msgid "Contact's nickname:"
+msgstr "Псевдонім контакту:"
+
+#: ../data/gui/preferences_window.ui.h:94
+msgid "Your nickname:"
+msgstr "Ваш псевдонім:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "STUN server:"
-msgstr "Сервер STUN:"
+msgid "_Status message:"
+msgstr "_Повідомлення про стан:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Show notification area icon:"
-msgstr "Показувати піктограму зони сповіщень"
+msgid "_URL highlight:"
+msgstr "Вид_ілення адрес URL:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Show only in roster"
-msgstr "_Показати лише у реєстрі"
+msgid "_Reset to Default Colors"
+msgstr "В_ідновити типові кольори"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid "Sign _in"
-msgstr "Уві_йти"
+msgid "Contact's message:"
+msgstr "Повідомлення контакту:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sign _out"
-msgstr "Вий_ти"
+msgid "Your message:"
+msgstr "Ваше повідомлення:"
 
 #: ../data/gui/preferences_window.ui.h:100
-msgid "Single window for everything"
-msgstr "Єдине вікно для усього"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Виділення повідомлення групової балачки"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"У деяких повідомленнях може міститися текст з форматуванням (розташування "
-"тексту, кольори тощо). Якщо буде позначено цей пункт, Gajim показуватиме "
-"простий текст без форматування."
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Кольори рядків балачки</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
-msgid "Sort contacts by status"
-msgstr "Впорядкувати контакти за станом"
+msgid "Style"
+msgstr "Стиль"
 
-#: ../data/gui/preferences_window.ui.h:103 ../src/config.py:401
-msgid "Status"
-msgstr "Стан"
+#: ../data/gui/preferences_window.ui.h:103
+msgid "Audio input device"
+msgstr "Пристрій введення звуку"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid "Status _iconset:"
-msgstr "Набір _піктограм стану:"
+msgid "Audio output device"
+msgstr "Пристрій відтворення звуку"
 
 #: ../data/gui/preferences_window.ui.h:105
-msgid "Style"
-msgstr "Стиль"
+msgid "<b>Audio</b>"
+msgstr "<b>Аудіо</b>"
 
 #: ../data/gui/preferences_window.ui.h:106
-msgid "T_heme:"
-msgstr "Т_ема:"
+msgid "Video input device"
+msgstr "Пристрій введення відео"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"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 не змінюватиме поточного повідомлення про стан."
+msgid "Video output device"
+msgstr "Пристрій відтворення відео"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "Частота кадрів відео"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "Розмір відео"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid ""
-"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"
+msgid "View own video source"
 msgstr ""
-"Автоматичне повідомлення про недоступність. Якщо ви не вкажете тексту "
-"повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
+
+#: ../data/gui/preferences_window.ui.h:111
+msgid "<b>Video</b>"
+msgstr "<b>Відео</b>"
+
+#: ../data/gui/preferences_window.ui.h:112
+msgid "STUN server:"
+msgstr "Сервер STUN:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Use _transports icons"
-msgstr "Використовувати піктограми _транспортів"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(приклад: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Use default applications"
-msgstr "Використовувати типові програми"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Use system _default"
-msgstr "Використовувати _типове для системи"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+"Ім’я серверу STUN. Якщо нічого не вказано\n"
+"Gajim спробує отримати значення з серверу."
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video framerate"
-msgstr "Частота кадрів відео"
+msgid "<b>Connection</b>"
+msgstr "<b>З’єднання</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "Video input device"
-msgstr "Пристрій введення відео"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "Аудіо/Відео"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Video output device"
-msgstr "Пристрій відтворення відео"
+msgid "_File manager:"
+msgstr "_Менеджер файлів:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Video size"
-msgstr "Розмір відео"
+msgid "_Mail client:"
+msgstr "_Поштовий клієнт:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "When new event is received:"
-msgstr "Якщо отримано нову подію:"
-
-#: ../data/gui/preferences_window.ui.h:121
-msgid "Your message:"
-msgstr "Ваше повідомлення:"
+msgid "_Browser:"
+msgstr "_Веб-переглядач:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "Your nickname:"
-msgstr "Ваш псевдонім:"
+msgid "<b>Custom</b>"
+msgstr "<b>Нетипове</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Away after:"
-msgstr "«_Відсутній» через:"
+msgid "<b>Applications</b>"
+msgstr "<b>Програми</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_Browser:"
-msgstr "_Веб-переглядач:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ігнорувати події від контактів поза реєстром"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Display chat state notifications:"
-msgstr "_Показувати сповіщення стану балачки:"
+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:126
-msgid "_Emoticons:"
-msgstr "_Емоційки:"
+msgid "Allow client / _OS information to be sent"
+msgstr "Дозволити надсилання інформації про _операційну систему"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_File manager:"
-msgstr "_Менеджер файлів:"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, яку "
+"операційну систему ви використовуєте"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Highlight misspelled words"
-msgstr "_Виділяти слова з помилками"
+msgid "Allow local system time information to be sent"
+msgstr "Дозволити надсилання інформації про місцевий час"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ігнорувати події від контактів поза реєстром"
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
+"час"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ігнорувати позначки форматування у вхідних повідомленнях"
+msgid "Log _encrypted chat session"
+msgstr "Записувати до журналу _шифровані сеанси балачки"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Log status changes of contacts"
-msgstr "_Записувати зміни стану контактів"
+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:132
-msgid "_Mail client:"
-msgstr "_Поштовий клієнт:"
+msgid "Allow my _idle time to be sent"
+msgstr "Дозволити надсилання часу бездіяльності"
 
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Not available after:"
-msgstr "«_Не доступний» через:"
+#: ../data/gui/preferences_window.ui.h:133
+msgid "Global proxy:"
+msgstr "Глобальний проксі:"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Open..."
-msgstr "_Відкрити..."
+msgid "<b>Privacy</b>"
+msgstr "<b>Конфіденційність</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Reset to Default Colors"
-msgstr "В_ідновити типові кольори"
+msgid "_Log status changes of contacts"
+msgstr "_Записувати зміни стану контактів"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "_Send chat state notifications:"
-msgstr "_Надсилати сповіщення про стан балачки:"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "_Show roster on startup:"
-msgstr "_Показувати реєстр при старті:з"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Перевіряти при запуску, чи є Gajim _типовим клієнтом Jabber"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "_Status message:"
-msgstr "_Повідомлення про стан:"
+msgid "_Open..."
+msgstr "_Відкрити..."
 
 #: ../data/gui/preferences_window.ui.h:140
-msgid "_URL highlight:"
-msgstr "Вид_ілення адрес URL:"
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Редактор додаткових налаштувань</b>"
 
 #: ../data/gui/preferences_window.ui.h:141
-msgid "_Window behavior:"
-msgstr "Пов_едінка вікна:"
-
-#: ../data/gui/preferences_window.ui.h:142
-msgid "in _group chats"
-msgstr "у _групових балачках"
-
-#: ../data/gui/preferences_window.ui.h:143
-msgid "in _roster"
-msgstr "у _реєстрі"
-
-#: ../data/gui/preferences_window.ui.h:144
-msgid "minutes"
-msgstr "хвилин"
+msgid "Advanced"
+msgstr "Додатково"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Списки конфіденційності:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Додати / Змінити правило</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Список конфіденційності"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Перелік правил</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Список конфіденційності</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Активний для поточного сеансу"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Активний завжди"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Перелік правил</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Всі"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Додати / Змінити правило</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Всі (за підпискою)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Дозволити"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Відмовити"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "всі у групі"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Порядок:"
+msgid "all by subscription"
+msgstr "всі за підпискою"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3979
-msgid "Privacy List"
-msgstr "Список конфіденційності"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Всі"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "всі за підпискою"
+msgid "to send me messages"
+msgstr "для надсилання мені повідомлень"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "всі у групі"
+msgid "to send me queries"
+msgstr "для надсилання мені запитів"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "обидві"
+msgid "to view my status"
+msgstr "для перегляду мого стану"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "від"
+msgid "to send me status"
+msgstr "для надсилання мені стану"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "нічого"
+msgid "All (including subscription)"
+msgstr "Всі (за підпискою)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "до"
+msgid "Order:"
+msgstr "Порядок:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "для надсилання мені повідомлень"
+msgid "none"
+msgstr "нічого"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "для надсилання мені запитів"
+msgid "both"
+msgstr "обидві"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "для надсилання мені стану"
+msgid "from"
+msgstr "від"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "для перегляду мого стану"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Адреса</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Аватар:</b>"
+msgid "to"
+msgstr "до"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>День народження:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Місто:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Прізвище:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Компанія:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Country:</b>"
-msgstr "<b>Країна:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>По батькові:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>Department:</b>"
-msgstr "<b>Відділ:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>E-Mail:</b>"
-msgstr "<b>Адреса ел. пошти:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Префікс:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:13
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Додаткова адреса:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Ім'я:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:15
-msgid "<b>Family:</b>"
-msgstr "<b>Прізвище:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Суфікс:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Ім’я повністю</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Вулиця:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Given:</b>"
-msgstr "<b>Ім'я:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Місто:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:19
-msgid "<b>Homepage:</b>"
-msgstr "<b>Домашня сторінка:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Область:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Додаткова адреса:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Middle:</b>"
-msgstr "<b>По батькові:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Поштовий індекс:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Name:</b>"
-msgstr "<b>Ім’я:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Країна:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Nickname:</b>"
-msgstr "<b>Псевдонім:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Адреса</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Номер телефону:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Домашня сторінка:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Position:</b>"
-msgstr "<b>Посада:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Ім’я:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:27
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Поштовий індекс:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Псевдонім:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Номер телефону:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:29
-msgid "<b>Prefix:</b>"
-msgstr "<b>Префікс:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Формат: РРРР-ММ-ДД"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>Role:</b>"
-msgstr "<b>Роль:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>День народження:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:32
-msgid "<b>State:</b>"
-msgstr "<b>Область:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>Адреса ел. пошти:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:34
-msgid "<b>Street:</b>"
-msgstr "<b>Вулиця:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Аватар:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Натисніть, щоб встановити свій аватар"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:38
-msgid "<b>Suffix:</b>"
-msgstr "<b>Суфікс:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Особисті відомості"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/profile_window.ui.h:30
 #: ../data/gui/vcard_information_window.ui.h:42
-msgid "About"
-msgstr "Відомості"
+msgid "<b>Company:</b>"
+msgstr "<b>Компанія:</b>"
+
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Посада:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Натисніть, щоб встановити свій аватар"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Відділ:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "Format: YYYY-MM-DD"
-msgstr "Формат: РРРР-ММ-ДД"
+#: ../data/gui/vcard_information_window.ui.h:45
+msgid "<b>Role:</b>"
+msgstr "<b>Роль:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "Personal Info"
-msgstr "Особисті відомості"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Робота"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Що бажаєте робити?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Відомості"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Вилучити обліковий запис _лише з Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Вилучити обліковий запис з Gajim та з _сервера"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Що бажаєте робити?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5725
-#: ../src/roster_window.py:5850 ../src/roster_window.py:5980
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "В_илучити"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Обмін елементами реєстру"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2603,112 +2608,113 @@ 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 ""
-"Тіло повідомлення <наразі не використовується, тому зазвичай приховане>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Обмін елементами реєстру"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "Додати _контакт..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "Мо_жливості"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Передавання _файлів"
-
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Часті питання (в Мережі)"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Дії"
 
 #: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Довідка у Тенетах"
+msgid "Add _Contact..."
+msgstr "Додати _контакт..."
 
-#: ../data/gui/roster_window.ui.h:8
-msgid "P_lugins"
-msgstr "Додатки"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Правка"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Профіль, _аватар"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Облікові записи"
 
 #: ../data/gui/roster_window.ui.h:11
-msgid "Show Only _Active Contacts"
-msgstr "Показувати лише _активні контакти"
+msgid "Profile, A_vatar"
+msgstr "Профіль, _аватар"
 
 #: ../data/gui/roster_window.ui.h:12
-msgid "Show T_rans_ports"
-msgstr "Показувати транс_порти"
+msgid "P_lugins"
+msgstr "Додатки"
 
 #: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "П_ерегляд"
+
+#: ../data/gui/roster_window.ui.h:14
 msgid "Show _Offline Contacts"
 msgstr "Показувати _від’єднані контакти"
 
-#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
-msgid "Show _Roster"
-msgstr "Показати _реєстр"
-
 #: ../data/gui/roster_window.ui.h:15
-msgid "_Accounts"
-msgstr "_Облікові записи"
+msgid "Show Only _Active Contacts"
+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:16
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Дії"
+#, fuzzy
+msgid "Show T_ransports"
+msgstr "Показувати транс_порти"
+
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
+msgid "Show _Roster"
+msgstr "Показати _реєстр"
 
 #: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Передавання _файлів"
+
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Довідка"
+
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Вміст"
 
-#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Правка"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Довідка у Тенетах"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_ЧаП"
 
-#: ../data/gui/roster_window.ui.h:22
-msgid "_Help"
-msgstr "_Довідка"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Часті питання (в Мережі)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "П_ерегляд"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Будь ласка, зачекайте на отримання пошукової форми..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Мо_жливості"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Пошук"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Будь ласка, зачекайте на отримання пошукової форми..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Дод_ати контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5992
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "_Інформація"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Пошук"
 
@@ -2728,43 +2734,37 @@ msgstr "Зареєструватись на"
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Відповісти на це повідомлення"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Кому:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "_Надіслати"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Надіслати повідомлення"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Надіслати повідомлення і закрити вікно"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Відповісти"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Кому:"
+msgid "Reply to this message"
+msgstr "Відповісти на це повідомлення"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Відповісти"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Надіслати і закрити"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Надіслати повідомлення і закрити вікно"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Уповноважити"
+msgid "Subscription Request"
+msgstr "Запит на підписку"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr ""
-"Уповноважити контакт, щоб він або вона могли бачити, коли ви виходите на "
-"зв'язок."
+msgid "_Deny"
+msgstr "_Заборонити"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2774,259 +2774,271 @@ msgstr ""
 "Заборонити уповноваження контакту, щоб він або вона не могли бачити, коли ви "
 "виходите на зв'язок."
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Запит на підписку"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Уповноважити"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Заборонити"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+"Уповноважити контакт, щоб він або вона могли бачити, коли ви виходите на "
+"зв'язок."
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Синхронізувати контакти"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Оберіть обліковий запис, з яким слід виконати синхронізацію"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Виберіть контакти, які ви бажаєте синхронізувати"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхронізація: оберіть контакти"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Вимкнути звук"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Надіслати окреме _повідомлення"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Показати усі _події з черги"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Виберіть контакти, які ви бажаєте синхронізувати"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Ста_н"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Групова балачка"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Запитати:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Надіслати окреме _повідомлення"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Клієнт:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Показати усі _події з черги"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Configured avatar:</b>"
-msgstr "<b>Налаштований аватар:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Вимкнути звук"
 
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Contact time:</b>"
-msgstr "<b>Область:</b>"
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Контактна інформація"
 
-#: ../data/gui/vcard_information_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Ідентифікатор Jabber:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Стан:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:36
-msgid "<b>Subscription:</b>"
-msgstr "<b>Підписка:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Клієнт:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:39
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Система:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Область:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>User avatar:</b>"
 msgstr "<b>Аватар:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-msgid "Comments"
-msgstr "Коментарі"
+#: ../data/gui/vcard_information_window.ui.h:9
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>Налаштований аватар:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Контакт"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Підписка:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:45
-msgid "Contact Information"
-msgstr "Контактна інформація"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Запитати:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Більше"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>Фільтр</b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Контакт"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Коментарі"
+
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Трафік Jabber</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Ввід XML</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "Ховати станси IN"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "Ховати станси IQ"
+msgid "Hide OUT stanzas"
+msgstr "Ховати станси OUT"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "Ховати станси повідомлення"
+msgid "Hide Presence stanzas"
+msgstr "Ховати станси присутності"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "Ховати станси OUT"
+msgid "Hide IQ stanzas"
+msgstr "Ховати станси IQ"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "Ховати станси присутності"
+msgid "Hide Message stanzas"
+msgstr "Ховати станси повідомлення"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Інформація/Запит"
+msgid "<b>Filter</b>"
+msgstr "<b>Фільтр</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Інформація/Запит"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "П_рисутність"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Повідомлення"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "П_рисутність"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Ввід XML</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Змінити обліковий запис..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Локальний jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Особисте"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Jabber клієнт, що базується на GTK+"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Особисте"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Програма для обміну миттєвими повідомленнями Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Клієнт служби миттєвих повідомлень Jabber"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Jabber клієнт, що базується на GTK+"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Скасувати підтвердження"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Зараз виконується команда. Ви справді бажаєте скасувати її виконання?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 msgid "Invalid Form"
 msgstr "Некоректна форма"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 msgid "The form is not filled correctly."
 msgstr "Форму заповнено некоректно"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Служба надіслала неправильно форматовані дані"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Служба змінила ідентифікатор сеансу."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc команди — Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Служба повернула повідомлення про помилку."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Увімкнено"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Вимкнено"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Булеве"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Ціле число"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1062
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Колір"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Назва параметра"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Значення"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(Немає)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Сховано"
 
@@ -3038,259 +3050,185 @@ msgstr[0] "Ви отримали нові записи (та %d не було п
 msgstr[1] "Ви отримали нові записи (та %d не було показано):"
 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)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:85
-msgid "English"
-msgstr "Англійська"
-
-#: ../src/chat_control.py:85
-msgid "Belarusian"
-msgstr "Білоруська"
-
-#: ../src/chat_control.py:85
-msgid "Bulgarian"
-msgstr "Болгарська"
-
-#: ../src/chat_control.py:85
-msgid "Breton"
-msgstr "Бретонська"
-
-#: ../src/chat_control.py:85
-msgid "Czech"
-msgstr "Чеська"
-
-#: ../src/chat_control.py:85
-msgid "German"
-msgstr "Німецька"
-
-#: ../src/chat_control.py:85
-msgid "Greek"
-msgstr "Грецька"
-
-#: ../src/chat_control.py:85
-msgid "British"
-msgstr "Британська англійська"
-
-#: ../src/chat_control.py:85
-msgid "Esperanto"
-msgstr "Есперанто"
-
-#: ../src/chat_control.py:85
-msgid "Spanish"
-msgstr "Іспанська"
-
-#: ../src/chat_control.py:85
-msgid "Basque"
-msgstr "Баскська"
-
-#: ../src/chat_control.py:85
-msgid "French"
-msgstr "Французька"
-
-#: ../src/chat_control.py:85
-msgid "Croatian"
-msgstr "Хорватська"
-
-#: ../src/chat_control.py:85
-msgid "Italian"
-msgstr "Італійська"
-
-#: ../src/chat_control.py:85
-msgid "Norwegian (b)"
-msgstr "Норвезька (b)"
-
-#: ../src/chat_control.py:85
-msgid "Dutch"
-msgstr "Нідерландська"
-
-#: ../src/chat_control.py:85
-msgid "Norwegian"
-msgstr "Норвезька"
-
-#: ../src/chat_control.py:85
-msgid "Polish"
-msgstr "Польська"
-
-#: ../src/chat_control.py:85
-msgid "Portuguese"
-msgstr "Португальська"
-
-#: ../src/chat_control.py:85
-msgid "Brazilian Portuguese"
-msgstr "Бразильська португальська"
-
-#: ../src/chat_control.py:85
-msgid "Russian"
-msgstr "Російська"
-
-#: ../src/chat_control.py:85
-msgid "Serbian"
-msgstr "Сербська"
-
-#: ../src/chat_control.py:85
-msgid "Slovak"
-msgstr "Словацька"
-
-#: ../src/chat_control.py:85
-msgid "Swedish"
-msgstr "Шведська"
-
-#: ../src/chat_control.py:85
-msgid "Chinese (Ch)"
-msgstr "Китайська (Ch)"
-
-#: ../src/chat_control.py:228
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Гу?"
 
-#: ../src/chat_control.py:233
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Га! (%s s.)"
 
-#: ../src/chat_control.py:238
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "Помилка."
 
-#: ../src/chat_control.py:574
-msgid "Spelling language"
-msgstr "Мова перевірки правопису"
-
 #. we are not connected
-#: ../src/chat_control.py:606 ../src/chat_control.py:822
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "З'єднання недоступне"
 
-#: ../src/chat_control.py:607 ../src/chat_control.py:823
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання."
 
-#: ../src/chat_control.py:1044
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Підкреслити"
 
-#: ../src/chat_control.py:1045
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Перекреслити"
 
-#: ../src/chat_control.py:1068
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:1077
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Зняти форматування"
 
-#: ../src/chat_control.py:1154
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Справді надіслати файл?"
 
-#: ../src/chat_control.py:1155
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній "
 "ідентифікатор Jabber."
 
-#: ../src/chat_control.py:1638 ../src/chat_control.py:2172
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "Шифрування GPG увімкнено"
 
-#: ../src/chat_control.py:1659 ../src/chat_control.py:1662
-msgid "Requires python-farsight."
-msgstr "Потрібен python-farsight."
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Цей контакт не підтримує передавання файлів."
 
 #. Add to roster
-#: ../src/chat_control.py:1702 ../src/common/contacts.py:149
-#: ../src/common/contacts.py:270 ../src/common/helpers.py:67
-#: ../src/common/helpers.py:261 ../src/dialogs.py:1099 ../src/dialogs.py:2228
-#: ../src/dialogs.py:2257 ../src/gui_interface.py:472
-#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:405
-#: ../src/roster_window.py:767 ../src/roster_window.py:1687
-#: ../src/roster_window.py:1689 ../src/roster_window.py:2022
-#: ../src/roster_window.py:3557 ../src/roster_window.py:3584
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Немає у реєстрі"
 
-#: ../src/chat_control.py:1734
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "Перемкнути аудіо сессію"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "Перемкнути відео сессію"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Цією можливістю не можна скористатися у Windows."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Надіслати _файл"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Цей контакт не підтримує передавання файлів."
 
-#: ../src/chat_control.py:1737
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Ви маєте знати справжній JID контакту, щоб надсилати йому чи їй файл."
 
-#: ../src/chat_control.py:1851
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s стан : %(state)s, причина: %(reason)s"
 
-#: ../src/chat_control.py:2042
+#: ../src/chat_control.py:2098
 #, 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:2152 ../src/dialogs.py:5040
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Немає ключа GPG"
 
-#: ../src/chat_control.py:2153
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати "
 "повідомлення за допомогою GPG."
 
-#: ../src/chat_control.py:2162
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "Шифрування GPG вимкнено"
 
-#: ../src/chat_control.py:2188
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Сеанс БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2190
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Сеанс НЕ БУДЕ записано до журналу"
 
 #. encryption %s active
-#: ../src/chat_control.py:2207
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "є"
 
-#: ../src/chat_control.py:2207
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "НЕ є"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2209
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "буде"
 
-#: ../src/chat_control.py:2209
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "НЕ буде"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2213
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2294
 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:2224
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3299,31 +3237,31 @@ msgstr ""
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: ../src/chat_control.py:2351
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: ../src/chat_control.py:2361
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "Цей сеанс БУДЕ збережена на сервері"
 
-#: ../src/chat_control.py:2363
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "Цей сеанс НЕ БУДЕ збережено на сервері"
 
-#: ../src/chat_control.py:2372
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: ../src/chat_control.py:2375
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2382
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3331,25 +3269,25 @@ msgstr ""
 "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
 "ознайомитися з подробицями."
 
-#: ../src/chat_control.py:2384
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: ../src/chat_control.py:2432 ../src/chat_control.py:2445
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#: ../src/chat_control.py:2438
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Наступне повідомлення було зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2707
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: ../src/chat_control.py:2708
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3357,14 +3295,14 @@ msgstr ""
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: ../src/chat_control.py:2875 ../src/common/connection_handlers_events.py:887
-#: ../src/common/connection_handlers.py:942
-#: ../src/common/connection_handlers.py:1054 ../src/common/connection.py:456
-#: ../src/common/logger.py:1144 ../src/gajim.py:210 ../src/session.py:100
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: ../src/chat_control.py:2876
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3373,7 +3311,7 @@ msgstr ""
 "Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити "
 "його (всі записи журналу буде втрачено)."
 
-#: ../src/chat_control.py:3112 ../src/gui_interface.py:1061
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3382,48 +3320,53 @@ msgstr ""
 "Не вдалося розшифрувати повідомлення від %s\n"
 "Можливо, хтось втрутився у ваше з’єднання."
 
-#: ../src/chat_control.py:3145
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
 
-#: ../src/chat_control.py:3204
+#: ../src/chat_control.py:3321
 msgid "File transfer"
 msgstr "Перенесення файлів"
 
-#: ../src/chat_control.py:3207
+#: ../src/chat_control.py:3324
 msgid "Size"
 msgstr "Розмір"
 
-#: ../src/chat_control.py:3209
+#: ../src/chat_control.py:3326
 msgid "_Accept"
 msgstr "_Прийняти"
 
-#: ../src/chat_control.py:3232 ../src/filetransfers_window.py:204
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
 msgid "File transfer completed"
 msgstr "Передавання файла завершено"
 
-#: ../src/chat_control.py:3260 ../src/gui_interface.py:932
-#: ../src/roster_window.py:1934
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Запрошення до групової балачки"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
 msgid "Remote contact stopped transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: ../src/chat_control.py:3262 ../src/gui_interface.py:935
-#: ../src/roster_window.py:1936
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
 msgid "Error opening file"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: ../src/chat_control.py:3264 ../src/filetransfers_window.py:240
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
 msgid "File transfer stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/chat_control.py:3267 ../src/filetransfers_window.py:219
-#: ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
 msgid "File transfer cancelled"
 msgstr "Передавання файла скасовано"
 
-#: ../src/chat_control.py:3268 ../src/filetransfers_window.py:219
-#: ../src/filetransfers_window.py:227
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
 msgid "Connection with peer cannot be established."
 msgstr "Не вдалося встановити з’єднання з вузлом."
 
@@ -3441,6 +3384,10 @@ msgstr "Виконати вираз у оболонці, показати рез
 msgid "Execute expression inside a shell, send output"
 msgstr "Виконати вираз у оболонці, надіслати результат"
 
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
 #: ../src/command_system/implementation/standard.py:50
 msgid "Hide the chat buttons"
 msgstr "Сховати кнопки балачки"
@@ -3471,13 +3418,15 @@ msgstr "%s: не знайдено"
 msgid "Limit must be an integer"
 msgstr "Обмеження має бути цілим числом"
 
-#: ../src/command_system/implementation/standard.py:140
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+#, fuzzy
 msgid ""
 "\n"
-"    Set current the status\n"
+"    Set the current status\n"
 "\n"
-"    Status can be given as one of the following values: online, away,\n"
-"    chat, xa, dnd.\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
 "    "
 msgstr ""
 "\n"
@@ -3487,114 +3436,122 @@ msgstr ""
 "    chat, xa, dnd.\n"
 "    "
 
-#: ../src/command_system/implementation/standard.py:153
+#: ../src/command_system/implementation/standard.py:148
 msgid "Set the current status to away"
 msgstr "Встановити поточний стан як відсутній"
 
-#: ../src/command_system/implementation/standard.py:156
-#: ../src/common/commands.py:109 ../src/common/helpers.py:249
-#: ../src/tooltips.py:194
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
 msgid "Away"
 msgstr "Далеко"
 
-#: ../src/command_system/implementation/standard.py:161
+#: ../src/command_system/implementation/standard.py:162
 msgid "Set the current status to online"
 msgstr "Встановити поточний стан як на зв’язку"
 
-#: ../src/command_system/implementation/standard.py:164
+#: ../src/command_system/implementation/standard.py:165
 msgid "Available"
 msgstr "Доступний"
 
-#: ../src/command_system/implementation/standard.py:178
-#: ../src/command_system/implementation/standard.py:255
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
 msgid "Clear the text window"
 msgstr "Очистити текстове вікно"
 
-#: ../src/command_system/implementation/standard.py:183
-msgid "Toggle the GPG encryption"
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
 msgstr "Перемкнути GPG-шифрування"
 
-#: ../src/command_system/implementation/standard.py:188
+#: ../src/command_system/implementation/standard.py:195
 msgid "Send a ping to the contact"
 msgstr "Надіслати запит присутності до контакту"
 
-#: ../src/command_system/implementation/standard.py:191
+#: ../src/command_system/implementation/standard.py:198
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Команда не підтримується для облікових записів zeroconf"
 
-#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:202
 msgid "Send DTMF sequence through an open audio session"
 msgstr "Надіслати DTMF послідовність через відкриту аудіо сесію"
 
-#: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:205
 msgid "No open audio sessions with the contact"
 msgstr "Нема відкритих аудіо сесій з контактом"
 
-#: ../src/command_system/implementation/standard.py:201
+#: ../src/command_system/implementation/standard.py:208
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s не є коректним тоном"
 
-#: ../src/command_system/implementation/standard.py:211
+#: ../src/command_system/implementation/standard.py:218
 msgid "Audio sessions are not available"
 msgstr "Аудіо сесія недоступна"
 
-#: ../src/command_system/implementation/standard.py:221
+#: ../src/command_system/implementation/standard.py:228
 msgid "Video sessions are not available"
 msgstr "Відео сесія недоступна"
 
-#: ../src/command_system/implementation/standard.py:262
+#: ../src/command_system/implementation/standard.py:235
+#, fuzzy
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr "Надіслати повідомлення контакту"
+
+#: ../src/command_system/implementation/standard.py:274
 msgid "Change your nickname in a group chat"
 msgstr "Змінити ваш псевдонім у груповій балачці"
 
 #. invalid char
-#: ../src/command_system/implementation/standard.py:267 ../src/config.py:3392
-#: ../src/dialogs.py:2075
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/command_system/implementation/standard.py:272
+#: ../src/command_system/implementation/standard.py:284
 msgid "Open a private chat window with a specified occupant"
 msgstr "_Відкрити вікно приватної балачки з зазначеним користувачем"
 
-#: ../src/command_system/implementation/standard.py:278
-#: ../src/command_system/implementation/standard.py:287
-#: ../src/command_system/implementation/standard.py:341
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
 msgid "Nickname not found"
 msgstr "Псевдонім не знайдено"
 
-#: ../src/command_system/implementation/standard.py:281
+#: ../src/command_system/implementation/standard.py:293
 msgid ""
 "Open a private chat window with a specified occupant and send him a message"
 msgstr ""
 "Відкрити вікно приватної балачки з зазначеним користувачем та надіслати йому "
 "повідомлення"
 
-#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:302
 msgid "Display or change a group chat topic"
 msgstr "Показати або змінити тему групової балачки"
 
-#: ../src/command_system/implementation/standard.py:298
+#: ../src/command_system/implementation/standard.py:310
 msgid "Invite a user to a room for a reason"
 msgstr "Запросити користувача в кімнату вказавши причину"
 
-#: ../src/command_system/implementation/standard.py:301
+#: ../src/command_system/implementation/standard.py:313
 #, python-format
 msgid "Invited %s to %s"
 msgstr "Запрошено %s до %s"
 
-#: ../src/command_system/implementation/standard.py:304
+#: ../src/command_system/implementation/standard.py:316
 msgid "Join a group chat given by a jid, optionally using given nickname"
 msgstr "Приєднатися до групової балачки по JID, або за псевдонімом"
 
-#: ../src/command_system/implementation/standard.py:321
+#: ../src/command_system/implementation/standard.py:333
 msgid ""
 "Leave the groupchat, optionally giving a reason, and close tab or window"
 msgstr ""
 "Покинути групову балачку, за бажанням вказавши причину, та закрити вкладку "
 "або вікно"
 
-#: ../src/command_system/implementation/standard.py:326
+#: ../src/command_system/implementation/standard.py:338
 msgid ""
 "\n"
 "    Ban user by a nick or a jid from a groupchat\n"
@@ -3608,134 +3565,184 @@ msgstr ""
 "    Якщо вказаний псевдонім не буде знайдено, він буде оброблений як jid.\n"
 "    "
 
-#: ../src/command_system/implementation/standard.py:338
+#: ../src/command_system/implementation/standard.py:350
 msgid "Kick user by a nick from a groupchat"
 msgstr "Викинути користувача з групової балачки за псевдонімом"
 
-#: ../src/command_system/implementation/standard.py:345
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+#, fuzzy
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+"\n"
+"    Встановити поточний стан\n"
+"\n"
+"    Стан може бути одним з наведених: online, away,\n"
+"    chat, xa, dnd.\n"
+"    "
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Некоректний сервер"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+#, fuzzy
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+"\n"
+"    Встановити поточний стан\n"
+"\n"
+"    Стан може бути одним з наведених: online, away,\n"
+"    chat, xa, dnd.\n"
+"    "
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "змінено місце роботи"
+
+#: ../src/command_system/implementation/standard.py:383
 msgid "Display names of all group chat occupants"
 msgstr "Показати імена усіх учасників балачки"
 
-#: ../src/command_system/implementation/standard.py:367
+#: ../src/command_system/implementation/standard.py:405
 msgid "Forbid an occupant to send you public or private messages"
 msgstr "Заборонити учаснику надсилати вам особисті або публічні повідомлення"
 
-#: ../src/command_system/implementation/standard.py:372
+#: ../src/command_system/implementation/standard.py:410
 msgid "Allow an occupant to send you public or private messages"
 msgstr "Дозволити учаснику надсилати вам особисті або публічні повідомлення"
 
-#: ../src/common/check_paths.py:38
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Пропущено аргумент «contact_jid»"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "створення бази даних журналів"
 
-#: ../src/common/check_paths.py:86
+#: ../src/common/check_paths.py:87
 msgid "creating cache database"
 msgstr "створення бази даних кешу"
 
-#: ../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:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s є файлом, а має бути каталогом"
 
-#: ../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:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
+#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Зараз Gajim завершить роботу"
 
-#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
 
-#: ../src/common/check_paths.py:352
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "створення каталогу %s"
 
-#: ../src/common/commands.py:85
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Змінити відомості про стан"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Змінити стан"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Вказати тип присутності і опис"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Вільний для балачки"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "В мережі"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Не буде довго"
 
-#: ../src/common/commands.py:111
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Не турбувати"
 
-#: ../src/common/commands.py:112
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Поза мережею — від’єднаний"
 
-#: ../src/common/commands.py:117
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Опис стану присутності:"
 
-#: ../src/common/commands.py:152 ../src/common/commands.py:320
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Стан було змінено."
 
-#: ../src/common/commands.py:184 ../src/common/commands.py:210
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Полишити групові балачки"
 
-#: ../src/common/commands.py:200
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s у %(room_jid)s"
 
-#: ../src/common/commands.py:204
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Ви не приєдналися до групової балачки."
 
-#: ../src/common/commands.py:211
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Оберіть групові балачки, які ви бажаєте полишити"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:215 ../src/common/contacts.py:128
-#: ../src/common/helpers.py:67 ../src/roster_window.py:820
-#: ../src/roster_window.py:1691 ../src/roster_window.py:1693
-#: ../src/roster_window.py:2557 ../src/roster_window.py:5610
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Групові балачки"
 
-#: ../src/common/commands.py:256
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Ви полишили такі групові балачки:"
 
-#: ../src/common/commands.py:268
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Переспрямувати непрочитані повідомлення"
 
-#: ../src/common/commands.py:290
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Всі непрочитані повідомлення було переспрямовано."
 
-#: ../src/common/commands.py:298
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr "Переспрямувати непрочитані повідомлення на від’єднатись"
 
@@ -3761,7 +3768,8 @@ msgstr ""
 "$S (Позначено як «відсутній» через відсутність активності протягом $T хв)"
 
 #: ../src/common/config.py:83
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
 "виявлення відсутності."
@@ -3776,7 +3784,8 @@ msgstr ""
 "$S (Позначено як «недоступний» через відсутність активності протягом $T хв)"
 
 #: ../src/common/config.py:86
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
 "виявлення недоступності."
@@ -3814,26 +3823,79 @@ msgid "Status message text color."
 msgstr "Колір тексту повідомлення сповіщення про стан."
 
 #: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Показати події у зоні сповіщень"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Показати події у зоні сповіщень"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr ""
+"Здійснювати попередній перегляд нових повідомлень у виринаючому сповіщенні?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Запит на передавання файла"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Передавання файла скасовано"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Показувати контекстне сповіщення про завершення передавання файла"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Запрошення до групової балачки"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Шрифт вхідного псевдоніму"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Шрифт вихідного псевдоніма."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Шрифт вхідного тексту"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Шрифт вихідного тексту"
 
-#: ../src/common/config.py:106
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Шрифт тексту сповіщення про стан."
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3841,17 +3903,17 @@ msgstr ""
 "згорнуто."
 
 #. sorted alphanum
-#: ../src/common/config.py:108 ../src/common/config.py:504
-#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
-#: ../src/common/optparser.py:526 ../src/gui_interface.py:2668
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "типовий"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Мова, яку використовуватиме інструмент перевірки правопису"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3861,7 +3923,7 @@ msgstr ""
 "'sometimes' — виводити час кожні print_ichat_every_foo_minutes хвилин.\n"
 "'never' — ніколи не виводити час."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:125
 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. "
@@ -3872,18 +3934,18 @@ msgstr ""
 "найточніше відображення часу, 4 — найменш точне. Цей параметр буде "
 "використано, лише якщо параметр print_time має значення 'sometimes'."
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Вважати пари символів * / _ символами форматування."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Якщо має значення «True», не вилучати */_ . Наприклад, рядок *abc* "
 "вважатиметься рядком з напівжирним шрифтом після вилучення позначок * *."
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3894,7 +3956,7 @@ msgstr ""
 "http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (якщо "
 "бажаєте користуватися ними, встановіть docutils)"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3902,7 +3964,7 @@ msgstr ""
 "Символ, який буде додано після псевдоніма, якщо ви використовуєте "
 "автоматичне доповнення псевдоніма (tab) у груповій балачці."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3910,15 +3972,16 @@ msgstr ""
 "Символ, який буде запропоновано додати після бажаного псевдоніма, якщо "
 "псевдонім буде використано кимось з групової балачки."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
+"If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
 "Якщо увімкнено, Gajim буде зберігати положення вікна ховаючи реєстр та "
 "відновлювати при його показі."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3929,56 +3992,59 @@ msgstr ""
 "\"[година:хвилина] \". Див. документацію з python щодо strftime, щоб "
 "дізнатися більше: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Символи, які буде показано перед псевдонімами під час спілкування"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Символи, які буде показано після псевдонімів під час спілкування"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:177
 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:169
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Додати * і [n] у заголовок реєстру?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Кількість рядків тесту, які слід запам’ятати з попереднього спілкування для "
 "показу під час повторного відкриття вкладки або вікна балачки."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Проміжок часу у хвилинах, протягом якого слід зберігати рядки попередньої "
 "розмови"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:182
+#, fuzzy
 msgid ""
-"How many lines to request to server when entering a groupchat. -1 means no "
+"How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
 "Як багато робити запитів до сервера при під’єднанні до групової балачки. -1 "
 "означає без обмежень"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:183
+#, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 "За скільки хвилин запитувати журнал, при вході у групову балачку. -1 означає "
 "без обмеження"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3987,14 +4053,14 @@ msgstr ""
 "конференції від якої вас було від’єднано. Встановіть 0 для блокування "
 "автоматичного перепід’єднання."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:185
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
 "Чи має бути активним автоматичне повторне підключення у випадку якщо вас "
 "викинули з конференції?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4002,11 +4068,11 @@ msgstr ""
 "Надсилати повідомлення за Ctrl+Enter, а за допомогою Enter розривати рядок "
 "(типова поведінка клієнта Mirabilis ICQ)."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Кількість рядків, які слід зберігати для Ctrl+Стрілка_вгору."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4015,13 +4081,13 @@ msgstr ""
 "Або нетипова адреса url з підрядком %s, де %s — слово або фраза, або "
 "'WIKTIONARY' (це означає, що слід використовувати службу wiktionary)."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Якщо позначено цей пункт, Gajim можна віддалено керувати за допомогою gajim-"
 "remote."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:195
 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 "
@@ -4033,14 +4099,14 @@ msgstr ""
 "параметра listen_to_network_manager рівне «False» і вони синхронізуються з "
 "загальним станом) згідно до стану мережевого з’єднання."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4048,7 +4114,7 @@ msgstr ""
 "Тип сповіщень про стан балачки, які буде показано у вікнах балачки. Може "
 "мати значення all, composing_only, disabled."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4056,38 +4122,41 @@ msgstr ""
 "Якщо не вказано, що програма має виводити час для кожного з повідомлень "
 "(print_time==sometimes), виводити час кожні x хвилин."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Запитувати перед закриттям вкладки або вікна групової балачки."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Завжди запитувати про дію перед закриттям вікна або вкладки групової "
 "балачки, яку вказано у цьому відокремленому пробілами списку jid групових "
 "балачок."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Ніколи не запитувати про дію перед закриттям вікна або вкладки групової "
 "балачки, яку вказано у цьому відокремленому пробілами списку jid групових "
 "балачок."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Запитувати перед закриттям вікна розмови з вкладками, якщо це може призвести "
 "до втрати даних (діалог, приватний діалог, групова розмова що не може бути "
 "мінімізована)."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -4096,27 +4165,33 @@ msgstr ""
 "інтерфейсів, для передавання файлів у випадку трансляції адрес або "
 "переспрямування портів."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Згідно до стандарту IEC: кіБ = 1024 байтам, кБ = 1000 байтам."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "Сповіщення про події у зоні сповіщень."
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Показувати вкладку за умови єдиної бесіди?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показувати бічну панель з вкладками у вікнах балачки?"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Показувати кнопку закриття на вкладці?"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:220
 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 "
@@ -4129,19 +4204,19 @@ msgstr ""
 "Більші значення підвищують безпеку, але програма витрачатиме більше часу на "
 "їх обчислення під час запуску сеансу."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 "Здійснювати попередній перегляд нових повідомлень у виринаючому сповіщенні?"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Список відокремлених крапкою з комою слів, які буде виділено у групових "
 "балачках."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:247
 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."
@@ -4150,14 +4225,14 @@ msgstr ""
 "кнопки з позначкою «X» у менеджері вікон. Цей параметр братиметься до уваги, "
 "лише якщо використовується піктограма лотка."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Якщо має значення «True», Gajim перевірятиме, чи є програма типовим клієнтом "
 "jabber під час кожного запуску програми."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4166,7 +4241,7 @@ msgstr ""
 "вкладок, на якій містяться непрочитані повідомлення. Залежно від обраної "
 "вами теми, піктограму може бути анімовано."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4175,11 +4250,11 @@ msgstr ""
 "про стан, якщо це повідомлення не буде порожнім, для кожного з контактів під "
 "іменем контакту у вікні реєстру."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Визначає позицію аватару у реєстрі. Можливі значення: left і right"
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:257
 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."
@@ -4188,7 +4263,7 @@ msgstr ""
 "записів контактів, чий аватар не було отримано під час попереднього сеансу, "
 "або контактів, чиї аватари вважатимуться застарілими."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:258
 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."
@@ -4197,9 +4272,10 @@ msgstr ""
 "рядок стану у балачках, коли контакт змінює свій стан і/або своє "
 "повідомлення про стан."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -4212,34 +4288,34 @@ msgstr ""
 "до того, що Gajim виводитиме лише повідомлення про те, що «такий-то увійшов "
 "або полишив групову балачку»."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:261
 msgid "Log XHTML messages instead of plain text messages."
 msgstr "Зберігати повідомлення як XHTML замість звичайного тексту."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Колір контактів, які тільки-но увійшли до мережі."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Колір контактів, які тільки-но вийшли з мережі."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Якщо цей параметр матиме значення «True», відновлені повідомлення буде "
 "показано меншим ніж типовий шрифтом."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показувати аватар транспорту."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Не показувати реєстр на системній панелі задач."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:268
 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 "
@@ -4249,7 +4325,7 @@ msgstr ""
 "GTK+ і PyGTK не старіші за 2.8, у разі наявності подій у черзі позначка "
 "вікна програми почне блимати (типова поведінка у більшості менеджерів вікон)."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:270
 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 "
@@ -4260,7 +4336,8 @@ msgstr ""
 "«False», щоб вимкнути надсилання відомостей sha до сервера групової балачки."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:250
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4268,7 +4345,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Керує вікно, куди виводяться нові повідомлення.\n"
@@ -4281,7 +4358,7 @@ msgstr ""
 "'pertype' — повідомлення буде розподілено за типом (наприклад, прості і "
 "групові балачки) між окремими вікнами."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:274
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -4293,35 +4370,35 @@ msgstr ""
 "'never' - Ніколи не показувати реєстр.\n"
 "'last_state' - Відновити останній стан реєстру.ртсик"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
 "балачки."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Якщо цей параметр матиме значення «True», натискання клавіші escape "
 "закриватиме вкладку або вікно програми."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Ховає кнопки у вікнах балачки."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Приховує підпис у вікні групової балачки"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Ховає підпис у вікні балачки між двома особами"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ховає список учасників групової балачки у вікні групової балачки."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:281
 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."
@@ -4329,16 +4406,16 @@ msgstr ""
 "У балачках, показувати псевдонім на початку рядка повідомлення, лише якщо це "
 "повідомлення не тої самої особи, якою було надіслано попереднє повідомлення."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Відступ за використання об’єднання послідовних повідомлень від однієї особи."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавне гортання повідомлень у вікні балачки"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4346,13 +4423,13 @@ msgstr ""
 "Список кольорів, відокремлених символом «:», які буде використано для "
 "розфарбовування псевдонімів у групових балачках."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab переводить до наступної вкладки створення повідомлення, якщо немає "
 "непрочитаних."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4360,7 +4437,7 @@ msgstr ""
 "Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4368,7 +4445,7 @@ msgstr ""
 "Чи слід показувати діалогове вікно підтвердження блокування контактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4377,7 +4454,7 @@ msgstr ""
 "статусів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід "
 "показувати."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:289
 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 "
@@ -4388,7 +4465,7 @@ msgstr ""
 "облікового запису. БУДЬТЕ ОБЕРЕЖНІ за умови входу з від’ємним пріоритетом: у "
 "такому разі ви НЕ отримуватимете повідомлень від вашого сервера."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4396,7 +4473,7 @@ msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4405,7 +4482,7 @@ msgstr ""
 "торбинок KDE (якщо kwalletcli доступний) для зберігання паролів облікових "
 "записів."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4414,7 +4491,7 @@ msgstr ""
 "контактів у мережі і загальну кількість контактів у рядках облікових записів "
 "і груп."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4423,7 +4500,7 @@ msgstr ""
 "непорожнє значення, вважати всі вхідні повідомлення повідомленнями вказано "
 "типу"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4432,20 +4509,11 @@ msgstr ""
 "у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно "
 "балачки ще не було відкрито."
 
-#: ../src/common/config.py:272
-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:273
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Час відсутності активності потрібний для закриття вікна зміни стану."
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4453,7 +4521,7 @@ msgstr ""
 "Максимальна кількість рядків, які буде показано протягом спілкування. "
 "Застарілі рядки понад вказане число вилучатимуться."
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
@@ -4462,21 +4530,13 @@ msgstr ""
 "служби сповіщення (notification-daemon) буде приєднано до піктограми у "
 "системному лотку."
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Оберіть інтервал між двома послідовними перевірками на відсутність "
 "активності."
 
-#: ../src/common/config.py:277
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"За допомогою цього параметра можна регулювати розмір формул latex. Більші "
-"значення відповідають більшим символам формул."
-
-#: ../src/common/config.py:278
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4484,21 +4544,22 @@ msgstr ""
 "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
 "(mailto і xmpp обробляються окремо)"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Запит повідомлень відсутності до усих відключених контактів при появі з ними "
 "зв’язку.  УВАГА: це призведе до відсилання великої кількості запитів."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Якщо Істино, доповнення у групових балачках будуть схожі на автодоповнення "
 "командної оболонки."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4506,17 +4567,21 @@ msgstr ""
 "Коли показувати запис власного контакту. Може бути \"завжди\", "
 "\"коли_інший_ресурс\" або \"ніколи\""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 "Опціонально виправляти частоту кадрів вихідного відео Jingle. Приклад: 10/1 "
 "або 25/2"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "Опціонально змінювати розмір вихідного відео Jingle. Приклад: 320х240"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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."
@@ -4525,11 +4590,11 @@ msgstr ""
 "використано значення параметру \"stun_server\", або отримане з серверу "
 "Jabber."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr "Сервер STUN для використання з Jingle"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
@@ -4537,13 +4602,32 @@ msgstr ""
 "Якщо увімкнено, Gajim покаже членство учасників балачки додаванням "
 "кольорового квадрату до піктограми стану."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:315
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
 msgstr "Проксі що використовується для усіх вихідних з’єднань не налаштовано"
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim не запитуватиме про повідомлення стану. "
+"Програма використовуватиме вказане типове повідомлення."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4551,7 +4635,7 @@ msgstr ""
 "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
 "визначаються за допомогою параметрів autopriority_*."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:340
 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"
@@ -4560,38 +4644,38 @@ msgstr ""
 "значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
 "використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Якщо Істино, усі запити авторизації буде автоматично задоволено."
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», обліковий запис буде вимкнено та "
 "не буде відображатись у вікні реєстру."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Якщо вимкнено, не підписувати повідомлення про присутність ключем GPG, "
 "навіть якщо GPG налаштовано для використання."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Увімкнути шифрування ESession для цього облікового запису."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Чи має Gajim автоматично починати сеанс з шифруванням за можливості?"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4599,33 +4683,32 @@ msgstr ""
 "Впорядкований список відокремлених комами типів з’єднання, які має "
 "спробувати програма. Можливі значення: tls, ssl і plain"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:352
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль звичайним "
-"текстом. "
-"Може бути 'поперджати', 'з’єднувати', 'відключати'"
+"текстом. Може бути 'поперджати', 'з’єднувати', 'відключати'"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
 "бібліотекою SSL."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:354
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати відкритий пароль "
 "незашифрованим з'єднанням."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:362
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -4634,7 +4717,7 @@ msgstr ""
 "журнали. Ви можете також додати назву облікового запису для якого не буде "
 "вестись журналювання."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:363
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -4642,29 +4725,30 @@ msgstr ""
 "Розділений пробілами перелік ідентифікаторів JID для яких ви згодні не "
 "зберігати записи якщо вони цього не хочуть."
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Надсилання порожнього повідомлення після неактивності."
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "Надсилання XMPP ехо після неактивності."
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Проміжок часу у секундах, протягом якого слід очікувати на відповідь на "
 "пакет підтримування зв’язку, перш ніж розпочати процедуру повторного "
 "з’єднання."
 
 #. yes, no, ask
-#: ../src/common/config.py:350
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4673,35 +4757,35 @@ msgstr ""
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:379
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
-"Якщо увімкнено, Gajim буде тестувати проксі для надсилання файлів при старті, "
-"щоб переконатись у їх працездатності. Openfire не проходить цей тест навіть "
-"якщо працездатний."
+"Якщо увімкнено, Gajim буде тестувати проксі для надсилання файлів при "
+"старті, щоб переконатись у їх працездатності. Openfire не проходить цей тест "
+"навіть якщо працездатний."
 
-#: ../src/common/config.py:368
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Відповідати на запити щодо підтвердження отримання"
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
-#: ../src/common/config.py:378
+#: ../src/common/config.py:403
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Дозволити Gajim надсилати інформацію, яку операційну систему ви "
 "використовуєте"
 
-#: ../src/common/config.py:379
+#: ../src/common/config.py:404
 msgid "Allow Gajim to send your local time."
 msgstr "Дозволятии Gajim надсилати ваш локальний часд"
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4709,48 +4793,56 @@ msgstr ""
 "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
 "бажаєте вести запис повідомлень?"
 
-#: ../src/common/config.py:383
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr "Повідомлення що буде надіслано контакту який ви бажаєте додати"
 
-#: ../src/common/config.py:384
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr "Останній раз коли було синхронізовано журнали з сервером"
 
-#: ../src/common/config.py:385
+#: ../src/common/config.py:410
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 "Якщо увімкнено та сервер підтримує цю можливість, Gajim буде отримувати "
-"повідомлення "
-"надіслані та отримані іншими ресурсами."
+"повідомлення надіслані та отримані іншими ресурсами."
 
-#: ../src/common/config.py:386
+#: ../src/common/config.py:411
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
-"Якщо увімкнено, Gajim надішле ваш локальний IP щоб контакт міг з’єднатись "
-"та надіслати вам файли."
+"Якщо увімкнено, Gajim надішле ваш локальний IP щоб контакт міг з’єднатись та "
+"надіслати вам файли."
 
-#: ../src/common/config.py:387
+#: ../src/common/config.py:412
 msgid "Latest token for Oauth2 authentication."
 msgstr "Останній запис аутентифікації Oauth2"
 
-#: ../src/common/config.py:388
+#: ../src/common/config.py:413
 msgid "client_id for Oauth2 authentication."
 msgstr "client_id для аутентифікації Oauth2"
 
-#: ../src/common/config.py:389
+#: ../src/common/config.py:414
 msgid "redirect_url for Oauth2 authentication."
 msgstr "redirect_url для аутентифікації Oauth2."
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:415
+#, fuzzy
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+"Розділений пробілами перелік ідентифікаторів JID для яких ви згодні не "
+"зберігати записи якщо вони цього не хочуть."
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4758,13 +4850,32 @@ msgstr ""
 "Чи має Gajim за можливості автоматично запускати шифрований сеанс "
 "спілкування з цим контактом?"
 
-#: ../src/common/config.py:453 ../src/common/config.py:456
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"Як багато робити запитів до сервера при під’єднанні до групової балачки. -1 "
+"означає без обмежень"
+
+#: ../src/common/config.py:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
+"За скільки хвилин запитувати журнал, при вході у групову балачку. -1 означає "
+"без обмеження"
+
+#: ../src/common/config.py:487
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
@@ -4772,83 +4883,83 @@ msgstr ""
 "виході з Gajim). Ця опція НЕ ПОВИННА бути використана для (де)активації "
 "додатків. Використовуйте для цього графічний інтерфейс користувача."
 
-#: ../src/common/config.py:464 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: ../src/common/config.py:466 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Їм"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Відео"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: ../src/common/config.py:468 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працюю"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: ../src/common/config.py:483 ../src/config.py:1652
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: ../src/common/config.py:486 ../src/common/config.py:487
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:526
 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."
@@ -4857,31 +4968,31 @@ msgstr ""
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: ../src/common/config.py:507 ../src/common/optparser.py:310
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "зелений"
 
-#: ../src/common/config.py:511 ../src/common/optparser.py:296
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "овочевий"
 
-#: ../src/common/config.py:515
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "тілесний"
 
-#: ../src/common/config.py:519
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "морський"
 
-#: ../src/common/config.py:526
+#: ../src/common/config.py:555
 msgid "Tor"
 msgstr "Tor"
 
-#: ../src/common/connection_handlers_events.py:367
+#: ../src/common/connection_handlers_events.py:370
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4891,23 +5002,23 @@ msgstr ""
 "Скористайтеся інструментами для керування реєстром, наприклад, http://jru."
 "jabberstudio.org/ для його вилучення"
 
-#: ../src/common/connection_handlers_events.py:799
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запит на скасування підписки від %s"
 
-#: ../src/common/connection_handlers_events.py:884
-#: ../src/common/connection_handlers.py:334
-#: ../src/common/connection_handlers.py:940
-#: ../src/common/connection_handlers.py:1052 ../src/common/connection.py:453
-#: ../src/common/logger.py:1142 ../src/gajim.py:392
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "Помилка під час спроби запису на диск"
 
-#: ../src/common/connection_handlers_events.py:888
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1055 ../src/common/connection.py:457
-#: ../src/common/logger.py:1145 ../src/gajim.py:211 ../src/session.py:101
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4919,164 +5030,166 @@ msgstr ""
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:909
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: ../src/common/connection_handlers_events.py:917
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися замість цієї кімнати до %s"
 
-#: ../src/common/connection_handlers_events.py:1001
-#: ../src/common/connection_handlers_events.py:1033
-#: ../src/common/connection_handlers_events.py:1049
-#: ../src/common/connection.py:263 ../src/config.py:2149 ../src/config.py:2158
-#: ../src/config.py:2226 ../src/config.py:3663 ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3092
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber"
 
-#: ../src/common/connection_handlers_events.py:1002
-#: ../src/common/connection_handlers_events.py:1034
-#: ../src/common/connection_handlers_events.py:1050
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Надійшло повідомлення від некоректного JID, це повідомлення було "
 "проігноровано."
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1076
-#: ../src/gui_interface.py:420 ../src/gui_interface.py:434
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: ../src/common/connection_handlers_events.py:1508
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
-#: ../src/common/connection_handlers_events.py:2040 ../src/dialogs.py:2779
-#: ../src/notify.py:263
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
-#: ../src/common/connection_handlers_events.py:2042
+#: ../src/common/connection_handlers_events.py:2213
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нове окреме повідомлення від %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2046 ../src/dialogs.py:2780
-#: ../src/notify.py:264
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: ../src/common/connection_handlers_events.py:2048
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нове конфіденційне повідомлення з групової балачки %s"
 
-#: ../src/common/connection_handlers_events.py:2051
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/connection_handlers_events.py:2054
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Повідомлення надіслано від імені %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2058 ../src/dialogs.py:2779
-#: ../src/notify.py:263
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Message"
 msgstr "Нове повідомлення"
 
-#: ../src/common/connection_handlers_events.py:2060
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нове повідомлення від %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2189
+#: ../src/common/connection_handlers_events.py:2375
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змінив стан"
 
-#: ../src/common/connection_handlers_events.py:2191
-#: ../src/groupchat_control.py:205 ../src/groupchat_control.py:1766
-#: ../src/history_window.py:448
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s тепер %(status)s"
 
-#: ../src/common/connection_handlers_events.py:2196 ../src/dialogs.py:2791
-#: ../src/notify.py:277
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: ../src/common/connection_handlers_events.py:2198
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s в мережі"
 
 #. default value
-#: ../src/common/connection_handlers_events.py:2203 ../src/dialogs.py:2775
-#: ../src/notify.py:259
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: ../src/common/connection_handlers_events.py:2205
+#: ../src/common/connection_handlers_events.py:2389
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s вийшов з мережі"
 
-#: ../src/common/connection_handlers_events.py:2210 ../src/dialogs.py:2777
-#: ../src/notify.py:261
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
-#: ../src/common/connection_handlers.py:88
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Не вдалося завантажити модуль перевірки відсутності активності"
 
-#: ../src/common/connection_handlers.py:121
+#: ../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:129
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Зареєструватися на %s"
 
-#: ../src/common/connection_handlers.py:130
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Реєстрацію з агентом %s вдало закінчено"
 
-#: ../src/common/connection_handlers.py:139
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/common/connection_handlers.py:140
+#: ../src/common/connection_handlers.py:146
 #, 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:571 ../src/common/connection.py:1540
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Невидимість не підтримується"
 
-#: ../src/common/connection_handlers.py:572 ../src/common/connection.py:1541
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: ../src/common/connection_handlers.py:1714
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
@@ -5208,27 +5321,28 @@ msgstr "До призначення ключа не належить підпи�
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: ../src/common/connection.py:264 ../src/dialogs.py:3093
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:286
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
 
-#: ../src/common/connection.py:289
+#: ../src/common/connection.py:307
 #, 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:342
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
 
-#: ../src/common/connection.py:440
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5237,18 +5351,18 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:850
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
 
-#: ../src/common/connection.py:851
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Виконати повторне з’єднання вручну."
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
@@ -5256,59 +5370,63 @@ msgstr ""
 "реєстрації: %(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:904
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "На сервері %s передбачено іншу форму реєстрації"
 
-#: ../src/common/connection.py:921
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Некоректна відповідь"
 
-#: ../src/common/connection.py:922
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: "
 "%(error)s"
 
-#: ../src/common/connection.py:1197 ../src/common/connection.py:1349
-#: ../src/common/connection.py:1976
-#: ../src/common/zeroconf/connection_zeroconf.py:205
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Не вдалося з’єднатися з «%s»"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:1198 ../src/gui_interface.py:529
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
-#: ../src/common/connection.py:1203
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/common/connection.py:1218
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
 
-#: ../src/common/connection.py:1256 ../src/common/connection.py:1328
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не вдалося з’єднатися з обліковим записом %s"
 
-#: ../src/common/connection.py:1257 ../src/common/connection.py:1329
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
 
-#: ../src/common/connection.py:1282
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: ../src/common/connection.py:1285
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -5317,7 +5435,7 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1287
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -5326,102 +5444,105 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: ../src/common/connection.py:1310
+#: ../src/common/connection.py:1420
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
-"Достовірність сертифіката %s знаходиться під питанням. "
-"Сертифікат не відповідає поточному домену."
+"Достовірність сертифіката %s знаходиться під питанням. Сертифікат не "
+"відповідає поточному домену."
 
-#: ../src/common/connection.py:1350
-msgid "Check your connection or try again later"
-msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:1385
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: ../src/common/connection.py:1386
-msgid "Please check your login and passwordfor correctness."
+#: ../src/common/connection.py:1499
+#, fuzzy
+msgid "Please check your login and password for correctness."
 msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
 
-#: ../src/common/connection.py:1461
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Помилка під час вилучення списку конфіденційності"
 
-#: ../src/common/connection.py:1462
-#, python-format
+#: ../src/common/connection.py:1575
+#, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and tryagain."
+"connected resources. Deactivate it and try again."
 msgstr ""
 "Список конфіденційності %s не було вилучено. Ймовірно, він використовується "
 "у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
 "повторіть спробу."
 
-#: ../src/common/connection.py:1843
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Відправлений контакт:  \"%s\" (%s)"
 
-#: ../src/common/connection.py:1846
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Надіслати контакти:"
 
-#: ../src/common/connection.py:1993 ../src/common/connection.py:2016
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Не отримано через стан невидимості"
 
-#: ../src/common/connection.py:2575
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Спроба скасування реєстрації завершилася невдало"
 
-#: ../src/common/connection.py:2576
+#: ../src/common/connection.py:2827
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Видалення реєстрації з серверу %(server)s не вдалося через помилку: %(error)s"
 
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:67
-#: ../src/gui_interface.py:472
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "Спостерігачі"
 
-#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
-#: ../src/common/helpers.py:67 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:859
-#: ../src/roster_window.py:1579 ../src/roster_window.py:1683
-#: ../src/roster_window.py:1685 ../src/roster_window.py:1847
-#: ../src/roster_window.py:2525
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/common/contacts.py:366
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Немає у реєстрі"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 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:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Можливості роботи з D-Bus у Gajim не може бути використано"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus не працює коректно на цій машині."
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus не працює коректно на цій машині: системна шина відсутня."
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus не працює коректно на цій машині: шина сеансу відсутня."
 
@@ -5435,7 +5556,7 @@ msgstr ""
 "Служба недоступна: Gajim не запущено або встановлено значення «False» для "
 "параметра remote_control"
 
-#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "У цій системі немає D-Bus або відсутній потрібний модуль python"
 
@@ -5652,7 +5773,7 @@ msgstr "Некоректний символ у назві ресурсу."
 msgid "_Busy"
 msgstr "_Зайнятий"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:196
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Зайнятий"
 
@@ -5660,7 +5781,7 @@ msgstr "Зайнятий"
 msgid "_Not Available"
 msgstr "_Не доступний"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:198
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
 msgid "Not Available"
 msgstr "Дуже далеко"
 
@@ -5668,7 +5789,7 @@ msgstr "Дуже далеко"
 msgid "_Free for Chat"
 msgstr "_Вільний для балачки"
 
-#: ../src/common/helpers.py:237 ../src/tooltips.py:192
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Вільний для балачки"
 
@@ -5676,7 +5797,7 @@ msgstr "Вільний для балачки"
 msgid "?user status:_Available"
 msgstr "?стан користувача:_Доступний"
 
-#: ../src/common/helpers.py:242 ../src/tooltips.py:190
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "?стан користувача:Доступний"
 
@@ -5692,7 +5813,7 @@ msgstr "В_ідійшов"
 msgid "_Offline"
 msgstr "_Поза мережею"
 
-#: ../src/common/helpers.py:254 ../src/tooltips.py:200
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Поза мережею"
 
@@ -5764,19 +5885,19 @@ msgstr "Відвідувачі"
 msgid "Visitor"
 msgstr "Відвідувач"
 
-#: ../src/common/helpers.py:316 ../src/tooltips.py:211
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Членство контакту у груповій балачці:Жодного"
 
-#: ../src/common/helpers.py:318 ../src/tooltips.py:217
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:320 ../src/tooltips.py:215
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: ../src/common/helpers.py:322 ../src/tooltips.py:213
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Учасник"
 
@@ -5879,33 +6000,33 @@ msgstr[2] "у черзі %d подій"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1361
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "Привіт, я $name."
 
-#: ../src/common/helpers.py:1471 ../src/common/helpers.py:1480
-#: ../src/common/helpers.py:1534
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
 msgid "Timeout loading image"
 msgstr "Перевищення часу очікування під час завантаження зображення"
 
-#: ../src/common/helpers.py:1490 ../src/common/helpers.py:1532
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
 msgid "Image is too big"
 msgstr "Зображення є завеликим"
 
-#: ../src/common/helpers.py:1500
+#: ../src/common/helpers.py:1507
 msgid "PyCURL is not installed"
 msgstr "PyCURL не встановлено"
 
-#: ../src/common/helpers.py:1536
+#: ../src/common/helpers.py:1543
 msgid "Error loading image"
 msgstr "Помилка завантаження зображення"
 
-#: ../src/common/jingle_rtp.py:109
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s помилка конфігурації"
 
-#: ../src/common/jingle_rtp.py:110
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5924,11 +6045,11 @@ msgstr ""
 "Помилка:\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:208
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "Помилка GStreamer"
 
-#: ../src/common/jingle_rtp.py:208
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5937,106 +6058,114 @@ msgstr ""
 "Повідомлення про помилку: %s\n"
 "Відлагодження: %s"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "аудіо вхід"
 
-#: ../src/common/jingle_rtp.py:341
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "аудіо вихід"
 
-#: ../src/common/jingle_rtp.py:384
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "відео вхід"
 
-#: ../src/common/jingle_rtp.py:393
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "відео вихід"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Помилка під час виконання «%(command)s»: %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s не є коректним рівнем журналювання"
 
-#: ../src/common/multimedia_helpers.py:39
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr "Типовий пристрій"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:60
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "Тест аудіо"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:79
-#: ../src/common/multimedia_helpers.py:93
-#: ../src/common/multimedia_helpers.py:111
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "Автовизначення"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
 #, python-format
 msgid "Pulse: %s"
 msgstr "Пульс: %s"
 
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:77
-#: ../src/common/multimedia_helpers.py:105
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "Фальшивий вихід аудіо"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:90
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "Тест відео"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#: ../src/common/multimedia_helpers.py:108
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "зелений"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "відео вихід"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "Система X Window (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:110
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "Система X Window (без Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "помилка: не вдалося відкрити %s для читання"
+msgid "Error: cannot open %s for reading"
+msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "блакитний"
 
-#: ../src/common/optparser.py:385
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
@@ -6673,19 +6802,116 @@ msgstr "Вчуся"
 msgid "Writing"
 msgstr "Пишу"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "типовий"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "морський"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Ховаюся"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Обліковий запис"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Стрічка облікового запису"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Опис"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Помилка."
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "перша"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "кімната"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+#, fuzzy
+msgid "street"
+msgstr "потік"
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Невідома назва"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Невідоме джерело"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6694,21 +6920,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "з <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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. Передавання файла буде скасовано."
-
 #. we're not english
-#: ../src/common/stanza_session.py:424
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6757,48 +6970,46 @@ msgstr "Будь ласка, переконайтеся, що запущено �
 msgid "Could not change status of account \"%s\""
 msgstr "Не вдалося змінити стан облікового запису «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:352
-#: ../src/common/zeroconf/connection_zeroconf.py:392
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Ваше повідомлення неможливо надіслати."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:366
-#: ../src/common/zeroconf/connection_zeroconf.py:406
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 "Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:433
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Неможливо встановити з’єднання з вузлом: перевищення очікування на "
 "підтвердження можливості надсилання даних."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:193
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Помилка під час додавання служби. %s"
 
-#: ../src/config.py:407
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Типове повідомлення"
 
-#: ../src/config.py:416
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../src/config.py:469 ../src/config.py:473 ../src/config.py:3159
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Типовий"
 
-#: ../src/config.py:757 ../src/dialogs.py:1493
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Словники для мови %s не доступні"
 
-#: ../src/config.py:758
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6807,76 +7018,76 @@ msgstr ""
 "Ви маєте встановити словники %s для використання перевірки орфографії, або "
 "обрати іншу мову через параметр speller_language."
 
-#: ../src/config.py:1238
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "заголовок повідомлення про стан"
 
-#: ../src/config.py:1238
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "текст повідомлення про стан"
 
 #. Name column
-#: ../src/config.py:1566 ../src/dialogs.py:2536 ../src/dialogs.py:2603
-#: ../src/dialogs.py:3395 ../src/disco.py:886 ../src/disco.py:1744
-#: ../src/disco.py:2046 ../src/history_window.py:91
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Повторно увійти зараз?"
 
-#: ../src/config.py:1662
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: ../src/config.py:1816 ../src/config.py:1949
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "На цьому комп'ютері OpenPGP не придатне для використання"
 
-#: ../src/config.py:1989 ../src/config.py:2036
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Непрочитані події"
 
-#: ../src/config.py:1990
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
 "подій."
 
-#: ../src/config.py:2019
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Ви розпочали балачку за допомогою облікового запису %s"
 
-#: ../src/config.py:2020
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
-#: ../src/config.py:2032 ../src/config.py:2574 ../src/config.py:2611
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Зараз ваш клієнт з’єднано з сервером"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:2037
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для зміни назви облікового запису вам слід прочитати усі повідомлення з "
 "черги подій."
 
-#: ../src/config.py:2043
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Така назва облікового запису вже використовується"
 
-#: ../src/config.py:2044
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6884,148 +7095,149 @@ msgstr ""
 "Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу "
 "назву."
 
-#: ../src/config.py:2048 ../src/config.py:2052
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Некоректна назва облікового запису"
 
-#: ../src/config.py:2049
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Назва облікового запису не може бути порожньою."
 
-#: ../src/config.py:2053
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Назва облікового запису не може містити пробіли."
 
-#: ../src/config.py:2130
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Перейменувати запис"
 
-#: ../src/config.py:2131
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введіть нову назву для облікового запису %s"
 
-#: ../src/config.py:2159
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ідентифікатор Jabber слід вказувати як «користувач@назва.сервера»."
 
-#: ../src/config.py:2382 ../src/config.py:3709
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:2383 ../src/config.py:3710
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: ../src/config.py:2404
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Спроба отримання закритих ключів завершилася невдало"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Немає доступних закритих ключів OpenPGP."
 
-#: ../src/config.py:2439
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/config.py:2440
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Вказаний обліковий запис недоступний"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Вам слід створити обліковий запис, перш ніж розпочати редагування ваших "
 "особистих відомостей."
 
-#: ../src/config.py:2455 ../src/dialogs.py:2287 ../src/dialogs.py:2525
-#: ../src/dialogs.py:2713 ../src/disco.py:515 ../src/profile_window.py:361
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без з’єднання ви не зможете редагувати ваші особисті відомості."
 
-#: ../src/config.py:2460
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#: ../src/config.py:2575 ../src/config.py:2612
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr ""
 "Для відключення облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:2581
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Обліковий запис Local вже існує."
 
-#: ../src/config.py:2582
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
 "повідомлення."
 
-#: ../src/config.py:2739
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Редагувати %s"
 
-#: ../src/config.py:2741
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Зареєструватися на %s"
 
 #. list at the beginning
-#: ../src/config.py:2777
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Список заборон"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Список учасників"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Список власників"
 
-#: ../src/config.py:2779
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Список адміністраторів"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2843 ../src/disco.py:893 ../src/history_manager.py:207
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2853
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Підстава"
 
-#: ../src/config.py:2860
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: ../src/config.py:2866
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Роль"
 
-#: ../src/config.py:2893
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Блокування..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2895
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -7033,11 +7245,11 @@ msgstr ""
 "<b>Кого ви бажаєте заблокувати?</b>\n"
 "\n"
 
-#: ../src/config.py:2897
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Додавання учасника..."
 
-#: ../src/config.py:2898
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -7045,11 +7257,11 @@ msgstr ""
 "<b>Кому ви бажаєте надати можливість участі?</b>\n"
 "\n"
 
-#: ../src/config.py:2900
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Додавання власника..."
 
-#: ../src/config.py:2901
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -7057,11 +7269,11 @@ msgstr ""
 "<b>Кого ви бажаєте зробити власником?</b>\n"
 "\n"
 
-#: ../src/config.py:2903
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Додавання адміністратора..."
 
-#: ../src/config.py:2904
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -7069,7 +7281,7 @@ msgstr ""
 "<b>Кого ви бажаєте зробити адміністратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2905
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -7085,103 +7297,103 @@ msgstr ""
 "4. домен (пошук лише домену: записів користувач@домен,\n"
 "домен/ресурс або адреси, що містить піддомен)."
 
-#: ../src/config.py:3006
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Вилучення облікового запису %s"
 
-#: ../src/config.py:3021
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "Обліковий запис вимкнено"
 
-#: ../src/config.py:3022
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr "Щоб зняти реєстрацію з серверу, обліковий запис має бути активним."
 
-#: ../src/config.py:3035 ../src/gui_interface.py:283
-#: ../src/gui_interface.py:701
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: ../src/config.py:3036 ../src/gui_interface.py:681
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: ../src/config.py:3037 ../src/gui_interface.py:701
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: ../src/config.py:3047
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: ../src/config.py:3062
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Спроба встановити з'єднання з сервером %s завершилася невдало"
 
-#: ../src/config.py:3063
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "Що ви хочете зробити?"
 
-#: ../src/config.py:3064
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "Вилучити _лише з Gajim"
 
-#: ../src/config.py:3065
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "Не видаляти нічого. Я спробую пізніше ще раз."
 
-#: ../src/config.py:3159
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "Всі"
 
-#: ../src/config.py:3160
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
-#: ../src/config.py:3161
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "Жодного"
 
-#: ../src/config.py:3233
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
 
-#: ../src/config.py:3266
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "У цій закладці містяться некоректні дані"
 
-#: ../src/config.py:3267
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
 
-#: ../src/config.py:3393 ../src/config.py:3404 ../src/config.py:3413
-#: ../src/config.py:3424 ../src/config.py:3432
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Заборонений символ"
 
-#: ../src/config.py:3404 ../src/config.py:3412 ../src/config.py:3424
-#: ../src/config.py:3685
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Некоректний сервер"
 
-#: ../src/config.py:3431
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Некоректна кімната"
 
-#: ../src/config.py:3601
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: ../src/config.py:3602 ../src/config.py:3608
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -7191,35 +7403,35 @@ msgstr ""
 "«Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором "
 "пункту «Облікові записи» у меню «Правка» головного вікна програми."
 
-#: ../src/config.py:3607
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Ваш новий обліковий запис було успішно створено"
 
-#: ../src/config.py:3646
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Некоректне ім’я користувача"
 
-#: ../src/config.py:3648
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
 
-#: ../src/config.py:3686
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr ""
 "Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
 
-#: ../src/config.py:3742 ../src/gui_interface.py:1203
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: ../src/config.py:3743 ../src/gui_interface.py:1204
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: ../src/config.py:3831
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7234,7 +7446,7 @@ msgstr ""
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: ../src/config.py:3837 ../src/gui_interface.py:1232
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7245,77 +7457,89 @@ msgstr ""
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: ../src/config.py:3869 ../src/config.py:3903
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: ../src/config.py:3968
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: ../src/config.py:3969
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
-#: ../src/config.py:4099
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "Вузол повідомлення про стан було вилучено"
 
-#: ../src/config.py:4100
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
 
-#: ../src/config.py:4128
+#: ../src/config.py:4147
 #, python-format
 msgid "Configure %s"
 msgstr "Налаштувати %s"
 
-#: ../src/config.py:4144 ../src/plugins/gui.py:74
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Активний"
 
-#: ../src/config.py:4152
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/config.py:4187
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Перше отримане повідомлення"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Перше отримане повідомлення"
 
-#: ../src/config.py:4188
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Фокус на наступне отримане повідомлення"
 
-#: ../src/config.py:4190
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Зняття фокусу з наступного отриманого повідомлення"
 
-#: ../src/config.py:4191
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Контакт з'єднано"
 
-#: ../src/config.py:4192
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Контакт від'єднано"
 
-#: ../src/config.py:4193
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Повідомлення надіслано"
 
-#: ../src/config.py:4194
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Виділення повідомлення групової балачки"
 
-#: ../src/config.py:4195
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: ../src/config.py:4196
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Отримано електронного листа GMail "
 
-#: ../src/conversation_textview.py:603
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -7325,7 +7549,7 @@ msgstr ""
 "отримано співрозмовником. Якщо програма показуватиме\n"
 "цю піктограму довго, ймовірно, повідомлення було втрачено."
 
-#: ../src/conversation_textview.py:622
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -7333,44 +7557,44 @@ msgstr ""
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Цитата"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: ../src/conversation_textview.py:767
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:835
 #, 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:797
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: ../src/conversation_textview.py:806
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1319
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7379,194 +7603,194 @@ msgstr[1] "%(nb_days)i днi тому"
 msgstr[2] "%(nb_days)i днiв тому"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1368 ../src/history_window.py:481
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:565
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: ../src/dataforms_widget.py:567
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Тим медіа не підтримується: %s"
 
-#: ../src/dataforms_widget.py:582
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "Це обов’язкове поле"
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Ідентифікатор Jabber вже є у списку"
 
-#: ../src/dataforms_widget.py:628
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "Введений вами ідентифікатор Jabber вже є у списку. Оберіть якийсь інший."
 
 #. Default jid
-#: ../src/dataforms_widget.py:639
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Назва контакту: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:197
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "У групі"
 
-#: ../src/dialogs.py:295
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Ім'я контакту"
 
-#: ../src/dialogs.py:475
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Встановити настрій"
 
-#: ../src/dialogs.py:595
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "Повідомлення про стан %s"
 
-#: ../src/dialogs.py:609
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Повідомлення про стан"
 
-#: ../src/dialogs.py:800
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Зберегти як стандартне повідомлення про стан"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Будь ласка, введіть назву цього повідомлення про стан"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "Адреса AIM:"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "Номер GG:"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "Адреса MSN:"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Адреса Yahoo!:"
 
-#: ../src/dialogs.py:879
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Будь ласка, вкажіть дані контакту, який ви бажаєте додати до облікового "
 "запису %s"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
 
-#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
-#: ../src/dialogs.py:3628
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Некоректний ідентифікатор користувача"
 
-#: ../src/dialogs.py:1081
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
-#: ../src/dialogs.py:1086
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Цей контакт вже є у реєстрі"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
-#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "Ідентифікатор:"
 
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1279
 msgid "A GTK+ Jabber/XMPP client"
 msgstr "Jabber/XMPP клієнт, що базується на GTK+"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1275
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Поточні розробники:"
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Колишні розробники:"
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "ПОДЯКИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1305
 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:1311
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "Сергій Єгоров <prapor@unixzone.org.ua> Юрій Чорноіван (0.12)"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7579,116 +7803,163 @@ msgstr ""
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: ../src/dialogs.py:1877
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Небезпечне з’єднання"
+
+#: ../src/dialogs.py:1846
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Ви маєте намір надіслати з’єднатись з обліковим записом %(account)s "
+"(%(server)s) через незахищене з’єднання. Весь ваш обмін повідомленнями буде "
+"незашифрованим. Цей тип з’єднання справді ненадійний. Ви справді бажаєте це "
+"зробити?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Так, я справді бажаю знехтувати безпекою"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr "Gajim НЕ буде з’єднуватись доки ви не відмітите цю опцію"
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "Більше _не питати мене"
+
+#: ../src/dialogs.py:1950
 msgid "_Resume"
 msgstr "_Продовжити"
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:1958
 msgid "Re_place"
 msgstr "За_мінити"
 
-#: ../src/dialogs.py:2076 ../src/dialogs.py:2477
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "У псевдонімі є недозволені символи."
 
-#: ../src/dialogs.py:2195
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: ../src/dialogs.py:2198
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: ../src/dialogs.py:2282 ../src/gui_interface.py:1959
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ви вже берете участь у груповій балачці %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: ../src/dialogs.py:2332
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Приєднатися до групової балачки з облікового запису %s"
 
-#: ../src/dialogs.py:2463
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Помилкова адреса uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Це не групова балачка"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Некоректний обліковий запис"
 
-#: ../src/dialogs.py:2464
+#: ../src/dialogs.py:2599
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Ви маєте обрати обліковий запис, з якого ви бажаєте приєднатись до групової "
 "балачки."
 
-#: ../src/dialogs.py:2476
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/dialogs.py:2481 ../src/dialogs.py:2487
-#: ../src/groupchat_control.py:2092
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: ../src/dialogs.py:2482
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "Будь ласка, вкажіть Jabber ID групової балачки у вигляді кімната@сервер."
 
-#: ../src/dialogs.py:2488 ../src/groupchat_control.py:2093
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:2493 ../src/gui_interface.py:1941
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: ../src/dialogs.py:2494 ../src/gui_interface.py:1942
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не є назвою групової балачки."
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: ../src/dialogs.py:2539
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2575
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: ../src/dialogs.py:2601
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: ../src/dialogs.py:2662
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Почати балачку з облікового запису %s"
 
-#: ../src/dialogs.py:2664
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: ../src/dialogs.py:2665
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7697,137 +7968,135 @@ msgstr ""
 "бажаєте надіслати повідомлення балачки:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2692 ../src/dialogs.py:3073 ../src/dialogs.py:3308
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: ../src/dialogs.py:2693 ../src/dialogs.py:3074 ../src/dialogs.py:3309
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: ../src/dialogs.py:2702 ../src/dialogs.py:2705
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: ../src/dialogs.py:2705
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не вдалося обробити «%s»."
 
-#: ../src/dialogs.py:2714
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: ../src/dialogs.py:2733
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: ../src/dialogs.py:2733
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: ../src/dialogs.py:2737
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/dialogs.py:2738
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
-#: ../src/dialogs.py:2780 ../src/gui_interface.py:842 ../src/notify.py:273
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: ../src/dialogs.py:2782 ../src/gui_interface.py:897 ../src/notify.py:266
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/dialogs.py:2784 ../src/gui_interface.py:804
-#: ../src/gui_interface.py:868 ../src/notify.py:268
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: ../src/dialogs.py:2786 ../src/gui_interface.py:943
-#: ../src/gui_interface.py:966 ../src/gui_interface.py:983
-#: ../src/notify.py:270
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: ../src/dialogs.py:2787 ../src/gui_interface.py:946 ../src/notify.py:271
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/dialogs.py:2789 ../src/gui_interface.py:614 ../src/notify.py:275
-msgid "Groupchat Invitation"
-msgstr "Запрошення до групової балачки"
-
-#: ../src/dialogs.py:2992
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: ../src/dialogs.py:2994
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: ../src/dialogs.py:2996
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2999
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3022
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3185
 #, 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:3129
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: ../src/dialogs.py:3130
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: ../src/dialogs.py:3189
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:3191
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "додати"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "змінити"
 
-#: ../src/dialogs.py:3339
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "вилучити"
 
-#: ../src/dialogs.py:3368
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7836,172 +8105,183 @@ msgstr ""
 "<b>%(jid)s</b> бажає <b>%(action)s</b> кілька контактів у вашому реєстрі."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3386 ../src/dialogs.py:3461
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Змінити"
 
-#: ../src/dialogs.py:3392
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3398
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Групи"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3506
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s підказав мені додати вас до мого реєстру."
 
-#: ../src/dialogs.py:3520
-#, python-format
-msgid "Added  %s contacts"
-msgstr "Додано %s контактів"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Додано %s контактів"
+msgstr[1] "Додано %s контактів"
+msgstr[2] "Додано %s контактів"
 
-#: ../src/dialogs.py:3557
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "Вилучено %s контактів"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Вилучено %s контактів"
+msgstr[1] "Вилучено %s контактів"
+msgstr[2] "Вилучено %s контактів"
 
-#: ../src/dialogs.py:3597 ../src/dialogs.py:3774
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Архівація налаштувань для %s"
 
-#: ../src/dialogs.py:3637
+#: ../src/dialogs.py:3779
 msgid "Invalid expire value"
 msgstr "Некоректне значення застарівання"
 
-#: ../src/dialogs.py:3638
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr "Час застарівання має бути дійсним додатним цілим числом."
 
-#: ../src/dialogs.py:3685
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr "Це помилка з формою"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr "Це помилка"
 
-#: ../src/dialogs.py:3973
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3977
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:4044
+#: ../src/dialogs.py:4186
 #, 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:4049
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: ../src/dialogs.py:4100
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: ../src/dialogs.py:4211
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:4312
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: ../src/dialogs.py:4401
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: ../src/dialogs.py:4402
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: ../src/dialogs.py:4434
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: ../src/dialogs.py:4437
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: ../src/dialogs.py:4439
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:4449
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: ../src/dialogs.py:4511
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "Оберіть клієнтський сертифікат PCKS#12"
 
-#: ../src/dialogs.py:4521 ../src/dialogs.py:4563 ../src/dialogs.py:4619
-#: ../src/dialogs.py:4707
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Всі файли"
 
-#: ../src/dialogs.py:4526
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "Файли PKCS12"
 
-#: ../src/dialogs.py:4553
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: ../src/dialogs.py:4568
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: ../src/dialogs.py:4606
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: ../src/dialogs.py:4624
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Зображення"
 
-#: ../src/dialogs.py:4694
+#: ../src/dialogs.py:4847
 msgid "Choose Archive"
 msgstr "Вибрати архів"
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4865
 msgid "Zip files"
 msgstr "Файли ZIP"
 
-#: ../src/dialogs.py:4738
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: ../src/dialogs.py:4740
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
-#: ../src/dialogs.py:4960
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -8012,19 +8292,19 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання (SAS) цього сеансу є <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4963
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Ви вже перевіряли особу контакту."
 
-#: ../src/dialogs.py:4969 ../src/dialogs.py:5053
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Особу контакту перевірено"
 
-#: ../src/dialogs.py:4975
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Повторити перевірку..."
 
-#: ../src/dialogs.py:4980
+#: ../src/dialogs.py:5133
 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 "
@@ -8034,19 +8314,19 @@ msgstr ""
 "бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, "
 "вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
 
-#: ../src/dialogs.py:4983 ../src/dialogs.py:5034 ../src/dialogs.py:5047
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Особу контакту НЕ перевірено"
 
-#: ../src/dialogs.py:4988
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Перевірити..."
 
-#: ../src/dialogs.py:4999
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Чи перевірили ви особу контакту?"
 
-#: ../src/dialogs.py:5000
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -8061,53 +8341,58 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання у цьому сеансі буде <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5001
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Ви зв’язалися з контактом і перевірили SAS?"
 
-#: ../src/dialogs.py:5035
+#: ../src/dialogs.py:5189
 #, 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:5041
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/dialogs.py:5048
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "З цим контактом пов’язано ключ GPG, але <b>ви вважаєте цей ключ ненадійним</"
 "b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб "
 "встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
 
-#: ../src/dialogs.py:5054
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "З цим контактом пов’язано ключ GPG, ви вважаєте цей ключ надійним, отже "
 "повідомлення буде зашифровано."
 
-#: ../src/dialogs.py:5119
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "аудіо та відео"
 
-#: ../src/dialogs.py:5121
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "аудіо"
 
-#: ../src/dialogs.py:5123
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "відео"
 
-#: ../src/dialogs.py:5127
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -8116,12 +8401,12 @@ msgstr ""
 "%(contact)s бажають розпочати %(type)s розмову з вами. Ви бажаєте відповісти "
 "на запит?"
 
-#: ../src/dialogs.py:5195
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Сертифікат до облікового запису %s"
 
-#: ../src/dialogs.py:5195
+#: ../src/dialogs.py:5376
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -8160,38 +8445,43 @@ msgstr ""
 "<b>Відбито:</b>\n"
 "SHA1 Відбиток: %(sha1)s"
 
-#: ../src/dialogs.py:5229 ../src/dialogs.py:5246
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
 msgid "View cert..."
 msgstr "Перегляд сертифікату..."
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Клієнтський сертифікат"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Інші"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Конференція"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Для того, щоб переглядати доступні служби, вам слід встановити з’єднання"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук служб за допомогою облікового запису %s"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Пошук у службі"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Не вдалося знайти службу"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8199,94 +8489,94 @@ msgstr ""
 "За вказаною вами адресою служб не виявлено, або ця адреса не відповідає. "
 "Перевірте, чи правильно вказано адресу, а потім повторіть спробу."
 
-#: ../src/disco.py:765 ../src/disco.py:1102
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Служба не придатна для перегляду"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Служби такого типу не містять елементів, які можна було б переглядати."
 
-#: ../src/disco.py:806 ../src/disco.py:816
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Некоректна назва сервера"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Перегляд %(address)s з використанням облікового запису %(account)s"
 
-#: ../src/disco.py:914
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Перегляд"
 
-#: ../src/disco.py:1103
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Ця служба не містить жодних елементів, які можна було б переглядати."
 
-#: ../src/disco.py:1343
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "Ви_конати команду"
 
-#: ../src/disco.py:1353 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "За_реєструватися"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Користувачі"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2477
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Закладку вже встановлено"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2478
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Закладка на груповій балачці «%s» вже існує."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2492
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Закладку було успішно додано"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2493
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
 
-#: ../src/disco.py:2055
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Підписано"
 
-#: ../src/disco.py:2063
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Вузол"
 
-#: ../src/disco.py:2127
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Нове повідомлення"
 
-#: ../src/disco.py:2133
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Підписатися"
 
-#: ../src/disco.py:2139
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
@@ -8340,17 +8630,19 @@ msgstr "Потрібен python-dbus."
 
 #: ../src/features_window.py:61 ../src/features_window.py:69
 #: ../src/features_window.py:73 ../src/features_window.py:77
-#: ../src/features_window.py:89 ../src/features_window.py:109
-#: ../src/features_window.py:113 ../src/features_window.py:117
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Цією можливістю не можна скористатися у Windows."
 
 #: ../src/features_window.py:62
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Шифрування повідомлення з OpenPGP"
 
 #: ../src/features_window.py:63
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Шифрування повідомлень балачки за допомогою ключів gpg."
 
 #: ../src/features_window.py:64
@@ -8466,48 +8758,22 @@ msgid "Requires python2.5."
 msgstr "Потрібен python2.5."
 
 #: ../src/features_window.py:94
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:95
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Перетворення виразів LaTeX, обмежених позначками $$."
-
-#: ../src/features_window.py:96
-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 або ImageMagick. Крім того, вам "
-"слід вказати для параметра «use_latex» значення «True» у Редакторі "
-"додаткових налаштувань."
-
-#: ../src/features_window.py:97
-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 або ImageMagick (ці пакунки є "
-"у MikTeX). Вам також слід встановити для параметра «use_latex» значення "
-"«True» у Редакторі додаткових налаштувань."
-
-#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "Шифрування «Кінець до Кінця» (E2E)"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Шифрування повідомлень балачки."
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Потрібен пакунок python-crypto."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "Інструмент створення RST"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8515,181 +8781,200 @@ msgstr ""
 "Створення XHTML з коду RST (див. http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Потрібні python-docutils."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "Можливість розпочати аудіо та відео розмову."
 
-#: ../src/features_window.py:108
-msgid "Requires python-farsight and gstreamer-plugins-bad."
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Requires python-farstream and gstreamer-plugins-bad."
 msgstr "Потрібні python-farsight та gstreamer-plugins-bad."
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "UPnP-IGD"
 msgstr "UPnP-IGD"
 
-#: ../src/features_window.py:111
+#: ../src/features_window.py:107
 msgid "Ability to request your router to forward port for file transfer."
 msgstr ""
 "Можливість запиту до маршрутизатора для надання порту для передавання файлів."
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:108
 msgid "Requires python-gupnp-igd."
 msgstr "Потрібен python-gupnp-igd."
 
-#: ../src/features_window.py:114
+#: ../src/features_window.py:110
 msgid "UPower"
 msgstr "UPower"
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
 msgid "Ability to disconnect properly just before suspending the machine."
 msgstr "Можливість правильно від’єднуватись перед присиплянням комп’ютера"
 
-#: ../src/features_window.py:116
+#: ../src/features_window.py:112
 msgid "Requires upower and python-dbus."
 msgstr "Потребує upower та python-dbus."
 
-#: ../src/features_window.py:124
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "?features:Доступний"
 
-#: ../src/features_window.py:131
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Можливість"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Час"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Поступ"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Назва файла: %s"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:400
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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:189 ../src/filetransfers_window.py:199
-#: ../src/history_manager.py:541
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Ви"
 
-#: ../src/filetransfers_window.py:190
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Відправник: %s"
 
-#: ../src/filetransfers_window.py:191 ../src/filetransfers_window.py:637
-#: ../src/tooltips.py:743
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Отримувач:"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Отримувач: %s"
 
-#: ../src/filetransfers_window.py:239
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Повідомлення про помилку: %s"
 
-#: ../src/filetransfers_window.py:268
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
+
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Вибрати файл для надсилання..."
 
-#: ../src/filetransfers_window.py:284 ../src/tooltips.py:781
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Опис: "
 
-#: ../src/filetransfers_window.py:297
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim не може отримати доступу до цього файла"
 
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Цей файл використовується іншим процесом."
 
-#: ../src/filetransfers_window.py:336 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: ../src/filetransfers_window.py:337 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
 
-#: ../src/filetransfers_window.py:354 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: ../src/filetransfers_window.py:354 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:365 ../src/gtkgui_helpers.py:862
+#: ../src/filetransfers_window.py:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: ../src/filetransfers_window.py:366 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
-#: ../src/filetransfers_window.py:377
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Зберегти файл як..."
 
-#: ../src/filetransfers_window.py:397
+#: ../src/filetransfers_window.py:450
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:403
+#: ../src/filetransfers_window.py:456
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:405
+#: ../src/filetransfers_window.py:458
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../src/filetransfers_window.py:406
+#: ../src/filetransfers_window.py:459
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s бажає надіслати вам файл:"
 
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Надсилання профілю..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Помилка під час передавання файла"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:469
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8697,68 +8982,110 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:562
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:605 ../src/filetransfers_window.py:608
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Некоректний файл"
 
-#: ../src/filetransfers_window.py:605
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:609
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: ../src/filetransfers_window.py:633 ../src/tooltips.py:733
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Назва: "
 
-#: ../src/filetransfers_window.py:635 ../src/tooltips.py:737
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Відправник:"
 
-#: ../src/filetransfers_window.py:797
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Призупинити"
 
-#: ../src/gajim.py:194
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "повідомлення"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Емоційки:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "_Показати лише у реєстрі"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Редактор додаткових налаштувань"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s помилка конфігурації"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "Налаштувати %s"
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Для роботи Gajim потрібен запущений сервер X. Завершення роботи..."
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "імпорт PyGTK не вдався: %s"
 
-#: ../src/gajim.py:237
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Для роботи Gajim потрібен PyGTK 2.16 або новіша версія"
 
-#: ../src/gajim.py:238
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібен PyGTK 2.16 або новіша версія. Завершення роботи..."
 
-#: ../src/gajim.py:240
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Для роботи Gajim потрібна бібліотека GTK 2.16 або новіша версія"
 
-#: ../src/gajim.py:241
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібна бібліотека GTK 2.16 або новіша версія. Завершення "
 "роботи..."
 
-#: ../src/gajim.py:250
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Для роботи Gajim потрібен pywin32"
 
-#: ../src/gajim.py:251
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8767,12 +9094,11 @@ msgstr ""
 "Будь ласка, переконайтеся, що у вашій системі встановлено Pywin32. "
 "Звантажити цю програму можна за адресою %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:367
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim вже запущено"
 
-#: ../src/gajim.py:368
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8780,29 +9106,29 @@ msgstr ""
 "Здається, вже запущено інший екземпляр Gajim.\n"
 "Запустити ще один екземпляр?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Показує довідку щодо вказаної команди"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "показати довідку щодо команди"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Вмикає або вимикає показ вікна реєстру"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr ""
 "Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8810,35 +9136,37 @@ msgstr ""
 "Показує список всіх контактів з реєстру. Кожен з записів контактів буде "
 "показано у окремому рядку"
 
-#: ../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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "обліковий запис"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "показати лише контакти вказаного облікового запису"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Показує список зареєстрованих облікових записів"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "стан"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:110
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -8847,11 +9175,18 @@ msgstr ""
 "турбувати, невидимий. Якщо не вказано, буде використано попередній стан "
 "облікового запису."
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "повідомлення"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "повідомлення про стан"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8860,19 +9195,20 @@ msgstr ""
 "вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "Змінює пріоритет одного або кількох облікових записів"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "пріоритет"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "пріоритет який ви бажаєте надати обліковому запису"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:122
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -8881,26 +9217,26 @@ msgstr ""
 "не вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Відкриває діалогове вікно балачки, за допомогою якого ви зможете надсилати "
 "повідомлення контакту"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакту, з яким ви бажаєте розпочати балачку"
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
 
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr "вміст повідомлення. Обліковий запис має бути зазначено або \"\""
 
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:140
 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 "
@@ -8911,29 +9247,29 @@ msgstr ""
 "встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
 "'OpenPGP key' рівним ''."
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "вміст повідомлення"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8944,134 +9280,134 @@ msgstr ""
 "встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
 "'OpenPGP key' рівним ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тема повідомлення"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID контакту"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Назва облікового запису"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Надсилає контакту файл"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "якщо вказано, файл буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Показує список всі параметрів та значення цих параметрів"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Встановлює значення «ключ» у «значення»"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ключ=значення"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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.py:208
 msgid "Deletes a preference item"
 msgstr "Вилучає запис параметра"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "назва параметра, який буде вилучено"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Вилучає контакт з реєстру"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Додає контакт до реєстру"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Додає новий контакт до цього облікового запису"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Повертає поточний стан (загальний стан, якщо не було вказано облікового "
 "запису)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
 "вказано облікового запису)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Повертає кількість непрочитаних повідомлень"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Відкриває діалогове вікно «Почати балачку»"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Розпочати балачку з цього облікового запису"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Надсилає нетиповий XML"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML для надсилання"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -9079,15 +9415,15 @@ msgstr ""
 "Обліковий запис, на який буде надіслано xml; якщо не вказано, xml буде "
 "надіслано до всіх облікових записів"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "Змінити аватар"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "Картинка, яку слід використовувати"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -9095,71 +9431,74 @@ msgstr ""
 "Обліковий запис, на для якого буде встановлено аватар; якщо не вказано, "
 "аватар буде встановлено до всіх облікових записів"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Обробка xmpp:/ uri"
 
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "Адреса URI для обробки"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr "Обліковий запис, який має це обробляти"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "Вміст повідомлення"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Приєднатися до кімнати групової балачки"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "кімната"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "JID кімнати"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "псевдонім"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "Псевдонім, який слід використовувати"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "Пароль для входу до кімнати"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 msgid "Account from which you want to enter the room"
 msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
 
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Перевірити, чи запущено Gajim"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Показує або ховає вікно ipython"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
-#: ../src/gajim-remote.py:349
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -9168,16 +9507,16 @@ msgstr ""
 "«%s» немає у реєстрі.\n"
 "Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
 
-#: ../src/gajim-remote.py:352
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "У вас немає жодного задіяного облікового запису"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
 
-#: ../src/gajim-remote.py:432
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -9186,25 +9525,27 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:440
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: ../src/gajim-remote.py:446
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Використання: %s команда [аргументи]\n"
 "Можливі команди:\n"
 
-#: ../src/gajim-remote.py:515
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9213,7 +9554,7 @@ msgstr ""
 "Забагато аргументів. \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9222,11 +9563,11 @@ msgstr ""
 "Не було вказано аргумент \"%(arg)s\". \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:539
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "Не надано універсальний ідентифікатор ресурсу"
 
-#: ../src/gajim-remote.py:541
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "Помилкова адреса uri"
 
@@ -9252,211 +9593,217 @@ msgid "You cannot delete your current theme"
 msgstr "Ви не можете вилучати вашої поточної теми"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Будь ласка, спершу змініть тему на іншу."
 
-#: ../src/groupchat_control.py:179 ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
-#: ../src/groupchat_control.py:233
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:235
+#: ../src/groupchat_control.py:238
 #, 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:563
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: ../src/groupchat_control.py:746
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: ../src/groupchat_control.py:748
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
-#: ../src/groupchat_control.py:1225
+#: ../src/groupchat_control.py:1268
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s встановив тему %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1243 ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
-#: ../src/groupchat_control.py:1246
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: ../src/groupchat_control.py:1248
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1293
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Сталася зміна налаштувань кімнати, не пов’язана з конфіденційністю"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "Тепер увімкнено запис повідомлень кімнати"
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "Тепер запис кімнати вимкнено"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: ../src/groupchat_control.py:1264
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1515
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: ../src/groupchat_control.py:1517
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: ../src/groupchat_control.py:1520
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1526
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: ../src/groupchat_control.py:1529
+#: ../src/groupchat_control.py:1606
 #, 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:1538
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: ../src/groupchat_control.py:1541
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1552 ../src/groupchat_control.py:1656
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: ../src/groupchat_control.py:1610 ../src/groupchat_control.py:1615
-#: ../src/groupchat_control.py:1621
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
 
-#: ../src/groupchat_control.py:1612
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: ../src/groupchat_control.py:1617
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: ../src/groupchat_control.py:1623
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1795
 #, 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:1710
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: ../src/groupchat_control.py:1725
+#: ../src/groupchat_control.py:1814
 #, 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:1729
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: ../src/groupchat_control.py:1764
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: ../src/groupchat_control.py:2019
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/groupchat_control.py:2021
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: ../src/groupchat_control.py:2025 ../src/gui_interface.py:673
-#: ../src/gui_interface.py:1311 ../src/gui_interface.py:1351
-#: ../src/gui_interface.py:1392 ../src/message_window.py:224
-#: ../src/roster_window.py:2989 ../src/roster_window.py:3667
-#: ../src/roster_window.py:4473
-msgid "_Do not ask me again"
-msgstr "Більше _не питати мене"
-
-#: ../src/groupchat_control.py:2059
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: ../src/groupchat_control.py:2060
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: ../src/groupchat_control.py:2067
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: ../src/groupchat_control.py:2068
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+"У ідентифікаторі Jabber групової балачки містяться недозволені символи."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2099
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: ../src/groupchat_control.py:2100
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9464,22 +9811,22 @@ msgstr ""
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: ../src/groupchat_control.py:2102
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2297
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: ../src/groupchat_control.py:2298 ../src/groupchat_control.py:2630
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2629
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
@@ -9503,66 +9850,60 @@ msgstr "_Повідомити про помилку"
 msgid "Details"
 msgstr "Подробиці"
 
-#. we talk about file
-#: ../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:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Помилка під час спроби прочитати файл:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Помилка під час обробки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:392
+#: ../src/gtkgui_helpers.py:393
 #, 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:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не є типовим клієнтом Jabber"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Чи бажаєте ви зробити Gajim типовим клієнтом Jabber?"
 
-#: ../src/gtkgui_helpers.py:768
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Завжди перевіряти, чи є Gajim типовим клієнтом Jabber, під час запуску"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Додаток не підтримується"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:131 ../src/gui_interface.py:295
-#: ../src/gui_interface.py:304 ../src/gui_interface.py:310
-#: ../src/gui_interface.py:313 ../src/gui_interface.py:316
-#: ../src/gui_interface.py:321
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9573,89 +9914,89 @@ msgstr ""
 "використовує інший учасник.\n"
 "Будь ласка, вкажіть нижче інший псевдонім:"
 
-#: ../src/gui_interface.py:135
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Завжди використовувати цей псевдонім при виникненні конфліктів."
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: ../src/gui_interface.py:157
+#: ../src/gui_interface.py:160
 #, 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:200 ../src/notify.py:279
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/gui_interface.py:284
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
 
-#: ../src/gui_interface.py:296
+#: ../src/gui_interface.py:299
 #, python-format
 msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Максимальна кількість користувачів <b>%s</b> вже досягнута."
 
-#: ../src/gui_interface.py:305
+#: ../src/gui_interface.py:308
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Вас заблокували у груповій балачці <b>%s</b>."
 
-#: ../src/gui_interface.py:311
+#: ../src/gui_interface.py:314
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Групової балачки <b>%s</b> не існує."
 
-#: ../src/gui_interface.py:314
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Можливість створення групових балачок обмежено."
 
-#: ../src/gui_interface.py:317
+#: ../src/gui_interface.py:320
 #, python-format
 msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr ""
 "Для групової балачки <b>%s</b> слід використовувати псевдонім, під яким ви "
 "зареєструвалися."
 
-#: ../src/gui_interface.py:322
+#: ../src/gui_interface.py:325
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас немає у списку постійних учасників групової балачки %s."
 
-#: ../src/gui_interface.py:405 ../src/gui_interface.py:409
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
-#: ../src/gui_interface.py:461 ../src/notify.py:281
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: ../src/gui_interface.py:486
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: ../src/gui_interface.py:487
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: ../src/gui_interface.py:495
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: ../src/gui_interface.py:496
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9663,57 +10004,71 @@ msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: ../src/gui_interface.py:517 ../src/notify.py:283
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: ../src/gui_interface.py:528
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Зв’язок з «%s» встановити не вдалося"
 
-#: ../src/gui_interface.py:626
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
 "або цей агент повернув помилковий пароль.\n"
 
-#: ../src/gui_interface.py:628 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
 
-#: ../src/gui_interface.py:630
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Ваш пароль не є коректним"
 
-#: ../src/gui_interface.py:635
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Ваш OpenPGP пароль не є коректним"
 
-#: ../src/gui_interface.py:648
+#: ../src/gui_interface.py:681
 msgid "Certificate Passphrase Required"
 msgstr "Потрібна кодова фраза для сертифікату"
 
-#: ../src/gui_interface.py:649
+#: ../src/gui_interface.py:682
 #, python-format
 msgid "Enter the passphrase for the certificate for account %s"
 msgstr "Введіть пароль ключа GPG для сертифікату від облікового запису %s"
 
-#: ../src/gui_interface.py:671
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG непридатне для використання"
 
-#: ../src/gui_interface.py:671
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/gui_interface.py:684
+#: ../src/gui_interface.py:717
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
@@ -9721,7 +10076,7 @@ msgstr ""
 "Gnome Keyring встановлено, але не запущено належним чином (ймовірно, змінну "
 "середовища вказано неправильно)"
 
-#: ../src/gui_interface.py:722
+#: ../src/gui_interface.py:755
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
@@ -9729,16 +10084,16 @@ msgstr ""
 "Будь ласка, скопіюйте/вставте оновлений запис з веб-сторінки яка щойно "
 "відкрилася."
 
-#: ../src/gui_interface.py:725
+#: ../src/gui_interface.py:758
 msgid "Oauth2 Credentials"
 msgstr "Облікові дані Oauth2"
 
-#: ../src/gui_interface.py:815
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нові повідомлення у %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:817
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9746,7 +10101,7 @@ msgstr[0] "Отримано %d новий лист"
 msgstr[1] "Отримано %d нових листи"
 msgstr[2] "Отримано %d нових листів"
 
-#: ../src/gui_interface.py:830
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9761,52 +10116,67 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:895
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: ../src/gui_interface.py:967
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Перенесення файлу завершено"
+
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ви успішно отримали %(filename)s від %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:971
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: ../src/gui_interface.py:984
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:988
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: ../src/gui_interface.py:1063
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
+
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Не вдалося розшифрувати повідомлення"
 
-#: ../src/gui_interface.py:1075
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: ../src/gui_interface.py:1076
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: ../src/gui_interface.py:1092
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9815,20 +10185,20 @@ msgstr ""
 "ласка, вкажіть інший ресурс"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1137
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s бажає розпочати голосову розмову."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "Запит на голосову розмову"
 
-#: ../src/gui_interface.py:1227
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: ../src/gui_interface.py:1228
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9839,15 +10209,20 @@ msgstr ""
 "помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: ../src/gui_interface.py:1237
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: ../src/gui_interface.py:1262
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Перевірка сертифіката SSL"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Помилка сертифіката SSL"
 
-#: ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9864,34 +10239,7 @@ msgstr ""
 "\n"
 "Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
 
-#: ../src/gui_interface.py:1302 ../src/gui_interface.py:1346
-#: ../src/gui_interface.py:1388
-msgid "Insecure connection"
-msgstr "Небезпечне з’єднання"
-
-#: ../src/gui_interface.py:1303
-#, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) with an "
-"insecure connection. This means all your conversations will be exchanged "
-"unencrypted. This type of connection is really discouraged.\n"
-"Are you sure you want to do that?"
-msgstr ""
-"Ви маєте намір надіслати з’єднатись з обліковим записом %(account)s "
-"(%(server)s) через незахищене з’єднання. Весь ваш обмін повідомленнями буде "
-"незашифрованим. Цей тип з’єднання справді ненадійний. "
-"Ви справді бажаєте це зробити?"
-
-#: ../src/gui_interface.py:1309 ../src/gui_interface.py:1350
-#: ../src/gui_interface.py:1391
-msgid "Yes, I really want to connect insecurely"
-msgstr "Так, я справді бажаю знехтувати безпекою"
-
-#: ../src/gui_interface.py:1310
-msgid "Gajim will NOT connect unless you check this box"
-msgstr "Gajim НЕ буде з’єднуватись доки ви не відмітите цю опцію"
-
-#: ../src/gui_interface.py:1347
+#: ../src/gui_interface.py:1447
 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?"
@@ -9900,7 +10248,7 @@ msgstr ""
 "безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
 "зараз?"
 
-#: ../src/gui_interface.py:1389
+#: ../src/gui_interface.py:1489
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -9909,17 +10257,17 @@ msgstr ""
 "вигляді. Виконати надсилання пароля?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1898 ../src/gui_interface.py:1921
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Емоційки вимкнено"
 
-#: ../src/gui_interface.py:1899
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: ../src/gui_interface.py:1922
+#: ../src/gui_interface.py:2019
 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 "
@@ -9929,84 +10277,87 @@ msgstr ""
 "формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
 "адресою http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:1966 ../src/roster_window.py:3834
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2353
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: ../src/gui_interface.py:2915
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: ../src/gui_interface.py:2916
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:2930
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "Немає ключа GPG"
 
-#: ../src/gui_interface.py:2931
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш ключ GPG застарів. З’єднання з %s буде встановлено без OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:2940
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: ../src/gui_interface.py:2941
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Створити групову балачку"
 
-#: ../src/gui_menu_builder.py:420
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Я хочу додати вас до свого реєстру"
 
-#: ../src/history_manager.py:116
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "створення каталогу %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Не можу знайти базу даних журналу"
 
-#. holds jid
-#: ../src/history_manager.py:156
-msgid "Contacts"
-msgstr "Контакти"
-
 #. holds time
-#: ../src/history_manager.py:169 ../src/history_manager.py:213
-#: ../src/history_window.py:99
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:176 ../src/history_manager.py:232
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Псевдонім"
 
 #. holds message
-#: ../src/history_manager.py:185 ../src/history_manager.py:220
-#: ../src/history_window.py:107
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Повідомлення"
 
 #. holds subject
-#: ../src/history_manager.py:193 ../src/history_manager.py:226
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/history_manager.py:252
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -10014,7 +10365,7 @@ msgstr ""
 "Бажаєте спорожнити базу даних? (НАПОЛЕГЛИВО НЕ РЕКОМЕНДУЄМО ЦЬОГО РОБИТИ, "
 "ЯКЩО ЗАПУЩЕНО GAJIM)"
 
-#: ../src/history_manager.py:254
+#: ../src/history_manager.py:264
 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 "
@@ -10029,101 +10380,105 @@ msgstr ""
 "\n"
 "Якщо ви натиснете кнопку «ТАК», вам доведеться зачекати..."
 
-#: ../src/history_manager.py:259
+#: ../src/history_manager.py:269
 msgid "Database Cleanup"
 msgstr "Очищення бази даних"
 
-#: ../src/history_manager.py:477
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Експорт журналів..."
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s повідомив: %(message)s\n"
 
-#: ../src/history_manager.py:592
+#: ../src/history_manager.py:602
 #, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
 msgstr "Ви справді бажаєте вилучити журнальні записи %(jid)s?"
 
-#: ../src/history_manager.py:596
+#: ../src/history_manager.py:606
 msgid "Do you really want to delete logs of the selected contacts?"
 msgstr "Ви справді бажаєте вилучити журнали для обраних контактів?"
 
-#: ../src/history_manager.py:598 ../src/history_manager.py:637
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Наслідки цієї дії є незворотними."
 
-#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
 msgid "Deletion Confirmation"
 msgstr "Підтвердження видалення"
 
-#: ../src/history_manager.py:634
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ви справді бажаєте вилучити виділене повідомлення?"
 msgstr[1] "Ви справді бажаєте вилучити виділені повідомлення?"
 msgstr[2] "Ви справді бажаєте вилучити виділені повідомлення?"
 
-#: ../src/history_window.py:306
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал спілкування з %s"
 
-#: ../src/history_window.py:356
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Помилка роботи з диском"
 
-#: ../src/history_window.py:444
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s тепер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:455
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Помилка: %s"
 
-#: ../src/history_window.py:457
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Помилка."
 
-#: ../src/history_window.py:459
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Поточний стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:462
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Поточний стан: %(status)s"
 
-#: ../src/htmltextview.py:522
+#: ../src/htmltextview.py:523
 msgid "Loading"
 msgstr "Завантаження"
 
-#: ../src/message_window.py:222
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr "Комп’ютер присипляється"
+
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Ви збираєтесь закрити кілька вкладок"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Ви справді бажаєте закритити їх усі?"
 
-#: ../src/message_window.py:497
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Балачки"
 
-#: ../src/message_window.py:499
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Групові балачки"
 
-#: ../src/message_window.py:501
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: ../src/message_window.py:507
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Повідомлення"
 
@@ -10135,48 +10490,53 @@ msgstr "- вестиметься запис повідомлень"
 msgid "- messages will not be logged"
 msgstr "- не вестиметься запис повідомлень"
 
-#: ../src/notify.py:322
+#: ../src/notify.py:324
 msgid "Ignore"
 msgstr "_Ігнорувати"
 
-#: ../src/plugins/gui.py:68
+#: ../src/plugins/gui.py:82
 msgid "Plugin"
 msgstr "Додатки"
 
-#: ../src/plugins/gui.py:162
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Блокування %s"
+
+#: ../src/plugins/gui.py:209
 msgid "Plugin failed"
 msgstr "Активація додатка невдалаДодаток"
 
-#: ../src/plugins/gui.py:206
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr "Не вдається коректно вилучити додаток лм"
 
 #. members not safe
-#: ../src/plugins/gui.py:214 ../src/plugins/pluginmanager.py:519
-#: ../src/plugins/pluginmanager.py:527
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
 msgid "Archive is malformed"
 msgstr "Архів пошкоджений"
 
-#: ../src/plugins/gui.py:237 ../src/plugins/gui.py:245
-#: ../src/plugins/pluginmanager.py:535
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
 msgid "Plugin already exists"
 msgstr "Додаток вже встановлено"
 
-#: ../src/plugins/gui.py:237
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr "Перезаписати?"
 
-#: ../src/plugins/gui.py:266
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "Налаштування"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:505 ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
 msgid "Archive corrupted"
 msgstr "Архів пошкоджено"
 
-#: ../src/plugins/pluginmanager.py:507
+#: ../src/plugins/pluginmanager.py:514
 msgid "Archive empty"
 msgstr "Архів порожній "
 
@@ -10184,103 +10544,105 @@ msgstr "Архів порожній "
 msgid "Retrieving profile..."
 msgstr "Отримання профілю..."
 
-#: ../src/profile_window.py:125 ../src/roster_window.py:3184
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: ../src/profile_window.py:128 ../src/roster_window.py:3187
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Файла не існує"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:142 ../src/profile_window.py:158
-#: ../src/roster_window.py:3189 ../src/roster_window.py:3200
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "Невірний формат дати"
 
-#: ../src/profile_window.py:230
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат має бути РРРР-ММ-ДД"
 
-#: ../src/profile_window.py:284
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Отримано відомості"
 
-#: ../src/profile_window.py:362
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Для того, щоб оприлюднити відомості щодо контакту з вами, вам слід "
 "встановити з’єднання."
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Надсилання профілю..."
 
-#: ../src/profile_window.py:394
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Відомості НЕ оприлюднено"
 
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Спроба оприлюднення vCard зазнала невдачі"
 
-#: ../src/profile_window.py:402
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1031
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: ../src/roster_window.py:1999
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Було надіслано уповноваження"
 
-#: ../src/roster_window.py:2000
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: ../src/roster_window.py:2023
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: ../src/roster_window.py:2024
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: ../src/roster_window.py:2038
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Уповноваження було вилучено"
 
-#: ../src/roster_window.py:2039
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: ../src/roster_window.py:2066
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG непридатне для використання"
 
-#: ../src/roster_window.py:2067
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
 
-#: ../src/roster_window.py:2274 ../src/roster_window.py:3764
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: ../src/roster_window.py:2275 ../src/roster_window.py:3765
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10288,27 +10650,27 @@ msgstr ""
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
 "балачок. Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: ../src/roster_window.py:2301
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: ../src/roster_window.py:2367
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Справді вийти з Gajim?"
 
-#: ../src/roster_window.py:2368
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ви справді бажаєте вийти з Gajim?"
 
-#: ../src/roster_window.py:2369
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Завжди закривати Gajim"
 
-#: ../src/roster_window.py:2455
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "Ви маєте активні перенесення файлів"
 
-#: ../src/roster_window.py:2456
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
@@ -10316,11 +10678,11 @@ msgstr ""
 "Якщо ви вийдете зараз, усі передачі файлів буде зупинено. Ви все ще бажаєте "
 "вийти?"
 
-#: ../src/roster_window.py:2487 ../src/roster_window.py:2903
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: ../src/roster_window.py:2488
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10328,16 +10690,16 @@ msgstr ""
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: ../src/roster_window.py:2904
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: ../src/roster_window.py:2907
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: ../src/roster_window.py:2908
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10345,11 +10707,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: ../src/roster_window.py:2911
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: ../src/roster_window.py:2916
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10358,11 +10720,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цих транспортів: %s"
 
-#: ../src/roster_window.py:2984
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:2986
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10371,56 +10733,56 @@ msgstr ""
 "від нього повідомлень."
 
 #. it's jid
-#: ../src/roster_window.py:3076
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: ../src/roster_window.py:3077
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: ../src/roster_window.py:3084
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: ../src/roster_window.py:3085
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: ../src/roster_window.py:3130
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: ../src/roster_window.py:3131
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: ../src/roster_window.py:3574
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3576
+#: ../src/roster_window.py:3637
 #, 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:3581
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10429,11 +10791,11 @@ msgstr ""
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3587
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: ../src/roster_window.py:3591
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10441,16 +10803,16 @@ msgstr ""
 "Вилучення цього контакту призведе до вилучення уповноваження, отже він або "
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
-#: ../src/roster_window.py:3594
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3598
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3603
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10460,12 +10822,13 @@ msgstr ""
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: ../src/roster_window.py:3661
+#: ../src/roster_window.py:3722
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Ви маєте намір надіслати особливий статус. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3663
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10474,34 +10837,35 @@ msgstr ""
 "Цей контакт тимчасово бачитиме вас як %(status)s, но лише до зміни вашого "
 "статусу. Потім він бачитиме ваш глобальний статус."
 
-#: ../src/roster_window.py:3682
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: ../src/roster_window.py:3683
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: ../src/roster_window.py:4373
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: ../src/roster_window.py:4375
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: ../src/roster_window.py:4467
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:4469
+#: ../src/roster_window.py:4552
 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 "
@@ -10511,11 +10875,11 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: ../src/roster_window.py:4590
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: ../src/roster_window.py:4602
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10523,17 +10887,17 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: ../src/roster_window.py:4737
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Надіслати %s до %s"
 
-#: ../src/roster_window.py:4748
+#: ../src/roster_window.py:4831
 #, python-format
 msgid "Make %s first contact"
 msgstr "Зробити %s першим контактом."
 
-#: ../src/roster_window.py:4751
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Робить %s та %s метаконтактом."
@@ -10543,129 +10907,129 @@ msgstr "Робить %s та %s метаконтактом."
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5190 ../src/roster_window.py:5244
-#: ../src/roster_window.py:5253 ../src/statusicon.py:264
-#: ../src/statusicon.py:311 ../src/statusicon.py:317
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
 #. add
-#: ../src/roster_window.py:5260
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "до облікового запису %s"
 
 #. disco
-#: ../src/roster_window.py:5265
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "з облікового запису %s"
 
-#: ../src/roster_window.py:5304 ../src/statusicon.py:327
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Керування закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "облікового запису %s"
 
-#: ../src/roster_window.py:5365
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "до облікового запису %s"
 
-#: ../src/roster_window.py:5425 ../src/roster_window.py:5533
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: ../src/roster_window.py:5458
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: ../src/roster_window.py:5460
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "Оприлюднити положення"
 
-#: ../src/roster_window.py:5463
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Налаштувати служби..."
 
-#: ../src/roster_window.py:5611
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
-#: ../src/roster_window.py:5621 ../src/roster_window.py:5794
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: ../src/roster_window.py:5633
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5814
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5823
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Редагувати _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5878
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
 #. Execute Command
-#: ../src/roster_window.py:5925
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5935
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5944
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5954
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "Пере_йменувати"
 
-#: ../src/roster_window.py:6014
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: ../src/roster_window.py:6023
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "_Перез’єднати"
 
-#: ../src/roster_window.py:6030
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
 #. History manager
-#: ../src/roster_window.py:6119
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: ../src/roster_window.py:6130
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: ../src/roster_window.py:6349
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Змінити повідомлення про стан..."
 
@@ -10682,15 +11046,11 @@ msgstr "Помилка у отриманих даних"
 msgid "No result"
 msgstr "Результату немає"
 
-#: ../src/session.py:97
-msgid "Disk WriteError"
-msgstr "Помилка під час запису на диск"
-
-#: ../src/session.py:411 ../src/session.py:470
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Підтвердити параметри цих сеансів"
 
-#: ../src/session.py:413
+#: ../src/session.py:411
 #, python-format
 msgid ""
 "The remote client wants to negotiate a session with these features:\n"
@@ -10705,7 +11065,7 @@ msgstr ""
 "\n"
 "Чи всі вказані параметри є прийнятними?"
 
-#: ../src/session.py:472
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10720,150 +11080,150 @@ msgstr ""
 "\n"
 "Продовжити цей сеанс?"
 
-#: ../src/session.py:475
+#: ../src/session.py:474
 msgid "Always accept for this contact"
 msgstr "Завжди приймати цей контакт"
 
-#: ../src/statusicon.py:228
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Змінити повідомлення про стан..."
 
-#: ../src/statusicon.py:342
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "Сховати реєстр"
 
-#: ../src/statusicon.py:353
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Сховати це меню"
 
-#: ../src/tooltips.py:393 ../src/tooltips.py:605
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:396 ../src/tooltips.py:609
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Ресурс"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s цієї групової балачки"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [заблоковано]"
 
-#: ../src/tooltips.py:507
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [мінімізовано]"
 
-#: ../src/tooltips.py:522 ../src/tooltips.py:778
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Попередній стан: %s"
 
-#: ../src/tooltips.py:568
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " з %s"
 
-#: ../src/tooltips.py:586
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "З'єднано"
 
-#: ../src/tooltips.py:588
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Роз'єднано"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:616
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Підписка:"
 
-#: ../src/tooltips.py:626
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "Відсутній з %s"
 
-#: ../src/tooltips.py:648
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "Відсутній %s"
 
-#: ../src/tooltips.py:699
-#, python-format
-msgid "Mood: %s"
-msgstr "Настрій: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "Настрій:"
 
-#: ../src/tooltips.py:703
-#, python-format
-msgid "Activity: %s"
-msgstr "Заняття: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "Заняття:"
 
-#: ../src/tooltips.py:707
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Музика: %s"
 
-#: ../src/tooltips.py:711
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Положення: %s"
 
-#: ../src/tooltips.py:736
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Звантажити"
 
-#: ../src/tooltips.py:742
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Вивантажити"
 
-#: ../src/tooltips.py:749
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:753
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Передано:"
 
-#: ../src/tooltips.py:756 ../src/tooltips.py:777
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Не розпочато"
 
-#: ../src/tooltips.py:760
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Зупинено"
 
-#: ../src/tooltips.py:762 ../src/tooltips.py:765
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:769
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "Призупинено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:773
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Заблоковано"
 
-#: ../src/tooltips.py:775
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Перенесення"
 
-#: ../src/tooltips.py:813
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Ця служба ще не надала докладних відомостей"
 
-#: ../src/tooltips.py:816
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10871,36 +11231,32 @@ msgstr ""
 "Ця служба не може надсилати у відповідь докладні відомості.\n"
 "Причиною є застарілість або пошкодженість служби"
 
-#: ../src/upower_listener.py:31
-msgid "Machine going to sleep"
-msgstr "Комп’ютер присипляється"
-
-#: ../src/vcard.py:285
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Клієнт:Невідомий"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?ОС:Невідома"
 
-#: ../src/vcard.py:310
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Час:Невідомий"
 
-#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "з %s"
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Роль в груповій балачці:<b>Роль:</b>"
 
-#: ../src/vcard.py:371
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Належність:</b>"
 
-#: ../src/vcard.py:379
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10908,7 +11264,7 @@ msgstr ""
 "Цей контакт зацікавлений у ваших відомостях щодо присутності, але ви не "
 "цікавитеся відомостями щодо його або її присутності"
 
-#: ../src/vcard.py:381
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10916,32 +11272,222 @@ msgstr ""
 "Ви зацікавлені у відомостях щодо присутності контакту, але він або вона не "
 "цікавляться вашими відомостями"
 
-#: ../src/vcard.py:383
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
 "одного"
 
 #. None
-#: ../src/vcard.py:385
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Ви не зацікавлені у присутності контакту, а він або вона у вашій присутності"
 
-#: ../src/vcard.py:392
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ви очікуєте на відповідь контакту на ваш запит щодо підписки"
 
-#: ../src/vcard.py:394
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "У черзі немає запитів на підписку."
 
-#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Показати профіль контакту (Ctrl+I)"
+
+#~ msgid "label"
+#~ msgstr "мітка"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Дозволити йому/їй бачити мій стан"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Показувати _заняття контактів у реєстрі"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Показувати _музику контактів у реєстрі"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Показувати _настрій контактів у реєстрі"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Якщо буде позначено цей пункт, Gajim показуватиме рід занять контактів у "
+#~ "вікні реєстру"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Якщо буде позначено цей пункт, Gajim показуватиме положення контактів у "
+#~ "вікні реєстру"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Якщо буде позначено цей пункт, Gajim показуватиме музику, яку слухають "
+#~ "контакти у вікні реєстру"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Програма для обміну миттєвими повідомленнями Gajim"
+
+#~ msgid "English"
+#~ msgstr "Англійська"
+
+#~ msgid "Belarusian"
+#~ msgstr "Білоруська"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Болгарська"
+
+#~ msgid "Breton"
+#~ msgstr "Бретонська"
+
+#~ msgid "Czech"
+#~ msgstr "Чеська"
+
+#~ msgid "German"
+#~ msgstr "Німецька"
+
+#~ msgid "Greek"
+#~ msgstr "Грецька"
+
+#~ msgid "British"
+#~ msgstr "Британська англійська"
+
+#~ msgid "Esperanto"
+#~ msgstr "Есперанто"
+
+#~ msgid "Spanish"
+#~ msgstr "Іспанська"
+
+#~ msgid "Basque"
+#~ msgstr "Баскська"
+
+#~ msgid "French"
+#~ msgstr "Французька"
+
+#~ msgid "Croatian"
+#~ msgstr "Хорватська"
+
+#~ msgid "Italian"
+#~ msgstr "Італійська"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Норвезька (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Нідерландська"
+
+#~ msgid "Norwegian"
+#~ msgstr "Норвезька"
+
+#~ msgid "Polish"
+#~ msgstr "Польська"
+
+#~ msgid "Portuguese"
+#~ msgstr "Португальська"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Бразильська португальська"
+
+#~ msgid "Russian"
+#~ msgstr "Російська"
+
+#~ msgid "Serbian"
+#~ msgstr "Сербська"
+
+#~ msgid "Slovak"
+#~ msgstr "Словацька"
+
+#~ msgid "Swedish"
+#~ msgstr "Шведська"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Китайська (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Мова перевірки правопису"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "Потрібен python-farsight."
+
+#~ 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 ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "За допомогою цього параметра можна регулювати розмір формул latex. Більші "
+#~ "значення відповідають більшим символам формул."
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Помилка під час виконання «%(command)s»: %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "помилка: не вдалося відкрити %s для читання"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Не вдалося прив’язатися до порту %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Можливо, запущено інший екземпляр Gajim. Передавання файла буде скасовано."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Перетворення виразів LaTeX, обмежених позначками $$."
+
+#~ 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 або ImageMagick. Крім того, "
+#~ "вам слід вказати для параметра «use_latex» значення «True» у Редакторі "
+#~ "додаткових налаштувань."
+
+#~ 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 або ImageMagick (ці пакунки "
+#~ "є у MikTeX). Вам також слід встановити для параметра «use_latex» значення "
+#~ "«True» у Редакторі додаткових налаштувань."
+
+#~ msgid "Contacts"
+#~ msgstr "Контакти"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Помилка під час запису на диск"
+
+#~ msgid "Mood: %s"
+#~ msgstr "Настрій: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "Заняття: %s"
+
 #~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 #~ msgstr "Потрібен pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
@@ -10981,12 +11527,6 @@ msgstr " пріоритетний ресурс"
 #~ msgid "Don't have "
 #~ msgstr "Не має "
 
-#~ msgid "File Transfer Finished"
-#~ msgstr "Перенесення файлу завершено"
-
-#~ msgid "File Transfer Request "
-#~ msgstr "Запит на передавання файла"
-
 #~ msgid "File Transfer Started "
 #~ msgstr "Зупинка передавання файла"
 
@@ -11042,9 +11582,6 @@ msgstr " пріоритетний ресурс"
 #~ msgid "_Inform me with a popup window"
 #~ msgstr "_Повідомити мене виринаючим вікном"
 
-#~ msgid "_Show event in notification area"
-#~ msgstr "_Показати події у зоні сповіщень"
-
 #~ msgid "_Show event in roster"
 #~ msgstr "_Показати подію у реєстрі"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e7ead4e4f..5807fb642 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,15 +6,11 @@
 # kangkang <kanger@gamil.com>, 2005.
 # Guanhao Yin <yinguanhao@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\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:53+0800\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2010-10-31 17:37+0800\n"
 "Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n"
 "Language-Team: \n"
@@ -24,298 +20,293 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "状态(_S)"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "个人事件"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "开始聊天(_S)"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "加入聊天室(_G)"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "添加联系人(_A)..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "发现服务(_D)"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "执行命令(_E)..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "修改账户信息(_M)"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "打开 Gmail 收件箱(_O)"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "个人事件"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "开始聊天(_S)"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "状态(_S)"
+msgid "_Modify Account"
+msgstr "修改账户信息(_M)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: 账户创建向导"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>正在连接服务器</b>\n"
-"\n"
-"请等待..."
+"您必须拥有一个账户以连接\n"
+"Jabber 网络"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "I already have an account I want to _use"
+msgstr "我已经有想要使用的账户了(_U)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "我想注册一个新账户(_R)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>请选择一个选项</b>: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>请填写您现有账号的信息</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>请选择一个服务器</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "密码(_P): "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"将这个证书添加到可信任证书列表。\n"
-"这个证书的 SHA1 指纹信息: \n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "保存密码(_W)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "匿名认证(_Y)"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "如果选定, Gajim 会记录本账户的密码"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "当我点击\"结束\"时连接"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: 账户创建向导"
+msgid "Anon_ymous authentication"
+msgstr "匿名认证(_Y)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "我已经有想要使用的账户了(_U)"
+msgid "<b>Please select a server</b>"
+msgstr "<b>请选择一个服务器</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "我想注册一个新账户(_R)"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "服务器(_S): "
 
 #: ../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 会记录本账户的密码"
+msgid "Prox_y:"
+msgstr "代理服务器(_Y): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 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: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:3612 ../src/config.py:3687
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:517
-#: ../src/dialogs.py:530 ../src/roster_window.py:2967
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2978
-msgid "None"
-msgstr "无"
+msgid "Use custom hostname/port"
+msgstr "使用自定义的主机名/端口"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "代理服务器(_Y): "
+msgid "_Hostname:"
+msgstr "主机名(_H): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "保存密码(_W)"
+msgid "_Port:"
+msgstr "端口(_P)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "连接后设置我的名片"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "高级(_A)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "使用自定义的主机名/端口"
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"您必须拥有一个账户以连接\n"
-"Jabber 网络"
+"将这个证书添加到可信任证书列表。\n"
+"这个证书的 SHA1 指纹信息: \n"
 
 #: ../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:25
-msgid "_Finish"
-msgstr "完成(_F)"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "主机名(_H): "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>正在连接服务器</b>\n"
+"\n"
+"请等待..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "当我点击\"结束\"时连接"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "密码(_P): "
+msgid "Set my profile when I connect"
+msgstr "连接后设置我的名片"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "端口(_P)"
+msgid "_Finish"
+msgstr "完成(_F)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "服务器(_S): "
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>杂项</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "无"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "账户"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>个人信息</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "添加"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>代理服务器</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "删除"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "依据状态调整(_A)"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "重命名(_N)"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "账号"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "启用(_E)"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "账户"
+msgid "Anonymous authentication"
+msgstr "匿名认证"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "管理操作"
+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 ""
+"资源被发送给服务器以将用不同客户端登录的同一账户区分为两个或更多部分(取\n"
+"决于登录的客户端的数目)。比如, 您可以利用\"家庭\"和\"工作\"两个资源同时\n"
+"连接到服务器。拥有最高优先级的资源得到服务器的事件响应。（请看下面）"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "匿名认证"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "连接断开后自动重连"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "同步联系人"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "浏览..."
+msgid "Click to request authorization to all contacts of another account"
+msgstr "点击以请求另一个账户所有联系人的认证"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Gajim 启动时连接(_O)"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "更改密码(_G)"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's 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 "Administration operations"
+msgstr "管理操作"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "选择客户端证书"
+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 ""
+"优先级是当多个客户端使用同一帐户连接到服务器时, 服务器决定事件响应对\n"
+"象的依据。优先级最高的客户端将得到事件响应"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "选择密钥(_K)..."
+msgid "A_djust to status"
+msgstr "依据状态调整(_A)"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "点击以改变该账户的密码"
+msgid "Priority will change automatically according to your status."
+msgstr "优先级将根据您的状态自动转换。"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "点击以请求另一个账户所有联系人的认证"
+msgid "Priori_ty:"
+msgstr "优先级(_T):"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "客户端证书"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim 启动时连接(_O)"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "连接"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail : "
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "名: "
+msgid "Resour_ce:"
+msgstr "资源(_C): "
 
-#. 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:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr "客户端证书文件(_C)"
 
-#. 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:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2909 ../src/roster_window.py:5434
-msgid "General"
-msgstr "常规"
+#: ../data/gui/accounts_window.ui.h:25
+msgid "Browse..."
+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地址, 这使得文件传输成功的可能性得到提高。"
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "证书被拒绝"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "如果选定, Gajim 会从一个 GPG agent （比如 Seahorse）得到密码"
+msgid "Client certificate"
+msgstr "客户端证书"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "账号"
 
 #: ../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 "C_onnect on Gajim startup"
+msgstr "Gajim 启动时连接(_O)"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -324,6 +315,18 @@ msgid ""
 msgstr "如果选定, Gajim 会在启动时自动使用本账户连接 jabber 服务器"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "连接断开后自动重连"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "保存与所有联系人的聊天记录(_L)"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "将帐户状态与全局状态同步(_R)"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -332,172 +335,197 @@ 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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"如果用于接收消息的默认端口不合适, 您可以在这里选择另外一个。\n"
-"您可能需要改变防火墙设置。"
-
-#: ../data/gui/accounts_window.ui.h:34
-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:1817
-#: ../src/dialogs.py:833
-msgid "Jabber ID:"
-msgstr "Jabber ID"
+msgid "Use file transfer proxies"
+msgstr "使用文件传输代理服务器"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "姓: "
+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:37
-msgid "Mer_ge accounts"
-msgstr "合并帐户(_G)"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "常规"
 
-#: ../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:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "使用 HTTP__PROXY 环境变量(_U)"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "个人信息"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "管理..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>代理服务器</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "优先级(_T):"
+msgid "_Warn before using an insecure connection"
+msgstr "在使用不安全的连接之前警告（_W）"
 
 #: ../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 ""
-"优先级是当多个客户端使用同一帐户连接到服务器时, 服务器决定事件响应对\n"
-"象的依据。优先级最高的客户端将得到事件响应"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr "如果选定, Gajim 在通过不安全的网络连接发送密码前会询问您"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "优先级将根据您的状态自动转换。"
+msgid "Send _keep-alive packets"
+msgstr "发送数据包以防止连接超时"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5384
-msgid "Re_name"
-msgstr "重命名(_N)"
+#: ../data/gui/accounts_window.ui.h:44
+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:45
-msgid "Resour_ce:"
-msgstr "资源(_C): "
+msgid "Use cust_om hostname/port"
+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 ""
-"资源被发送给服务器以将用不同客户端登录的同一账户区分为两个或更多部分(取\n"
-"决于登录的客户端的数目)。比如, 您可以利用\"家庭\"和\"工作\"两个资源同时\n"
-"连接到服务器。拥有最高优先级的资源得到服务器的事件响应。（请看下面）"
+msgid "_Hostname: "
+msgstr "主机名(_H): "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "保存与所有联系人的聊天记录(_L)"
+msgid "_Port: "
+msgstr "端口号(_P): "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>杂项</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "发送数据包以防止连接超时"
+msgid "Connection"
+msgstr "连接"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "将帐户状态与全局状态同步(_R)"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "没有选择密钥"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "将帐户状态与全局状态同步(_Z)"
+msgid "Choose _Key..."
+msgstr "选择密钥(_K)..."
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "同步联系人"
+msgid "Use G_PG Agent"
+msgstr "使用 G_PG Agent"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "客户端证书路径（PKCS#12 格式）"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "如果选定, Gajim 会从一个 GPG agent （比如 Seahorse）得到密码"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "使用 G_PG Agent"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "使用自定义主机名/端口号"
+msgid "_Edit Personal Information..."
+msgstr "编辑个人信息..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "使用自定义端口号: "
+msgid "Information about you, as stored in the server"
+msgstr "服务器中保存的关于您的信息"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "使用文件传输代理服务器"
+msgid "<b>Personal Information</b>"
+msgstr "<b>个人信息</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr "客户端证书文件(_C)"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "个人信息"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "编辑个人信息..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 启动时连接(_O)"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "启用(_E)"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "将帐户状态与全局状态同步(_Z)"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "主机名(_H): "
+msgid "Use cust_om port:"
+msgstr "使用自定义端口号: "
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "管理..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"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"
+"您可能需要改变防火墙设置。"
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "名: "
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "端口号(_P): "
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "姓: "
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "在使用不安全的连接之前警告（_W）"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail : "
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "使用 HTTP__PROXY 环境变量(_U)"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "合并帐户(_G)"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "账号(_C): "
+msgid "Add New Contact"
+msgstr "添加联系人"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "允许此联系人看到我的状态(_L)"
+msgid "A_ccount:"
+msgstr "账号(_C): "
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "添加联系人"
+msgid "_Protocol:"
+msgstr "协议(_P): "
 
-#: ../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 "我想添加您到我的联系人列表"
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "用户 ID(_U):"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "昵称(_N): "
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "群组(_G): "
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "允许此联系人看到我的状态(_L)"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "保存认证消息(_S)"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -508,7 +536,11 @@ msgstr ""
 "添加此协议的联系人。\n"
 "点击注册按钮处理。"
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "注册(_G): "
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -516,571 +548,366 @@ msgstr ""
 "您必须连接才能\n"
 "增加此协议的联系人。"
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "群组(_G): "
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "昵称(_N): "
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "协议(_P): "
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "注册(_G): "
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "保存认证消息(_S)"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "用户 ID(_U):"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "我想添加您到我的联系人列表"
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>发生了一个错误: </b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>选择要执行的命令</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "请稍等, 正在获取命令列表..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc 命令 - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>选择要执行的命令</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "请再检查一遍"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "错误描述..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "请稍等, 正在发送命令..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "完成(_F)"
+msgid "Please wait..."
+msgstr "请稍等..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "请稍等, 正在获取命令列表..."
+msgid "This jabber entity does not expose any commands."
+msgstr "这个 Jabber 节点没有提供任何命令"
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "请稍等, 正在发送命令..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>发生了一个错误: </b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "请稍等..."
+msgid "Error description..."
+msgstr "错误描述..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "这个 Jabber 节点没有提供任何命令"
+msgid "F_inish"
+msgstr "完成(_F)"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>描述</b>"
+msgid "Advanced Configuration Editor"
+msgstr "高级设置编辑器"
 
 #: ../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 以使某些设置生效"
+msgid "Filter:"
+msgstr "过滤器: "
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "高级设置编辑器"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>描述</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "过滤器: "
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>注意: </b>您必须重新启动 gajim 以使某些设置生效"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "恢复为默认颜色设置(_R)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "删除 MOTD"
+msgid "Show _XML Console"
+msgstr "显示 XML 控制台(_X)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "删除每日消息"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "编辑存档首选项(_V)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "编辑隐私策略列表(_P)"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "管理员(_A)"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "向所有当前连接到这个服务器的用户发送一条消息"
+msgid "_Send Server Message..."
+msgstr "发送服务器消息(_S)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "设定 MOTD..."
+msgid "Sends a message to users currently connected to this server"
+msgstr "向所有当前连接到这个服务器的用户发送一条消息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "设定每日消息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "显示 XML 控制台(_X)"
+msgid "Set MOTD..."
+msgstr "设定 MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "更新 MOTD..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "更新每日消息"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "更新 MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "管理员(_A)"
+msgid "Delete MOTD"
+msgstr "删除 MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "发送服务器消息(_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "与此联系人聊天时打开的窗口/标签"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>动作</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>条件</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>声音</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "高级动作"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "高级通知控件设置"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "所有状态"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "离开"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "忙碌"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "联系人改变了状态"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "联系人已断开连接"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "没有"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "文件传输完毕"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "文件传输请求"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "文件传输开始"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "多人聊天消息高亮显示"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "收到多人聊天消息"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "有"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "隐身"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "运行命令"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "离开很久了"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "一或多个指定的状态..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "在线/和我聊天吧"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "播放声音"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "收到一条消息"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-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 "激活窗口管理器事件提示使任务栏的聊天窗口闪烁(_A)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "禁用自动打开聊天窗口(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "禁用现有的弹出窗口(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "禁用现有的此事件的声音(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr "禁用在通知区域中显示事件(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "禁用在联系人列表中显示事件(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "使用弹出窗口通知(_I)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "与用户打开聊天窗口(_O)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in notification area"
-msgstr "在通知区域中显示事件(_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "在联系人列表中显示事件(_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "与我"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "联系人"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "每个人"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "为"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "群组"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "当我在"
+msgid "Deletes Message of the Day"
+msgstr "删除每日消息"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr "<i>Method Auto</i>"
+msgid "No"
+msgstr "No"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr "<i>Method Local</i>"
+msgid "Yes"
+msgstr "Yes"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr "<i>Method Manual</i>"
+msgid "Prefer"
+msgstr "Prefer"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-msgid "Auto"
-msgstr "Auto"
-
-#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Concede"
 msgstr "Concede"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "Forbid"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr "<i>Method Manual</i>"
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "No"
+msgid "<i>Method Local</i>"
+msgstr "<i>Method Local</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-msgid "Prefer"
-msgstr "Prefer"
+msgid "<i>Method Auto</i>"
+msgstr "<i>Method Auto</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Yes"
+msgid "Auto"
+msgstr "Auto"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entry:"
+msgid "New entry received"
+msgstr "New entry received"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "You have received new entry:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed name:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Last modified:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "New entry received"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 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:5403
-#: ../src/roster_window.py:5531 ../src/roster_window.py:5664
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "解除屏蔽(_U)"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>消息: </b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "设置活动"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "设置活动"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>消息: </b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>心情: </b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>消息: </b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "更改密码"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "再次输入以确认: "
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "输入新密码"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "再次输入以确认: "
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>键入新的状态消息</b>"
+msgid "Save as Preset..."
+msgstr "另存为..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "活动: "
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "心情: "
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "活动: "
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "预设的消息: "
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "另存为..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>键入新的状态消息</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "加入聊天室(_G)"
+msgid "_Copy Link Location"
+msgstr "复制链接位置(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "添加至联系人列表(_A)"
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "复制 JID/电子邮件地址(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "复制链接位置(_C)"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "打开邮件编辑器(_O)"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4598
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "加入聊天室(_G)"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "添加至联系人列表(_A)"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "显示表情列表(Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "向联系人列表中添加联系人(Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "邀请联系人参与对话(Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "邀请联系人参与对话(Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "浏览聊天记录(Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "显示高级功能菜单(Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "发送(_S)"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 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 "显示格式列表(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 "显示高级功能菜单(Alt+D)"
-
-#: ../data/gui/chat_control.ui.h:19
-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)"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "标签"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "邀请(_V)"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "邀请朋友!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "多人聊天服务器"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "请选择一个多人聊天服务器"
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1088,119 +915,136 @@ msgstr ""
 "您将开始进行多人聊天。\n"
 "选择您想要邀请的联系人"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "要求查看他/她的状态(_S)"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "请选择一个多人聊天服务器"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "添加特殊提示(_N)"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "多人聊天服务器"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "指定 Open_PGP 密钥"
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "邀请(_V)"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "执行命令..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "开始聊天(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "编辑群组(_G)..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "发送单条消息...(_M)"
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "发送文件(_F)..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5499
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "邀请联系人(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "移除(_R)"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "切换Open_PGP加密"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "切换E2E加密"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5349
-#: ../src/roster_window.py:5588
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "发送个性化状态(_T)"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "执行命令..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "发送单条消息...(_M)"
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "管理联系人"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "发送文件(_F)..."
+msgid "_Rename..."
+msgstr "重命名(_R)"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "设置自定义头像(_A)"
+msgid "Edit _Groups..."
+msgstr "编辑群组(_G)..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "开始聊天(_C)"
+msgid "Assign Open_PGP Key..."
+msgstr "指定 Open_PGP 密钥"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "切换E2E加密"
+msgid "Set Custom _Avatar..."
+msgstr "设置自定义头像(_A)"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "切换Open_PGP加密"
+msgid "Add Special _Notification..."
+msgstr "添加特殊提示(_N)"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "认证(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "允许他/她查看我的状态(_A)"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "允许此联系人看到我的状态(_L)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5411
-#: ../src/roster_window.py:5537 ../src/roster_window.py:5667
-msgid "_Block"
-msgstr "屏蔽(_B)"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "要求查看他/她的状态(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:22
-#: ../src/roster_window.py:5738
-msgid "_History"
-msgstr "历史(_H)"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "忽略(_I)"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "屏蔽(_B)"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "管理联系人"
+msgid "_Unignore"
+msgstr "取消忽略(_U)"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "重命名(_R)"
+msgid "_Ignore"
+msgstr "忽略(_I)"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "认证(_S)"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "移除(_R)"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "取消忽略(_U)"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "历史(_H)"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "请填写表格。"
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "聊天室设置"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "请填写表格。"
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "编辑群组"
@@ -1213,55 +1057,47 @@ msgstr "<b>ESession</b>信息"
 msgid "_Verify"
 msgstr "辨别(_V)"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "特性"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Gajim 支持的特性列表</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "特性"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "正在传输, 传输完成和停止传输的文件列表"
+msgid "File Transfers"
+msgstr "文件传输"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "取消文件传输"
+msgid "Shows a list of file transfers between you and others"
+msgstr "显示您与他人进行的传输文件列表"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "取消选定文件的传输"
+msgid "file transfers list"
+msgstr "文件传输列表"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "取消选定文件传输并删除未完成文件"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "正在传输, 传输完成和停止传输的文件列表"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "清除(_U)"
+msgid "_Notify me when a file transfer is complete"
+msgstr "文件传输完成时提醒我(_N)"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "文件传输"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "当文件传输完成时弹出提示"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "隐藏该窗口"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "从列表移除已完成, 已取消和失败的文件传输"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "从列表中移除文件传输。"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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"
@@ -1269,79 +1105,105 @@ msgstr ""
 "该操作会从列表中移除单个文件传输。如果传输正在进行, 它将先被终止, 而后\n"
 "被移除"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "清除(_U)"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "暂停(_P)"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "当文件传输完成时弹出提示"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "取消选定文件传输并删除未完成文件"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "继续(_C)"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "取消文件传输"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "文件传输完成时提醒我(_N)"
+msgid "Cancels the selected file transfer"
+msgstr "取消选定文件的传输"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "打开文件夹(_O)"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "隐藏该窗口"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "暂停(_P)"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "继续(_C)"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "文件传输列表"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "打开文件夹(_O)"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>各聊天状态下标签颜色</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "账户"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:956
-msgid "Bold"
-msgstr "粗体"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "群组"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "联系人"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "聊天窗口上方横幅"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "正在编辑"
+msgid "Gajim Themes Customization"
+msgstr "Gajim 主题自定义"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "联系人"
+msgid "Text _color:"
+msgstr "文本颜色(_C): "
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "字体风格: "
+msgid "_Background:"
+msgstr "背景(_B)"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim 主题自定义"
+msgid "Text _font:"
+msgstr "文本字体(_F): "
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "已离开"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "群组"
+msgid "Font style:"
+msgstr "字体风格: "
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "未活动的"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "粗体"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:957
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "斜体"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "暂停编辑"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "正在编辑"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "未活动的"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>各聊天状态下标签颜色</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "已离开"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1349,7 +1211,7 @@ msgstr ""
 "多人聊天\n"
 "消息"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1357,105 +1219,98 @@ msgstr ""
 "多人聊天指示性\n"
 "消息"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "暂停编辑"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "文本颜色(_C): "
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "文本字体(_F): "
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "背景(_B)"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "更改昵称(_N)"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "管理聊天室(_M)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "更改主题(_S)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "设置聊天室(_R)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "将本聊天室加入书签(_B)"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "删除聊天室(_D)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "管理聊天室(_M)"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "关闭时最小化窗口"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "语音(_V)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "将本聊天室加入书签(_B)"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "仲裁人(_D)"
+msgid "_Send Private Message"
+msgstr "发送私聊消息(_S)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "房主动作"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "发送文件(_F)"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "房主动作"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "添加至联系人列表(_A)"
+msgid "_Voice"
+msgstr "语音(_V)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "仲裁人(_D)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "成员(_M)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "封禁(_B)"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "所有人(_O)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "踢除(_K)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "成员(_M)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "所有人(_O)"
+msgid "_Ban"
+msgstr "封禁(_B)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "发送私聊消息(_S)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "语音(_V)"
+msgid "_Add to Roster"
+msgstr "添加至联系人列表(_A)"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "将本聊天室加入书签(Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "显示格式列表(Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "更改您的昵称(Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "将本聊天室加入书签(Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1467,39 +1322,19 @@ msgid "From:"
 msgstr "从: "
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 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."
-msgstr ""
-"<b>警告: </b>\n"
-"如果您要进行大量的删除, 请确认 Gajim 不再运行。\n"
-"通常, 如果您正在与某个联系人聊天, 请不要删除与他的聊天记录。"
+msgid "Gajim History Logs Manager"
+msgstr "Gajim 历史记录管理器"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 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:3226
-#: ../src/dialogs.py:3323
-msgid "Delete"
-msgstr "删除"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "导出"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim 历史记录管理器"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1512,165 +1347,191 @@ msgstr ""
 "\n"
 "使用这个程序来删除或导出历史记录。您可以在左侧进行选择且/或在下方进行搜索。"
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>警告: </b>\n"
+"如果您要进行大量的删除, 请确认 Gajim 不再运行。\n"
+"通常, 如果您正在与某个联系人聊天, 请不要删除与他的聊天记录。"
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "搜索数据库(_S)"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "所有聊天历史"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "对话历史"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "导出"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "输入 JID 或者联系人名"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr "多人聊天历史"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "所有聊天历史"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "对话历史"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "查找: "
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "记录联系人状态变化(_L)"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
-msgstr "approve"
+msgid "expire"
+msgstr "expire"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
-msgstr "body"
+msgid "save"
+msgstr "save"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr "concede"
+msgid "otr"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr "expire"
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr "false"
+msgid "body"
+msgstr "body"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
-msgstr "forbid"
+msgid "false"
+msgstr "false"
 
 #: ../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:8
+msgid "stream"
+msgstr "stream"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
-msgstr "oppose"
+msgid "approve"
+msgstr "approve"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
-msgstr "otr"
+msgid "concede"
+msgstr "concede"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
-msgstr "prefer"
+msgid "forbid"
+msgstr "forbid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
-msgstr "require"
+msgid "oppose"
+msgstr "oppose"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr "save"
+msgid "prefer"
+msgstr "prefer"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
-msgstr "stream"
-
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Bro_wse Rooms"
+msgid "require"
+msgstr "require"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2198
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "当我连接后自动加入此聊天室(_A)"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "聊天室: "
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "昵称: "
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "最近: "
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "密码: "
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "最近: "
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "当我连接后自动加入此聊天室(_A)"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "聊天室: "
+msgid "_Bookmark this room"
+msgstr "将本聊天室加入书签(_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "服务器: "
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "将本聊天室加入书签(_B)"
+msgid "Bro_wse Rooms"
+msgstr "Bro_wse Rooms"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "加入(_J)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "自动加入"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "如果选定, Gajim 会在启动时加入此聊天室"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "书签管理"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "自动加入时最小化"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "标题: "
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "显示状态: "
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "自动加入"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "如果选定, Gajim 会在启动时加入此聊天室"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "标题: "
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "自动加入时最小化"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1681,130 +1542,129 @@ msgid "_Configure"
 msgstr "配置(_C)"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>属性</b>"
+msgid "HTTP Connect"
+msgstr "HTTP 连接"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>设置</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP 连接"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "管理代理服务器设置"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "类型(_T): "
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "密码(_W)"
+msgid "_Name:"
+msgstr "名称(_N): "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "代理服务器地址(_H): "
+msgid "<b>Properties</b>"
+msgstr "<b>属性</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "代理服务器端口(_P): "
+msgid "Use HTTP prox_y"
+msgstr "使用 HTTP 代理(_Y)"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "使用 HTTP 代理(_Y)"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "代理服务器需要认证"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "用户名(_U): "
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "密码(_W)"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "名称(_N): "
+msgid "Proxy _Host:"
+msgstr "代理服务器地址(_H): "
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "类型(_T): "
+msgid "Proxy _Port:"
+msgstr "代理服务器端口(_P): "
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "用户名(_U): "
+msgid "<b>Settings</b>"
+msgstr "<b>设置</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "管理联系人(_M)"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "密文"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;empty&gt;"
+msgid "Plugins"
+msgstr "插件"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<empty>"
+#, fuzzy
+msgid "Install from zip"
+msgstr "安装"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "作者: "
+msgid "&lt;empty&gt;"
+msgstr "&lt;empty&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Available"
-msgstr "在线"
+msgid "Version:"
+msgstr "版本: "
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Configure"
-msgstr "配置"
+msgid "<empty>"
+msgstr "<empty>"
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Descrition:"
-msgstr "描述: "
+msgid "Authors:"
+msgstr "作者: "
 
 #: ../data/gui/plugins_window.ui.h:7
 msgid "Homepage:"
 msgstr "主页: "
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr "安装"
+msgid "homepage url"
+msgstr "主页链接"
 
 #: ../data/gui/plugins_window.ui.h:9
-msgid "Installed"
-msgstr "已安装"
+#, fuzzy
+msgid "Description:"
+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 "插件的描述会被显示在这里。这些文字在插件窗口初始化时将被去除"
+msgid "Uninstall"
+msgstr "卸载"
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr "插件"
+msgid "Configure"
+msgstr "配置"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr "卸载"
+msgid "Installed"
+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 "主页链接"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr "插件的描述会被显示在这里。这些文字在插件窗口初始化时将被去除"
 
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
@@ -1815,208 +1675,264 @@ msgid "Event desc"
 msgstr "事件"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>高级配置编辑器</b>"
+msgid "Use default applications"
+msgstr "使用默认的应用程序"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>应用程序</b>"
+msgid "Custom"
+msgstr "自定义"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>音频</b>"
+msgid "All chat states"
+msgstr "所有聊天状态"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>自动调整状态</b>"
+msgid "Composing only"
+msgstr "仅正在编辑"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>聊天窗口外观</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "禁用"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>聊天窗口中文字颜色</b>"
+msgid "Never"
+msgstr "从不"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>聊天状态提示</b>"
+msgid "Only when pending events"
+msgstr "仅当有未处理的事件时"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>连接</b>"
+msgid "Always"
+msgstr "总是"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "弹出提示"
 
-#. 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>"
+msgid "Notify me about it"
+msgstr "提醒我"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>字体</b>"
+msgid "Show only in roster"
+msgstr "只显示在联系人列表中"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail 选项</b>"
+msgid "Detached roster with detached chats"
+msgstr "聊天窗口与联系人列表分离, 且互相分离"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "单一聊天窗口, 与联系人列表分离"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>预设状态消息</b>"
+msgid "Single window for everything"
+msgstr "只使用单一窗口"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>隐私策略</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "聊天窗口与联系人列表分离, 依据账户分组"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>联系人列表外观</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "聊天窗口与联系人列表分离, 依据类型分组"
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "最后状态: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>状态消息</b>"
+msgid "Preferences"
+msgstr "参数"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>主题</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "在联系人列表显示中联系人的头像(_V)"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>视频</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"如果选定, Gajim 会在联系人列表和多人聊天窗口中显示联系人列表中的联系人明细"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>可视化提示</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "在联系人列表中显示联系人的状态信息(_M)"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(例如: stunserver.org)</i>"
+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:23
-msgid "Advanced"
-msgstr "高级"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "在联系人列表中显示联系人的位置信息(_L)"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "高级..."
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "All chat states"
-msgstr "所有聊天状态"
+msgid "Sort contacts by status"
+msgstr "将联系人按状态排序"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "允许发送关于操作系统的信息(_O)"
+msgid "in _roster"
+msgstr "在联系人列表中(_R)"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "允许发送关于闲置时间的信息(_I)"
+msgid "in _group chats"
+msgstr "在多人聊天窗口中(_G)"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>联系人列表外观</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "在我忙碌时允许播放声音(_B)"
+msgid "_Window behavior:"
+msgstr "窗口行为(_W)"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "总是"
+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:31
-msgid "Ask status message when I:"
-msgstr "询问状态消息, 当我: "
+msgid "_Emoticons:"
+msgstr "表情(_E): "
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr "音频/视频"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "使消息窗口紧凑(_K)"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "音频输入设备"
+msgid "Hide all buttons in chat windows"
+msgstr "在聊天窗口中隐藏所有按钮"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "音频输出设备"
+msgid "_Ignore rich content in incoming messages"
+msgstr "忽略收到的消息中的富文本内容(_I)"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "聊天消息: "
+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:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "在启动是检测 Gajim 是否是默认的 Jabber 客户端程序"
+msgid "_Highlight misspelled words"
+msgstr "拼写检查(_H)"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
-msgstr "仅正在编辑"
+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 会在聊天窗口中将编辑框中的拼写错误高亮显示。如果没有通\n"
+"过在编辑框点击右键的方式显式设定语言, 联系人或聊天室的默认语言将被\n"
+"使用。"
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "配置界面颜色与字体"
+msgid "_Show roster on startup:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "联系人消息: "
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "收到任意多人聊天消息播放的声音。"
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "联系人昵称"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "自定义"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>聊天窗口外观</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr "聊天窗口与联系人列表分离, 依据账户分组"
+msgid "When new event is received:"
+msgstr "当收到新的事件: "
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr "聊天窗口与联系人列表分离, 依据类型分组"
+msgid "Notify me about contacts that sign _in"
+msgstr "提醒我联系人登录(_I)"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr "聊天窗口与联系人列表分离, 且互相分离"
+msgid "Notify me about contacts that sign _out"
+msgstr "提醒我联系人登出(_O)"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr "单一聊天窗口, 与联系人列表分离"
+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:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "禁用"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "在联系人列表中显示联系人的活动(_A)"
+msgid "Notify on new _GMail email"
+msgstr "新 Gmail 邮件通知"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "显示额外的邮件信息(_E)"
+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:49
-msgid "Display _location of contacts in roster"
-msgstr "在联系人列表中显示联系人的位置信息(_L)"
+msgid "Display _extra email details"
+msgstr "显示额外的邮件信息(_E)"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "在联系人列表中显示联系人正在播放音乐的信息(_T)"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr "如果选中, Gajim 将同时包含新电子邮件发送者的信息"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "在联系人列表显示中联系人的头像(_V)"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail 选项</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "在联系人列表中显示联系人的心情(_O)"
+msgid "Show notification area icon:"
+msgstr "在通知区域显示图标: "
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "在联系人列表中显示联系人的状态信息(_M)"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>可视化提示</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "播放声音(_S)"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "管理...(_N)"
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "在我忙碌时允许播放声音(_B)"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>声音</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+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 "
@@ -2025,7 +1941,11 @@ msgstr ""
 "Gajim 可以收发您与联系人正在进行对话的相关信息。此处您可以指定您想在聊天\n"
 "窗口中显示的聊天状态信息。"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "显示聊天状态信息(_D): "
+
+#: ../data/gui/preferences_window.ui.h:61
 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 "
@@ -2034,760 +1954,715 @@ 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: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 会在计算机空闲更长时间后将您的状态设置为离开很久了。"
+msgid "_Send chat state notifications:"
+msgstr "发送聊天状态信息(_S): "
 
 #: ../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 会在联系人列表和多人聊天窗口中显示联系人列表中的联系人明细"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>聊天状态提示</b>"
 
 #: ../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 会在联系人列表和多人聊天窗口中联系人名下方显示联系人状态消息"
+msgid "Personal Events"
+msgstr "个人事件"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的活动。"
+msgid "_Away after:"
+msgstr "在此时间后设置状态为离开(_A): "
 
 #: ../data/gui/preferences_window.ui.h:66
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的位置。"
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "如果选定, Gajim 在计算机空闲时会将您的状态设置为离开。"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
+msgid "_Not available after:"
+msgstr "在此时间后设置状态为离开很久了(_N): "
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人正在播放的音乐。"
+"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: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 ""
-"如果选定, Gajim 会在聊天窗口中将编辑框中的拼写错误高亮显示。如果没有通\n"
-"过在编辑框点击右键的方式显式设定语言, 联系人或聊天室的默认语言将被\n"
-"使用。"
+msgid "minutes"
+msgstr "分钟"
 
 #: ../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 "
-"not in the roster"
-msgstr ""
-"如果选中, Gajim 会忽略未认证的联系人引发的事件。请谨慎使用, 因为这将屏蔽所有"
-"不在联系人列表中的联系人发来的消息。"
-
-#: ../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."
+"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 会记录加密的消息。请注意, 使用 E2E 加密时, 必须对方同意\n"
-"记录, 否则 Gajim 不会记录。"
-
-#: ../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 "如果选中, Gajim 在 GMail 收到新的电子邮件是会显示一个通知"
+"离开状态的自动消息。如果为空, Gajim 不会改变当前的状态消息\n"
+"$S会被上个状态消息替换\n"
+"$T会被自动离开的超时时间替换"
 
 #: ../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, "
-"etc...)"
+"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 会以协议特定的方式显示状态图标。(例如, MSN 联系人会以同\n"
-"MSN 相同的图标显示在线, 离开, 忙, 等等状态...)"
-
-#: ../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 "如果选中, Gajim 不会询问状态消息, 而使用特定的默认消息。"
-
-#: ../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 会用相应的动态或静态的图形代替字符表情, 例如':)'"
+"离开很久了的自动消息。如果为空, Gajim 不会改变当前的状态消息\n"
+"$S会被上个状态消息替换\n"
+"$T会被自动不可用的超时时间替换"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "记录加密的会话(_E)"
+msgid "<b>Auto Status</b>"
+msgstr "<b>自动调整状态</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "使消息窗口紧凑(_K)"
+msgid "Ask status message when I:"
+msgstr "询问状态消息, 当我: "
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "管理...(_N)"
+msgid "Sign _in"
+msgstr "登录(I)"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Never"
-msgstr "从不"
+msgid "Sign _out"
+msgstr "退出登录(_O)"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "提醒我联系人登录(_I)"
+msgid "<b>Status Messages</b>"
+msgstr "<b>状态消息</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "提醒我联系人登出(_O)"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>预设状态消息</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notify me about it"
-msgstr "提醒我"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "状态"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "新 Gmail 邮件通知"
+msgid "Use system _default"
+msgstr "使用系统默认(_D)"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr "仅当有未处理的事件时"
+msgid "Chat message:"
+msgstr "聊天消息: "
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "个人事件"
+msgid "<b>Font</b>"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "播放声音(_S)"
+msgid "Use _transports icons"
+msgstr "使用代理的图标设定(_T)"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
-msgstr "弹出提示"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"如果选中, Gajim 会以协议特定的方式显示状态图标。(例如, MSN 联系人会以同\n"
+"MSN 相同的图标显示在线, 离开, 忙, 等等状态...)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "参数"
+msgid "Status _iconset:"
+msgstr "状态图标集(_I): "
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr "STUN 服务器的主机名。如果没有给出, Gajim 会尝试从服务器上发现一个。"
+msgid "Configure color and font of the interface"
+msgstr "配置界面颜色与字体"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "主题: (_H)"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "STUN 服务器: "
+msgid "<b>Themes</b>"
+msgstr "<b>主题</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr "在通知区域显示图标: "
+msgid "Contact's nickname:"
+msgstr "联系人昵称"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid "Show only in roster"
-msgstr "只显示在联系人列表中"
+msgid "Your nickname:"
+msgstr "您的昵称: "
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "登录(I)"
+msgid "_Status message:"
+msgstr "状态消息: (_S)"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "退出登录(_O)"
+msgid "_URL highlight:"
+msgstr "URL 高亮显示: "
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr "只使用单一窗口"
+msgid "_Reset to Default Colors"
+msgstr "恢复为默认颜色设置(_R)"
 
 #: ../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 将显示原本的消息"
-"内容。"
+msgid "Contact's message:"
+msgstr "联系人消息: "
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "将联系人按状态排序"
+msgid "Your message:"
+msgstr "您的消息: "
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "状态"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "多人聊天消息突出显示"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "状态图标集(_I): "
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>聊天窗口中文字颜色</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "风格"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "主题: (_H)"
+msgid "Audio input device"
+msgstr "音频输入设备"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
-"$S会被上个状态消息替换\n"
-"$T会被自动离开的超时时间替换"
+msgid "Audio output device"
+msgstr "音频输出设备"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "<b>Audio</b>"
+msgstr "<b>音频</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
+msgstr "视频输入设备"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
-msgstr ""
-"离开很久了的自动消息。如果为空, Gajim 不会改变当前的状态消息\n"
-"$S会被上个状态消息替换\n"
-"$T会被自动不可用的超时时间替换"
+msgid "Video output device"
+msgstr "视频输出设备"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "视频帧速率"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "视频尺寸"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "使用代理的图标设定(_T)"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr "使用默认的应用程序"
+msgid "<b>Video</b>"
+msgstr "<b>视频</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "使用系统默认(_D)"
+msgid "STUN server:"
+msgstr "STUN 服务器: "
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr "视频帧速率"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(例如: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr "视频输入设备"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
-msgstr "视频输出设备"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr "STUN 服务器的主机名。如果没有给出, Gajim 会尝试从服务器上发现一个。"
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr "视频尺寸"
+msgid "<b>Connection</b>"
+msgstr "<b>连接</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "当收到新的事件: "
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "音频/视频"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "您的消息: "
+msgid "_File manager:"
+msgstr "文件管理器: (_F)"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "您的昵称: "
+msgid "_Mail client:"
+msgstr "邮件客户端(_M): "
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "在此时间后设置状态为离开(_A): "
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "浏览器(_B): "
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "显示聊天状态信息(_D): "
+msgid "<b>Custom</b>"
+msgstr "<b>自定义</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "表情(_E): "
+msgid "<b>Applications</b>"
+msgstr "<b>应用程序</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "文件管理器: (_F)"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "忽略联系人列表以外的联系人触发的事件(_I)"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "拼写检查(_H)"
+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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "忽略联系人列表以外的联系人触发的事件(_I)"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "允许发送关于操作系统的信息(_O)"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "忽略收到的消息中的富文本内容(_I)"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "记录联系人状态变化(_L)"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "允许发送关于操作系统的信息(_O)"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "邮件客户端(_M): "
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "在此时间后设置状态为离开很久了(_N): "
+msgid "Log _encrypted chat session"
+msgstr "记录加密的会话(_E)"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "打开...(_O)"
+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 加密时, 必须对方同意\n"
+"记录, 否则 Gajim 不会记录。"
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "恢复为默认颜色设置(_R)"
+msgid "Allow my _idle time to be sent"
+msgstr "允许发送关于闲置时间的信息(_I)"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "发送聊天状态信息(_S): "
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "状态消息: (_S)"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "URL 高亮显示: "
+msgid "<b>Privacy</b>"
+msgstr "<b>隐私策略</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "窗口行为(_W)"
+msgid "_Log status changes of contacts"
+msgstr "记录联系人状态变化(_L)"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "在多人聊天窗口中(_G)"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "在联系人列表中(_R)"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "在启动是检测 Gajim 是否是默认的 Jabber 客户端程序"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "分钟"
+msgid "_Open..."
+msgstr "打开...(_O)"
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>高级配置编辑器</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "高级"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "隐私策略列表: "
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>添加/编辑规则</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "隐私策略列表"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>规则列表</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>隐私策略列表</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "为此会话激活"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "每次启动时激活"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>规则列表</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "全部"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>添加/编辑规则</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "全部(包含认证)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "允许"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "所有在群组中的"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Order:"
+msgid "all by subscription"
+msgstr "所有(除了认证)"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3804
-msgid "Privacy List"
-msgstr "隐私策略列表"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "全部"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "所有(除了认证)"
+msgid "to send me messages"
+msgstr "向我发送消息"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "所有在群组中的"
+msgid "to send me queries"
+msgstr "向我发送查询"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "both"
+msgid "to view my status"
+msgstr "查看我的状态"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "from"
+msgid "to send me status"
+msgstr "向我发送状态"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "none"
+msgid "All (including subscription)"
+msgstr "全部(包含认证)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "to"
+msgid "Order:"
+msgstr "Order:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "向我发送消息"
+msgid "none"
+msgstr "none"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "向我发送查询"
+msgid "both"
+msgstr "both"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "向我发送状态"
+msgid "from"
+msgstr "from"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "查看我的状态"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>地址</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>头像: </b>"
+msgid "to"
+msgstr "to"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>生日: </b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>城市: </b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "姓: "
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>公司: </b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>国家: </b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>中间名: </b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>部门: </b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail: </b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>前缀: </b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>附加地址: </b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>名: </b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "姓: "
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>后缀: </b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>全名</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>街道: </b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>名: </b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>城市: </b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>主页: </b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>州: </b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>附加地址: </b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>中间名: </b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>邮政编码: </b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>名字: </b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>国家: </b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>昵称: </b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>地址</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>电话号码: </b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>主页: </b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>职位: </b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>名字: </b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>邮政编码: </b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>昵称: </b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>电话号码: </b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>前缀: </b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "格式:  YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>角色: </b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>生日: </b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>州: </b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail: </b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>街道: </b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>头像: </b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "单击以设置您的头像"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>后缀: </b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "个人信息"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>公司: </b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "关于"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>职位: </b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "单击以设置您的头像"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>部门: </b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "格式:  YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>角色: </b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "个人信息"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "工作"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>您想要做什么?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "关于"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "仅从 Gajim 移除帐户(_O)"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>您想要做什么?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5421
-#: ../src/roster_window.py:5547 ../src/roster_window.py:5677
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "移除(_R)"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "联系人列表项交换"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 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 "消息正文 <当前未被使用, 因此会被自动隐藏>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "联系人列表项交换"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "添加联系人(_C)..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "特性(_T)"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "动作(_A)"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "文件传输(_T)"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "添加联系人(_C)..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "被频繁提问的问题 (在线)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "编辑(_E)"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "在线帮助"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "帐户(_A)"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "名片, 头像(V)"
+
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr "插件(_L)"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "名片, 头像(V)"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "视图(_V)"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "显示离线联系人"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "只显示活动的联系人(_A)"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "显示代理(_P)"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "显示离线联系人"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "显示联系人列表(_R)"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "帐户(_A)"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "文件传输(_T)"
 
-#. 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 "动作(_A)"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "在线帮助"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "发送单条消息...(_S)"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "被频繁提问的问题 (在线)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "视图(_V)"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "请等待, 正在搜索..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "特性(_T)"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "查找"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "请等待, 正在搜索..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "添加联系人(_C)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5689
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "信息(_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "查找(_S)"
 
@@ -2807,41 +2682,37 @@ msgstr "注册到"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "回复本条消息"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "到: "
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "发送(_D)"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "发送消息"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "发送消息并关闭窗口"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "回复(_R)"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "到: "
+msgid "Reply to this message"
+msgstr "回复本条消息"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "回复(_R)"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "发送并关闭(_S)"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "发送消息并关闭窗口"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "授权(_T)"
+msgid "Subscription Request"
+msgstr "认证请求"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "向联系人授权则他/她将知道您是否在线"
+msgid "_Deny"
+msgstr "拒绝(_D)"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2849,259 +2720,271 @@ msgid ""
 "connected"
 msgstr "拒绝向联系人授权则他/她将无法知道您是否在线"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "认证请求"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "授权(_T)"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "拒绝(_D)"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "向联系人授权则他/她将知道您是否在线"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "同步联系人"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "选择您想要与之同步的账户"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "选择您想要同步的联系人"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "同步: 选择联系人"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "静音"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "发送单条消息(_M)"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "显示所有未处理事件(_E)"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "选择您想要同步的联系人"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "状态(_T)"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "多人聊天(_G)"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>请求: </b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "发送单条消息(_M)"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>客户端: </b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "显示所有未处理事件(_E)"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>联系人时间: </b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "静音"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "联系人信息"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>资源: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>状态: </b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>认证: </b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>客户端: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>系统: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "注释"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>联系人时间: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>头像: </b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "设置头像: "
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "联系人"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>认证: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "联系人信息"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>请求: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "更多"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "用户头像: "
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "联系人"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>过滤器</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "注释"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber 通信</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML 输入</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "隐藏 IN stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "隐藏 IQ stanzas"
+msgid "Hide OUT stanzas"
+msgstr "隐藏 OUT stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "隐藏 Message stanzas"
+msgid "Hide Presence stanzas"
+msgstr "隐藏 Presence stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "隐藏 OUT stanzas"
+msgid "Hide IQ stanzas"
+msgstr "隐藏 IQ stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "隐藏 Presence stanzas"
+msgid "Hide Message stanzas"
+msgstr "隐藏 Message stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "信息/查询"
+msgid "<b>Filter</b>"
+msgstr "<b>过滤器</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "信息/查询"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presence"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Message"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presence"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML 输入</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "修改帐户(_M)..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "本地 JID: "
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "个人"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "资源: "
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "状态: "
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "一个 GTK+ 的 Jabber 客户端"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "个人"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim 即时消息软件"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber 即时消息客户端"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "一个 GTK+ 的 Jabber 客户端"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "取消确认"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "您正在执行一个命令。确定要取消吗?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 msgid "Invalid Form"
 msgstr "不合法的格式"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 msgid "The form is not filled correctly."
 msgstr "表格没有被正确得填写。"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "服务发送了畸形的数据"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "服务改变了会话标识符"
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "服务返回了一个错误。"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "激活的"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "未激活的"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:976
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Color"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "类型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(无)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "隐藏"
 
@@ -3111,238 +2994,181 @@ msgid "You have received new entries (and %d not displayed):"
 msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "您收到了新的事件 (还有 %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)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "英语"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "白俄罗斯语"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "保加利亚语"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "布列塔尼语"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "捷克语"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "德语"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "希腊语"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "英语（英国）"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "世界语"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "巴斯克语"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "法语"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "克罗埃西亚语"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "意大利语"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "挪威语 (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "荷兰语"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "挪威语"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "波兰语"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "巴西葡萄牙语"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "俄语"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "塞尔维亚语"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "斯洛伐克语"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "瑞典语"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "中文"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:510
-msgid "Spelling language"
-msgstr "拼写语言"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "错误。"
 
 #. we are not connected
-#: ../src/chat_control.py:542 ../src/chat_control.py:751
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "一个连接不可用"
 
-#: ../src/chat_control.py:543 ../src/chat_control.py:752
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:958
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/chat_control.py:959
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "划去"
 
-#: ../src/chat_control.py:982
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "字体"
 
-#: ../src/chat_control.py:991
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "清楚格式"
 
-#: ../src/chat_control.py:1069
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "确定要发送文件?"
 
-#: ../src/chat_control.py:1070
+#: ../src/chat_control.py:1158
 #, 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:1534 ../src/chat_control.py:2024
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG 加密已启用"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "这个联系人不支持文件传输"
+
 #. Add to roster
-#: ../src/chat_control.py:1563 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1072 ../src/dialogs.py:2096
-#: ../src/dialogs.py:2125 ../src/gui_interface.py:530
-#: ../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:3366
-#: ../src/roster_window.py:3393
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "不在联系人列表中"
 
-#: ../src/chat_control.py:1593
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "切换语音会话"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "切换视频会话"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "特性在 Windows 下不可用。"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "发送文件(_F)"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "这个联系人不支持文件传输"
 
-#: ../src/chat_control.py:1596
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "您需要知道这个联系人的真实 JID 才能向他/她发送文件。"
 
-#: ../src/chat_control.py:1691
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 状态: %(state)s, 原因: %(reason)s"
 
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:2098
 #, 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:2004 ../src/dialogs.py:5280
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "没有指定 GPG 密钥"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr "尚未为这个联系人指定 GPG 密钥。因此您不能用 GPG 加密信息。"
 
-#: ../src/chat_control.py:2014
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG 加密已禁用"
 
-#: ../src/chat_control.py:2040
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "会话将被记录"
 
-#: ../src/chat_control.py:2042
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "会话将不会被记录"
 
 #. encryption %s active
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "是"
 
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "不是"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "会"
 
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "不会"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2065
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "且已被认证"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2294
 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:2076
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3351,69 +3177,68 @@ msgstr ""
 "%(type)s 加密 %(status)s 活动 %(authenticated)s。\n"
 "您的聊天会话 %(logged)s 将被记录。"
 
-#: ../src/chat_control.py:2219
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "会话协商已取消"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "本次会话将在服务器上被存档"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "本次会话将不会在服务器上被存档"
 
-#: ../src/chat_control.py:2240
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "本次会话已被加密"
 
-#: ../src/chat_control.py:2243
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "且会被记录"
 
-#: ../src/chat_control.py:2245
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "且不会被记录"
 
-#: ../src/chat_control.py:2250
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "远程联系人的身份未确认。点击盾型按钮查看详情。"
 
-#: ../src/chat_control.py:2252
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E 加密被禁用"
 
-#: ../src/chat_control.py:2296 ../src/chat_control.py:2309
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "下面的消息没有被加密"
 
-#: ../src/chat_control.py:2302
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "下面的消息是加密的"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2580
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "您刚刚收到一条来自 \"%s\" 的消息"
 
-#: ../src/chat_control.py:2581
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用了历史, 此消息会丢失。"
 
-#: ../src/chat_control.py:2727 ../src/common/connection_handlers_events.py:807
-#: ../src/common/connection_handlers.py:1506
-#: ../src/common/connection_handlers.py:1625
-#: ../src/common/connection_handlers.py:1798 ../src/common/connection.py:454
-#: ../src/common/logger.py:1126 ../src/gajim.py:192 ../src/session.py:138
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "数据库错误"
 
-#: ../src/chat_control.py:2728
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3421,224 +3246,578 @@ msgid ""
 msgstr ""
 "数据库文件 (%s) 不能被读取。请尝试修复它或者移除它（所有历史记录会丢失）。"
 
-#: ../src/chat_control.py:2976
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"无法解密来自 %s 的消息\n"
+"它可能被篡改了。"
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s 的状态是 %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "文件传输"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "大小:  %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "帐户(_A)"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "文件传输已完成"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "多人聊天邀请"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "远程联系人停止了传输"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "打开文件错误"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "文件传输已停止"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "文件传输已取消"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "无法与对方建立连接。"
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "向联系人发送文件"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr " %s 未找到"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "离开"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+msgid "Available"
+msgstr "在线"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "隐藏该窗口"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "切换Open_PGP加密"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "向联系人发送文件"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s 不是一个合法的日志级别"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "一个连接不可用"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "连接不可用"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "更改您的昵称(Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "无效的昵称"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr "与用户打开聊天窗口(_O)"
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "要使用的昵称"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "关闭多人聊天标签/窗口前询问。"
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "发送 %s 给 %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "您被邀请到一个聊天室"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "无效的服务器"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "归属变更"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s 不是一个聊天室的名称。"
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "缺失的\"联系人 JID\"参数"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 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:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, 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:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一个目录但它应该是一个文件"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "改变状态信息"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "改变状态"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "设置状态类型与描述"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "在线"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "离开很久了"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "请无打扰"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "离线 - 未连接"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "状态描述: "
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "状态发生了变化。"
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "离开聊天室"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "聊天室 %(room_jid)s 的 %(nickname)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "您还没有加入聊天室。"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:817
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5306
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "多人聊天"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "您退出了下列聊天室: "
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "转发未读消息"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "所有未读消息都已被转发。"
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr " 转发未读消息然后断开连接"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "在用于忙是播放声音"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知进程显示通知"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "在联系人列表中只显示在线和和我聊天吧的联系人。"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "时间, 以分钟为单位。在此时间后将状态更改为离开。"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (离开, 因为闲置超过了$T分钟)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S 会被当前的状态消息替换, $T 会被自动离开的时间替换。"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "时间, 以分钟为单位。在此时间后将状态更改为离开很久了。"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (离开很久了, 因为闲置超过了$T分钟)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S 会被当前的状态消息替换, $T 会被自动不可用的时间替换。"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr "何时在通知区域显示图标。可以是'从不', '当有未处理的事件时', '总是'。"
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "收到消息的昵称颜色。"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "发出消息的昵称颜色。"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "收到消息的文本颜色。"
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "发出消息的文本颜色。"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "状态消息文本颜色"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "在通知区域中显示事件(_S)"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "在通知区域中显示事件(_S)"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "在弹出提示中预览消息?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "文件传输请求"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "文件传输已取消"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "当文件传输完成时弹出提示"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "多人聊天邀请"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "收到消息的昵称的字体。"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "发出消息的昵称字体。"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "收到消息的文本字体。"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "发出消息的文本字体。"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "状态消息文本字体。"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 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:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3118
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "默认"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "拼写检查的语言"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3648,7 +3827,7 @@ msgstr ""
 "'有时' - 如 iChat 风格每隔几分钟显示时间。\n"
 "'从不' - 从不显示时间。"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 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. "
@@ -3657,16 +3836,16 @@ msgstr ""
 "使用模糊时钟打印时间。模糊度的值从 1 到 4, 或者 0 禁用模糊时钟。1 是最精确的"
 "时钟, 4 是最不精确的。只在'有时'显示时间时使用。"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "将成对出现的 * / _ 视为可能的格式控制字符。"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真, 则不移除 */_。这样 *abc* 将被加粗但 * * 不会被移除。"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3676,19 +3855,25 @@ msgstr ""
 "考http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果\n"
 "您想使用此功能, 请安装 docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "当在多人聊天中使用昵称补全(Tab)时加到昵称后的字符。"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 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
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3698,59 +3883,71 @@ msgstr ""
 "\"[小时:分钟]\"。请参考 Python doc 关于 strftime 的文档:\n"
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "在对话中显示在昵称前的字符"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "在对话中显示在昵称后的字符"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 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
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "在联系人列表标题中加入 * 和 [n]?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr "聊天标签/窗口被重新打开时显示之前进行的对话的最后多少行。"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "上次谈话的最后几行保留多少分钟。"
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "当加入聊天室时向服务器请求聊天记录的行数。"
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "当加入聊天室时请求多少分钟以内的聊天记录。"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 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
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+Enter 发送消息, Enter 开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "为 Ctrl+KeyUP 存储多少行。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3759,11 +3956,11 @@ msgstr ""
 "自定义地址, 在其中应包含 %s, %s 是单词/短语; 或'WIKTIONARY'以使用 "
 "wiktionary。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中, Gajim 可以被 gajim-remote 远程控制。"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 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 "
@@ -3774,48 +3971,51 @@ msgstr ""
 "态(如果它们没有将 listen_to_network_manager 设置为假而且它们被设置为与\n"
 "全局状态同步)。"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr "在聊天窗口中显示聊天状态通知。可以是全部, 近正在编辑, 禁用中的一个。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr "当不是每条消息都显示时间('有时'显示时间)时, 每多少分钟显示时间。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭多人聊天标签/窗口前询问。"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "关闭这个空格分隔的列表中的聊天室的标签/窗口前总是询问。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "关闭这个空格分隔的列表中的聊天室的标签/窗口前从不询问。"
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "如果有可能丢失数据的控件(不会被最小化的聊天, 私人聊天, 多人聊天), 在关\n"
 "闭有标签的窗口前询问。"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3823,27 +4023,33 @@ msgstr ""
 "逗号分割的列表。在有地址翻译/端口转发的情况下, 除了本地接口, 还将向其中\n"
 "的主机发送文件传输请求。"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 1 KiB = 1024 bytes(字节), 1 KB = 1000 bytes。"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "在通知区域中提示事件"
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "只有一个对话时显示标签?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天窗口中显示标签组的边框。"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭按钮?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 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 "
@@ -3854,27 +4060,29 @@ msgstr ""
 "法的组有 1, 2, 5, 14, 15, 16, 17 和 18。更高的数字更安全, 但在您开始会\n"
 "话时需要更长的时间计算"
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "在弹出提示中预览消息?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分号隔开的在多人聊天中将高亮显示的单词列表。"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 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。这一设定仅当启用通知区域图标时会生效。"
+msgstr ""
+"如果为真, 单击窗口管理器的 X 按钮会退出 Gajim。这一设定仅当启用通知区域图标时"
+"会生效。"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "如果为真,  Gajim 会在每次启动时检测它是否是默认的 jabber 客户端。"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3882,7 +4090,7 @@ msgstr ""
 "如果为真,  Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题, 该图标可"
 "能是动态的。"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3890,11 +4098,11 @@ msgstr ""
 "如果为真,  Gajim 将在联系人列表窗口中每一个联系人名字的下方显示状态信息（如果"
 "不为空）。"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "定义了在联系人列表中头像的显示位置。可以是左或右"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 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."
@@ -3902,7 +4110,7 @@ msgstr ""
 "如过为真, Gajim 会向每一个缓存的头像太久或上次未能获得其头像的联系人请求头"
 "像。"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 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."
@@ -3910,9 +4118,10 @@ msgstr ""
 "如果为假, Gajim 将不会在联系人的状态或状态消息变化时在聊天窗口中显示一行提"
 "示。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -3924,28 +4133,32 @@ msgstr ""
 "有的状态消息。如果是\"登入与登出\", Gajim 将只提示聊天室中中登入与登出\n"
 "消息。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "当联系人刚刚登入时的背景色。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "当联系人刚刚登出时的背景色。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "如果为真, 恢复显示的消息将用较小的字体显示。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "不显示代理本身的头像。"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "不要将联系人列表窗口显示在系统的任务栏中。"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 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 "
@@ -3954,7 +4167,7 @@ msgstr ""
 "如果为真并且安装的 GTK+ 和 PyGTK 的版本至少为 2.8, 当有未处理事件时使窗\n"
 "口闪烁(大部分窗口管理器的默认响应)"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 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 "
@@ -3964,7 +4177,8 @@ msgstr ""
 "\"以停止在多人聊天中发送 SHA 信息。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3972,7 +4186,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "控制新消息被放置的窗口。\n"
@@ -3983,102 +4197,110 @@ msgstr ""
 "'peracct' - 每个账户的消息发送到一个单独的窗口。\n"
 "'pertype' - 每种类型的消息 (例如, 聊天 及 多人聊天) 发送到一个单独的窗口。"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如果为假, 您将不会在窗口中看到头像。"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如果为真, 按 Escape 键将关闭标签/窗口。"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "在聊天窗口中隐藏按钮。"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "在多人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "在双人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在多人聊天窗口中隐藏房主列表。"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 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
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "当合并连续昵称时缩进。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "平滑滚动聊天窗口中的消息"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "在多人聊天中用于昵称的颜色列表, 以\":\"分隔。"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "当所有标签中没有未读消息时按 Ctrl-Tab 转到下一个正在编辑的标签。"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 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
+#: ../src/common/config.py:287
 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
+#: ../src/common/config.py:288
 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
+#: ../src/common/config.py:289
 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
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr "如果为真, Gajim 会使用 Gnome Keyring (如果可用) 存储账户的密码。"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 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
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr "如果为真, Gajim 会在账户和群组所在行显示在线和总共联系人数目。"
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4086,48 +4308,34 @@ msgstr ""
 "可以是空字符串, 'chat'或'normal'。如果不为空, 将把所有收到的消息当作这个类"
 "型。"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 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 转换为图片, 在将它插入聊天窗"
-"口之前。"
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "时间, 如果在此时间内没有活动, 将改变状态窗口关闭。"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在对话中最多显示的行数。最旧的那些行会被清除。"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr "如果为真, 由 notification-daemon 创建的提示窗口会依附于通知区域图标。"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 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 方程的大小。更高则更大。"
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4135,351 +4343,557 @@ msgstr ""
 "合法的 URI Scheme。只有这个列表中的 Scheme 会被接受为\"真正的\" URI。(mailto "
 "和 xmpp 被分开处理)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 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 "请求所有离线联系人的离线状态消息, 当一个账户建立连接时。警告: 这会发送大量的请求!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
+msgstr ""
+"请求所有离线联系人的离线状态消息, 当一个账户建立连接时。警告: 这会发送大量的"
+"请求!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "如果为真, 多人聊天中会像 shell 一样自动补全"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr "何时显示自己。可以是\"总是\", \"当用其他资源连接时\"或\"从不\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr "可选地修正 jingle 视频输出的帧速率。比如: 10/1 或 25/2"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "可选地缩放 jingle 视频输出尺寸。比如: 320x240"
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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 在使用 jingle 时会尝试使用 STUN 服务器。服务器可以由\"stun_server\"选项给出, 或由 jabber 服务器给出。"
+msgstr ""
+"如果为真, Gajim 在使用 jingle 时会尝试使用 STUN 服务器。服务器可以由"
+"\"stun_server\"选项给出, 或由 jabber 服务器给出。"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr "在使用 jingle 时使用的 STUN 服务器"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 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
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr "如果选中, Gajim 不会询问状态消息, 而使用特定的默认消息。"
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 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 ""
-"自动连接时使用的状态。可以是\"在线\", \"聊天\", \"离开\", \"离开很久了"
-"\", \"请勿\n"
+"自动连接时使用的状态。可以是\"在线\", \"聊天\", \"离开\", \"离开很久了\", "
+"\"请勿\n"
 "打扰\", \"隐身\"。注意: 仅当 restore_last_status 被禁用时这个选项其作用"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "如果启用, 则恢复上次使用的状态。"
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "如果为真, 联系人的认证请求将被自动接受。"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "如果为假, 这个账户将被禁用且不会出现在联系人列表窗口中。"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr "如果禁用, 即使 GPG 被配置, 也不使用 GPG 密钥签名 presences。"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "为这个账户启用 ESession 加密。"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim 是否应该在可能时自动发起加密的会话?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 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
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr "在使用明文连接发送密码前显示一个警告对话框。"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用标准 SSL 库前显示一个警告对话框。"
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "在通过明文连接明文发送密码前显示一个警告对话框。"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "应忽略的 SSL 错误列表, 以空格分隔"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "在不活动后发送的空白"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "在不活动后发送的 XMPP ping"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr "在重新连接前等待 ping alive packet 的回应多少秒"
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "为 Jabberd2 变通"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
-msgstr "如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文件传输。"
+msgstr ""
+"如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
+"件传输。"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "对回执请求的回应"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "发送回执请求"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s 想发送给您一个文件。"
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr "在协商加密的会话时, Gajim 是否应该假设您想要您的消息被记录?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr "向您希望添加的联系人发送的消息"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr "上次从服务器同步历史记录"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "匿名认证"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "匿名认证(_Y)"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 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:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "想要进行拼写检查的语言"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all 或 空格分割的一些状态"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', 或'both'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "当加入聊天室时向服务器请求聊天记录的行数。"
 
-#: ../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:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "当加入聊天室时请求多少分钟以内的聊天记录。"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
-msgstr "表述在退出时是否激活插件(在 Gajim 退出时这会被保存)。这个选项不应该用于激活或禁用插件。使用图形界面代替。"
+msgstr ""
+"表述在退出时是否激活插件(在 Gajim 退出时这会被保存)。这个选项不应该用于激活或"
+"禁用插件。使用图形界面代替。"
 
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "几分钟就回来。"
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃东西"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "我在吃东西, 请留言"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "我正在看电影。"
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "打电话"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "我正在打电话"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "我已经很久不在了。"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "请勿打扰。"
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "再见!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 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\" 或您的昵称时播放的声音。"
+msgstr ""
+"当收到的多人聊天消息包含 \"muc_highlight_words\" 或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天消息播放的声音。"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers_events.py:322
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "To"
+
+#: ../src/common/connection_handlers_events.py:370
 #, 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/ 的联系人列表管理工具移除它"
+msgstr ""
+"JID %s 不符合 RFC 标准。它没有被加入联系人列表。请使用诸如 http://jru."
+"jabberstudio.org/ 的联系人列表管理工具移除它"
 
-#: ../src/common/connection_handlers_events.py:746
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "来自 %s 的解除认证请求"
 
-#: ../src/common/connection_handlers_events.py:804
-#: ../src/common/connection_handlers.py:469
-#: ../src/common/connection_handlers.py:1504
-#: ../src/common/connection_handlers.py:1623
-#: ../src/common/connection_handlers.py:1796 ../src/common/connection.py:451
-#: ../src/common/logger.py:1124 ../src/gajim.py:374
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "磁盘写入错误"
 
-#: ../src/common/connection_handlers_events.py:808
-#: ../src/common/connection_handlers.py:1507
-#: ../src/common/connection_handlers.py:1626
-#: ../src/common/connection_handlers.py:1799 ../src/common/connection.py:455
-#: ../src/common/logger.py:1127 ../src/gajim.py:193 ../src/session.py:139
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, 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)或移除它(所有历史记录将丢失)。"
+msgstr ""
+"数据库文件 (%s) 不能被读取。请尝试修复它(参考 http://trac.gajim.org/wiki/"
+"DatabaseBackup)或移除它(所有历史记录将丢失)。"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:826
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "聊天室已经被销毁了"
 
-#: ../src/common/connection_handlers_events.py:834
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "作为替代, 您可以加入这个聊天室: %s"
 
-#: ../src/common/connection_handlers_events.py:903
-#: ../src/common/connection.py:255 ../src/config.py:2093 ../src/config.py:2102
-#: ../src/config.py:2170 ../src/config.py:3576 ../src/dataforms_widget.py:603
-#: ../src/dialogs.py:2949
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/common/connection_handlers_events.py:904
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "收到了一个从一个无效的 JID 发送的消息, 它已经被忽略了。"
 
-#: ../src/common/connection_handlers.py:94
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "发送 %(message)s 时出现错误( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "未知的 SSL 错误: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "新单条消息"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr " %(nickname)s 发来的新消息"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "新个人消息"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "来自聊天室 %s 的私人消息"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s:  %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "来自 %(nickname)s 的消息"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "新消息"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "来自 %(nickname)s 的新消息"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s 改变了状态"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s 的状态是 %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "联系人状态改变"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s 上线了"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "联系人登录"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s 离开了"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "联系人退出登录"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "无法加载闲置模块"
@@ -4489,187 +4903,187 @@ msgstr "无法加载闲置模块"
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "注册成功"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "注册成功, agent %s"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "注册失败"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "注册失败, agent %(agent)s, 错误 %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:712 ../src/common/connection.py:1479
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "不支持隐身"
 
-#: ../src/common/connection_handlers.py:713 ../src/common/connection.py:1480
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "账户 %s 不支持隐身"
 
-#: ../src/common/connection_handlers.py:1833
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "我想将您添加到我的联系人列表。"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "无法获得发行者的证书"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "无法获得证书吊销列表"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "无法解密证书签名"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "无法解密证书吊销列表的签名"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "无法解码发行者的公钥"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "证书签名失败"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "吊销证书列表签名失败"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "证书还未生效"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "证书已过期"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "证书吊销列表还未生效"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "证书吊销列表已过期"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "格式错误, 在证书的'不早于'字段"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "格式错误, 在证书的'不迟于'字段"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式错误, 在证书吊销列表的'最后更新'字段"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式错误, 在证书吊销列表的'下次更新'字段"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "内存耗尽"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "自签名的证书"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "自签名的证书, 在证书链中"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "无法获得本地发行者证书"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "无法验证第一个证书"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "证书链太长"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "证书已被吊销"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "无效的 CA 证书"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "超过了路径长度限制"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "不支持的证书用途"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "不被信任的证书"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "证书被拒绝"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Subject 与 发行者 不匹配"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 与 subject key identifier 不匹配"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 与 发行者序列号 不匹配"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "密钥用途中不包含证书签名"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "应用程序验证失败"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2950
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "远程 presence 未签名, 也未指定密钥。"
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, 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:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本条消息已 *加密* (见: XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4678,172 +5092,188 @@ msgstr ""
 "主题: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户\"%s\"的连接丢失"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务器 %(name)s 对注册请求的响应有误: %(error)s"
 
-#: ../src/common/connection.py:857
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "服务器 %s 提供了一个不同的注册表单"
 
-#: ../src/common/connection.py:870
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "未知的 SSL 错误: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "答案错误"
 
-#: ../src/common/connection.py:886
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %(name)s 对注册请求的响应有误: %(error)s"
 
-#: ../src/common/connection.py:1168 ../src/common/connection.py:1297
-#: ../src/common/connection.py:1794
-#: ../src/common/zeroconf/connection_zeroconf.py:193
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "没有能够连接到\"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "没有能够连接到\"%s\""
 
-#: ../src/common/connection.py:1169 ../src/gui_interface.py:603
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "检查连接或稍后再试。"
 
-#: ../src/common/connection.py:1174
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "服务器回应: %s"
 
-#: ../src/common/connection.py:1187
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "连接代理服务器失败"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "没有能够连接到账户 %s"
 
-#: ../src/common/connection.py:1219 ../src/common/connection.py:1278
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户 %s 的连接丢失。重新尝试连接。"
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s 证书的认证可能是无效的"
 
-#: ../src/common/connection.py:1247
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
-msgstr "\nSSL 错误: <b>%s</b>"
+msgstr ""
+"\n"
+"SSL 错误: <b>%s</b>"
 
-#: ../src/common/connection.py:1249
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
-msgstr "\n未知 SSL 错误: %d"
+msgstr ""
+"\n"
+"未知 SSL 错误: %d"
+
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "%s 证书的认证可能是无效的"
 
-#: ../src/common/connection.py:1298
-msgid "Check your connection or try again later"
-msgstr "检查连接或稍后重试"
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "没有能够连接到\"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\"登录验证失败"
 
-#: ../src/common/connection.py:1333
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: ../src/common/connection.py:1402
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "移除隐私策略列表时出错"
 
-#: ../src/common/connection.py:1403
+#: ../src/common/connection.py:1575
 #, 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 还没有被移除。它可能在您的某个连接的资源中是活动的。禁用它然后重试。"
+msgstr ""
+"隐私策略列表 %s 还没有被移除。它可能在您的某个连接的资源中是活动的。禁用它然"
+"后重试。"
 
-#: ../src/common/connection.py:1660
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "已发送联系人: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1663
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "已发送联系人: "
 
-#: ../src/common/connection.py:1809 ../src/common/connection.py:1832
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态, 未获取"
 
-#: ../src/common/connection.py:2264
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "移除注册失败"
 
-#: ../src/common/connection.py:2265
+#: ../src/common/connection.py:2827
 #, 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:530
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 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:1517 ../src/roster_window.py:856
-#: ../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
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "服务代理"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "不在联系人列表中"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 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:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus 在这台计算机上没有正常运行"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus 在这台计算机上没有正常运行: 未发现系统总线"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus 在这台计算机上没有正常运行: 未发现会话总线"
 
@@ -4855,7 +5285,7 @@ msgstr "不能读取数据库。"
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr "服务不可用: Gajim 不在运行, 或者 remote_control 为假"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "在这台计算机上没有 D-Bus 或者 Python 模块缺失"
 
@@ -5040,263 +5470,290 @@ msgstr "一周末"
 msgid "Weekend!"
 msgstr "周末"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr "用户名必须在 1 到 1023 个字符之间"
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "在用户名中有无效的字符。"
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr "服务器名必须在 1 到 1023 个字符之间"
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "主机名中有无效的字符。"
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "服务器的地址是必须的。"
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr "资源必须在 1 到 1023 个字符之间"
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "资源中含有无效字符。"
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "离开很久了(_N)"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "离开很久了"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 msgid "?user status:_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "隐身"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "未知"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "有错误"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "无"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "From"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "无"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "无"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "无"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "成员"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "注意着与您的对话"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "暂停输入消息"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 条消息未处理"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " 来自聊天室 %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " 来自用户 %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " 来自 %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 个未处理事件"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "您好, 我是$name"
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "读取文件超时"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "图片太大"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "证书吊销列表还未生效"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "读取文件超时"
+
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 设置错误"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5315,11 +5772,11 @@ msgstr ""
 "错误: \n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "GStreamer 错误"
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5328,99 +5785,114 @@ msgstr ""
 "错误: %s\n"
 "调试信息: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "音频输入"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "音频输出"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "视频输入"
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "视频输出"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "在执行命令\"%(command)s\"时发生错误: %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s 不是一个合法的日志级别"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr "默认设备"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "音频测试"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "自动侦测"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "文件:  %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "伪装音频输出"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "视频测试"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "绿色"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "视频输出"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X 窗口系统 (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X 窗口系统 (没有Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "错误: 无法读取文件 %s"
+msgid "Error: cannot open %s for reading"
+msgstr "错误: 无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "迁移记录数据库到索引"
 
@@ -6057,19 +6529,116 @@ msgstr "学习"
 msgid "Writing"
 msgstr "写作"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "默认"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "海洋"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "藏起来"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "账号"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "账户"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "描述"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "错误"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "一"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "聊天室"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+#, fuzzy
+msgid "street"
+msgstr "stream"
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "未知艺术家"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "未知标题"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "未知来源"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6078,30 +6647,18 @@ msgstr ""
 "<b>\"%(title)s\"</b> 作者 <i>%(artist)s</i>\n"
 "出自 <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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 实例。文件传输将被取消。"
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr "[这是加密会话的一部分。如果您看到了这条消息, 一定是有什么地方出错了。]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi 错误"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:183
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6110,44 +6667,43 @@ msgstr ""
 "%s\n"
 "Link-local 消息可能无法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "无法启动本地服务"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "无法绑定端口 %d。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:208
-#: ../src/common/zeroconf/connection_zeroconf.py:288
-#: ../src/common/zeroconf/connection_zeroconf.py:299
-#: ../src/common/zeroconf/connection_zeroconf.py:313
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "请检查 avahi-daemon 是否正在运行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:287
-#: ../src/common/zeroconf/connection_zeroconf.py:298
-#: ../src/common/zeroconf/connection_zeroconf.py:312
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "无法改变账户\"%s\"的状态"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:330
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "您的消息未能被发送。"
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:340
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "联系人离线。您的消息未能被发送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "无法建立到主机的连接: 发送数据超时。"
@@ -6158,233 +6714,235 @@ msgstr "无法建立到主机的连接: 发送数据超时。"
 msgid "Error while adding service. %s"
 msgstr "添加服务错误。 %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "默认消息"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:733 ../src/dialogs.py:1411
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的词典不可用"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
-msgstr "您需安装 %s 词典以使用拼写检查, 或者设置拼写检查选项以选择另外一种语言。(_L)"
+msgstr ""
+"您需安装 %s 词典以使用拼写检查, 或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "状态消息文本"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2401 ../src/dialogs.py:2467
-#: ../src/dialogs.py:3233 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "现在重新登录?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效, 您必须重新登录。"
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在这台计算机上不可用"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "移除账户前请阅读所有未处理事件。"
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和多人聊天窗口将会关闭。您想继续吗?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称, 需断开连接。"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称, 需先处理所有未处理事件"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个账户使用。请选择其他名称"
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "重命名账户"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "为账户 %s 输入新的名称"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 \"用户@服务器名\"。"
 
-#: ../src/config.py:2320 ../src/config.py:3622
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:2321 ../src/config.py:3623
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "没有可用的 OpenPGP 私钥"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 密钥"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "没有这样的账户可用"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:2393 ../src/dialogs.py:2154 ../src/dialogs.py:2389
-#: ../src/dialogs.py:2575 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "要禁用账户, 您必需断开连接。"
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6392,11 +6950,11 @@ msgstr ""
 "<b>想做封禁谁?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6404,27 +6962,31 @@ msgstr ""
 "<b>想要将谁加为成员?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
-msgstr "<b>您想要让谁成为房主?</b>\n\n"
+msgstr ""
+"<b>您想要让谁成为房主?</b>\n"
+"\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
-msgstr "<b>您想要让谁成为管理员?</b>\n\n"
+msgstr ""
+"<b>您想要让谁成为管理员?</b>\n"
+"\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6440,138 +7002,137 @@ msgstr ""
 "4. domain (域名本身匹配, 任何 user@domain, \n"
 "domain/resource, 或者包含一个子域名的地址也匹配)。"
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "账户被禁用"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr "要从服务器移除注册, 账户必须被启用。"
 
-#: ../src/config.py:2972 ../src/gui_interface.py:293
-#: ../src/gui_interface.py:985
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:965
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:985
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 \"%s\" 已连接到服务器"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除, 将会丢失连接"
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "连接服务器 %s 失败"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "您想做什么?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "仅从 Gajim 移除帐户"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何东西。我过一会儿会再试一下"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "全部"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "只是进入和离开"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "无"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "新聊天室"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与聊天室字段或移除此书签。"
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1952
-msgid "Invalid nickname"
-msgstr "无效的昵称"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "不允许的字符"
 
-#: ../src/config.py:3333 ../src/config.py:3598
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "无效的服务器"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "无效聊天室"
 
-#: ../src/config.py:3514
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "账户已成功添加"
 
-#: ../src/config.py:3515 ../src/config.py:3521
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "您可以点击\"高级\"按钮以设置高级账户选项, 或稍后选择主窗口\"编辑\"菜单下\"账户\"菜单项。"
+msgstr ""
+"您可以点击\"高级\"按钮以设置高级账户选项, 或稍后选择主窗口\"编辑\"菜单下\"账"
+"户\"菜单项。"
 
-#: ../src/config.py:3520
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3559
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3561
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3599
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "请指定一个服务器。您将注册到这个服务器。"
 
-#: ../src/config.py:3655 ../src/gui_interface.py:1624
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "证书已经在文件中"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1625
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "证书已经在文件 %s 中, 所以它没有被再次添加。"
 
-#: ../src/config.py:3733
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6586,7 +7147,7 @@ msgstr ""
 "SSL 错误: %(error)s\n"
 "您仍然想要连接到这个服务器吗?"
 
-#: ../src/config.py:3739 ../src/gui_interface.py:1652
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6597,306 +7158,326 @@ msgstr ""
 "这个证书的 SHA1 指纹信息: \n"
 "%s"
 
-#: ../src/config.py:3771 ../src/config.py:3805
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3870
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "您已经有账户使用了这个名字了。"
 
-#: ../src/config.py:3990
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP节点没有被移除"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP 节点 %(node)s 没有被移除: %(message)s"
 
-#: ../src/config.py:4035
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "配置"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:4043
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:4078
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "最初收到的消息"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "已聚焦收到的下一条消息"
 
-#: ../src/config.py:4081
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "解除聚焦收到的下一条消息"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "多人聊天消息突出显示"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天消息"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 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 "这个图标是说这条消息还没有被远端收到。如果这个图标已经存在很久了, 很可能这条消息丢失了。"
+msgstr ""
+"这个图标是说这条消息还没有被远端收到。如果这个图标已经存在很久了, 很可能这条"
+"消息丢失了。"
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 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:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "引用(_Q)"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\"的动作(_A)"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "阅读 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "从字典中搜索(_D)"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, 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:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网络搜索地址缺少 \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "在互联网上搜索(_S)"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, python-format
+#: ../src/conversation_textview.py:1386
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "%i天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "无法载入图像"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "不支持的媒体类型: %s"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "这一项是必须的"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID 已经在列表中了"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "您输入的 Jabber ID 已经在列表中了。请选择另外一个。"
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID:  <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:473
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "设置 Mood"
 
-#: ../src/dialogs.py:593
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:607
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:796
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "覆盖状态消息?"
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "这个名称已被使用。您想要覆盖这个状态消息吗?"
 
-#: ../src/dialogs.py:805
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "保存为预设状态消息"
 
-#: ../src/dialogs.py:806
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "请为这个状态消息输入一个名称"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM 地址: "
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG 号码: "
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ 号码: "
 
-#: ../src/dialogs.py:837
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN 地址: "
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 地址: "
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请填入您想添加到账户 %s 的联系人的信息"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想添加的联系人的信息"
 
-#: ../src/dialogs.py:1047 ../src/dialogs.py:1053 ../src/dialogs.py:1058
-#: ../src/dialogs.py:3466
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "无效的用户ID"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "用户ID不应包含资源。"
 
-#: ../src/dialogs.py:1059
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "您不能将您自己添加到您的联系人列表中。"
 
-#: ../src/dialogs.py:1073
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "联系人已经在联系人列表中"
 
-#: ../src/dialogs.py:1074
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已经在您的联系人列表中了"
 
-#: ../src/dialogs.py:1120
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "用户 ID: "
 
-#: ../src/dialogs.py:1191
-msgid "A GTK+ jabber client"
-msgstr "一个 GTK+ Jabber 客户端"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本: "
 
-#: ../src/dialogs.py:1193
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本: "
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "当前的开发者: "
 
-#: ../src/dialogs.py:1205
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "既往开发者: "
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "感谢: "
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1217
+#: ../src/dialogs.py:1305
 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:1229
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
@@ -6904,7 +7485,7 @@ msgstr ""
 "jeanet <qianxiaojun604@gmail.com>\n"
 "Guanhao Yin <yinguanhao@gmail.com>"
 
-#: ../src/dialogs.py:1412
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6912,267 +7493,291 @@ msgid ""
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"您必须安装 %s 词典才能使用拼写检查, 或者在拼写检查语言选项中设置另一种语言。\n"
+"您必须安装 %s 词典才能使用拼写检查, 或者在拼写检查语言选项中设置另一种语"
+"言。\n"
 "高亮拼写错误的特性不会被启用。"
 
-#: ../src/dialogs.py:1953 ../src/dialogs.py:2340
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "不安全的连接"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"您将通过一个不安全的连接连接服务器。这意味着您的所有对话都会不经加密地被交"
+"换。您确定要这样做吗?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "是的, 我确实想要不安全地连接"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "不要再问我了(_D)"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "昵称包含不合法字符。"
 
-#: ../src/dialogs.py:2071
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(jid)s 对账户 %(account)s 的认证请求"
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s 的认证请求"
 
-#: ../src/dialogs.py:2149 ../src/gui_interface.py:2402
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在聊天室 %s"
 
-#: ../src/dialogs.py:2155
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必须连接才能加入聊天室。"
 
-#: ../src/dialogs.py:2196
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入聊天室"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "错误的 uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "这不是一个聊天室"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "无效的账户"
 
-#: ../src/dialogs.py:2328
+#: ../src/dialogs.py:2599
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "您需要选择一个账户, 用它来加入聊天室。"
 
-#: ../src/dialogs.py:2339
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "不合法的昵称"
 
-#: ../src/dialogs.py:2344 ../src/dialogs.py:2350
-#: ../src/groupchat_control.py:1877
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的聊天室 Jabber ID"
 
-#: ../src/dialogs.py:2345
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "请输入聊天室的 Jabber ID, 以 room@server 的形式。"
 
-#: ../src/dialogs.py:2351 ../src/groupchat_control.py:1878
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "聊天室 Jabber ID 包含不合法字符。"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "这不是一个聊天室"
 
-#: ../src/dialogs.py:2359
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是一个聊天室的名称。"
 
-#: ../src/dialogs.py:2390
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未连接时, 您不能同步您的联系人。"
 
-#: ../src/dialogs.py:2404
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "这个账户已经连接到服务器"
 
-#: ../src/dialogs.py:2440
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "这个账户连接后您才可以与之同步"
 
-#: ../src/dialogs.py:2464
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "同步"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 开始聊天"
 
-#: ../src/dialogs.py:2527
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:2528
+#: ../src/dialogs.py:2802
 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:2554 ../src/dialogs.py:2935 ../src/dialogs.py:3147
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:2555 ../src/dialogs.py:2936 ../src/dialogs.py:3148
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认您已经连接到 \"%s\"。"
 
-#: ../src/dialogs.py:2564 ../src/dialogs.py:2567
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "无效的 JID"
 
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "您必须输入密码"
 
-#: ../src/dialogs.py:2599
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "在两个输入框中输入的密码必须一致。"
 
-#. default value
-#: ../src/dialogs.py:2637 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "联系人登录"
-
-#: ../src/dialogs.py:2639 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "联系人退出登录"
-
-#. chat message
-#: ../src/dialogs.py:2641 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "新消息"
-
-#. single message
-#: ../src/dialogs.py:2641 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "新单条消息"
-
-#. private message
-#: ../src/dialogs.py:2642 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "新个人消息"
-
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1095 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "新电子邮件"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1154 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1057
-#: ../src/gui_interface.py:1123 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:2648 ../src/gui_interface.py:1200
-#: ../src/gui_interface.py:1223 ../src/gui_interface.py:1240
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:1203 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:2651 ../src/gui_interface.py:908 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "多人聊天邀请"
-
-#: ../src/dialogs.py:2653 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "联系人状态改变"
-
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "单条消息, 使用账户 %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "单条消息, 在账户 %s"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2861
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2884
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2907
+#: ../src/dialogs.py:3185
 #, 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:2986
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "回复: %s"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道: \n"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr " XML 控制台"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "添加"
 
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3178
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "移除"
 
-#: ../src/dialogs.py:3206
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7180,184 +7785,178 @@ msgid ""
 msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些联系人。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3268
-msgid "Add"
-msgstr "添加"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3224 ../src/dialogs.py:3299
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3230
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3236
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "群组"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3344
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s 建议我将您添加到我的联系人列表。"
 
-#: ../src/dialogs.py:3358
-#, python-format
-msgid "Added  %s contacts"
-msgstr "添加了 %s 联系人"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "添加了 %s 联系人"
 
-#: ../src/dialogs.py:3395
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "移除了 %s 联系人"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "移除了 %s 联系人"
 
-#: ../src/dialogs.py:3435 ../src/dialogs.py:3612
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存档首选项"
 
-#: ../src/dialogs.py:3475
+#: ../src/dialogs.py:3779
 msgid "Invalid expire value"
 msgstr "无效的过期值"
 
-#: ../src/dialogs.py:3476
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr "过期值必须是一个有效的正整数。"
 
-#: ../src/dialogs.py:3523
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr "在表格中有一处错误"
 
-#: ../src/dialogs.py:3734
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr "有一处错误"
 
-#: ../src/dialogs.py:3798
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "隐私策略列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3802
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的隐私策略列表"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4186
 #, 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:3863
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序: %(order)s, 动作: %(action)s"
 
-#: ../src/dialogs.py:3907
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:4018
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的隐私策略列表"
 
-#: ../src/dialogs.py:4120
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "隐私策略列表"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "不合法的列表名"
 
-#: ../src/dialogs.py:4191
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个隐私策略列表。"
 
-#: ../src/dialogs.py:4223
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "您被邀请到一个聊天室"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact 邀请您加入一个聊天室"
 
-#: ../src/dialogs.py:4228
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact 邀请您参加聊天室 %(room_jid)s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "注释: %s"
 
-#: ../src/dialogs.py:4238
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "您是否接受邀请?"
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "选择客户端证书 #PCKS12"
 
-#: ../src/dialogs.py:4310 ../src/dialogs.py:4353 ../src/dialogs.py:4409
-#: ../src/dialogs.py:4497
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "所有文件"
 
-#: ../src/dialogs.py:4315
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "PKCS12 文件"
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:4358
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:4396
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "选择图像"
 
-#: ../src/dialogs.py:4414
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "图像"
 
-#: ../src/dialogs.py:4484
+#: ../src/dialogs.py:4847
 msgid "Choose Archive"
 msgstr "选择归档文件"
 
-#: ../src/dialogs.py:4502
+#: ../src/dialogs.py:4865
 msgid "Zip files"
 msgstr "Zip 文件"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为: "
 
-#: ../src/dialogs.py:4529
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊提示"
 
-#: ../src/dialogs.py:4604
-msgid "Condition"
-msgstr "条件"
-
-#: ../src/dialogs.py:4724
-msgid "when I am "
-msgstr "当我"
-
-#: ../src/dialogs.py:5200
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7368,38 +7967,40 @@ msgstr ""
 "\n"
 "会话的短认证字符串是 <b>%(sas)s</b>。"
 
-#: ../src/dialogs.py:5203
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "您已经确认了这个联系人的身份。"
 
-#: ../src/dialogs.py:5209 ../src/dialogs.py:5293
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "联系人身份已确认"
 
-#: ../src/dialogs.py:5215
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "重新验证"
 
-#: ../src/dialogs.py:5220
+#: ../src/dialogs.py:5133
 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>您期望的人可以看到您发送的消息或给您发送消息, 您需要验证他们的身份信息。请点击下面的按钮。"
+msgstr ""
+"为了确保<b>只有</b>您期望的人可以看到您发送的消息或给您发送消息, 您需要验证他"
+"们的身份信息。请点击下面的按钮。"
 
-#: ../src/dialogs.py:5223 ../src/dialogs.py:5274 ../src/dialogs.py:5287
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "联系人身份未确认"
 
-#: ../src/dialogs.py:5228
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "确认..."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "您确认了联系人的身份吗?"
 
-#: ../src/dialogs.py:5240
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7408,371 +8009,406 @@ msgid ""
 "\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:5241
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "您与远程联系人通话并验证了 SAS 吗?"
 
-#: ../src/dialogs.py:5275
+#: ../src/dialogs.py:5189
 #, 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:5281
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr "没有为这个联系人指定密钥。因此您无法加密消息。"
 
-#: ../src/dialogs.py:5288
+#: ../src/dialogs.py:5202
+#, fuzzy
 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 "尽管为这个联系人指定了密钥, 但您<b>不信任</b>他的密钥, 因此消息<b>无法</b>被加密。使用您的 GPG 客户端以信任他的密钥。"
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
+msgstr ""
+"尽管为这个联系人指定了密钥, 但您<b>不信任</b>他的密钥, 因此消息<b>无法</b>被"
+"加密。使用您的 GPG 客户端以信任他的密钥。"
 
-#: ../src/dialogs.py:5294
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr "联系人被指定了 GPG 密钥, 且您信任他的密钥, 所以消息会被加密。"
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "一个音频和视频"
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "一个音频"
 
-#: ../src/dialogs.py:5363
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "一个视频"
 
-#: ../src/dialogs.py:5367
+#: ../src/dialogs.py:5281
 #, 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 会话。您要响应吗?"
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "帐户 %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "客户端证书"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用账户 %s 来发掘服务"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 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:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用账户 %(account)s 浏览地址 %(address)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "执行命令(_E)..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已扫描 %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2927
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2928
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "聊天室\"%s\"已在您的书签中。"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2942
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2943
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过\"动作\"菜单管理您的书签。"
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "订阅"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "节点"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "订阅(_S)"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "SSL 证书验证"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 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."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "需要 python-pyopenssl。"
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "无需服务器自动侦测本地网络中其他客户端进行聊天"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "需要 python-avahi。"
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "命令行"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "一个在命令行下控制 Gajim 的脚本。"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 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:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "特性在 Windows 下不可用。"
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP 消息加密"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "用 gpg 密钥加密聊天消息。"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "需要 gpg 和 python-GnuPGInterface。"
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "自动侦测网络状态。"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "需要 gnome-network-manager 和 python-dbus。"
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "会话管理"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim 会话在退出时会被存储而后登录时恢复。"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "需要 python-gnome2。"
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "密码加密"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "密码可以被安全地存储, 而不只是以纯文本方式。"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "需要 gnome-keyring 和 python-gnome2-desktop, 或 kwalletcli。"
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "连接到有 SRV 记录的服务器的能力。"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "需要 dnsutils。"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "需要 nslookup 以使用 SRV 记录。"
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "拼写检查工具"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "对正在编辑的消息进行拼写检查。"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "需要 libgtkspell。"
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "需要 libgtkspell。"
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "通知"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "有新的时间时, 主动弹出提示。"
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "需要 python-notify 或 python-dbus 和 notification-daemon的组合。"
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "自动调整状态"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "测算空闲时间以自动调整状态的能力。"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "需要 libxss 库。"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "需要 python2.5。"
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "转换 $$ $$ 之间的 LaTeX 表达式。"
-
-#: ../src/features_window.py:95
-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 或 ImageMagick)。您需要在高级设置编辑器中"
-"将 'use_latex' 设置为真。"
-
-#: ../src/features_window.py:96
-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 或 ImageMagick) (全部在 MikTeX 中)。您需要"
-"在高级设置编辑器中将 'use_latex' 设置为真。"
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "End to End 消息加密"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "加密聊天消息。"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "需要 python-crypto。"
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST 生成器"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7780,170 +8416,199 @@ msgstr ""
 "从 RST 代码生成 XHTML 输出 (参考 http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)。"
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "需要 python-docutils。"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "开始进行语音视频通话的能力。"
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "需要 python-farsight。"
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "需要 python-gnome2。"
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "需要 python-dbus。"
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "可用"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "特性"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "文件"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "时间"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "进程"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名:  %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者:  %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "接收者:  %s"
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在:  %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "文件传输已完成"
-
-#: ../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
-msgid "Connection with peer cannot be established."
-msgstr "无法与对方建立连接。"
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者:  %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "错误消息: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "文件传输已停止"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "描述: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "文件:  %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "类型: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "描述:  %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s 想发送给您一个文件: "
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:879
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:880
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 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:884
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:891
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:892
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "另存为..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "文件:  %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "类型: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "描述:  %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s 想发送给您一个文件: "
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "发送名片..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "文件传输错误"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7951,77 +8616,117 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "文件: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "名称: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "发送者: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/gajim.py:175
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "message"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "表情(_E): "
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "只显示在联系人列表中"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "高级设置编辑器"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s 设置错误"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim 需要 X 服务器才能运行。退出..."
 
-#: ../src/gajim.py:177
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "导入 PyGTK 失败: %s"
 
-#: ../src/gajim.py:219
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim 需要 PyGTK 2.16 或更高版本"
 
-#: ../src/gajim.py:220
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim 需要 PyGTK 2.16 或更高版本才能运行。退出..."
 
-#: ../src/gajim.py:222
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim 需要 GTK 2.16 或更高版本"
 
-#: ../src/gajim.py:223
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim 需要 GTK 2.16 或更高版本才能运行。退出..."
 
-#: ../src/gajim.py:232
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim 需要 pywin32 才能运行"
 
-#: ../src/gajim.py:233
+#: ../src/gajim.py:270
 #, python-format
 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:349
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim 已经在运行"
 
-#: ../src/gajim.py:350
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8029,96 +8734,126 @@ msgstr ""
 "Gajim 另一个实例似乎正在运行\n"
 "不管怎样, 仍然运行?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏联系人列表窗口"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "为下一条未处理事件弹出窗口"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "打印联系人列表中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote-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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "账户"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "状态"
 
-#: ../src/gajim-remote-plugin.py:106
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "下列中的一项: offline, online, chat, away, xa, dnd, invisible"
+#: ../src/gajim-remote.py:110
+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-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "改变账户的状态。如果不指明, 将改变设置\"与全局同步\"选项的账户"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "改变一个或多个账户的优先级"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "优先级"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "您想要给予这个账户的优先级"
+
+#: ../src/gajim-remote.py:122
+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:128
 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.py:130
 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.py:132 ../src/gajim-remote.py:222
 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
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "消息内容。账户必须被指定或为\"\""
+
+#: ../src/gajim-remote.py:140
 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 "
@@ -8127,34 +8862,29 @@ 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.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 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.py:146 ../src/gajim-remote.py:160
 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.py:146 ../src/gajim-remote.py:160
 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
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定, 消息将被用此账户发送"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8163,174 +8893,216 @@ msgstr ""
 "发送新单条消息至联系人列表中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择"
 "\"帐户\"而不需要\" OpenPGP 密钥\", 只需将\" OpenPGP 密钥\"置为空。"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "消息主题"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 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.py:169
 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.py:176
 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.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "获得账户的详细信息"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "账户名称"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "如指定, 文件将被用此账户发送"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "将\"密钥\"的值设为\"值\""
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 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.py:219
 msgid "Removes contact from roster"
 msgstr "从联系人列表移除联系人"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "向联系人列表添加联系人"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "为此账户加入新联系人"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote-plugin.py:226
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
-msgstr "返回当前的状态信息 (如不指定账户则返回全局设置)"
+"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.py:250
 msgid "Returns number of unread messages"
 msgstr "返回未读消息数"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "打开 '开始聊天' 对话框"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "开始聊天, 使用这个账户"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 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.py:269
+msgid "Change the avatar"
+msgstr "改变头像"
+
+#: ../src/gajim-remote.py:271
+msgid "Picture to use"
+msgstr "要使用的图片"
+
+#: ../src/gajim-remote.py:272
+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:278
 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.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "要处理的 URI"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "您想要用其处理它的账户"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "消息内容"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "加入聊天室"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "聊天室"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "聊天室 JID"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "昵称"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "要使用的昵称"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "密码"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "进入聊天室的密码"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "您想要用其加入聊天室的账户"
+
+#: ../src/gajim-remote.py:297
 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
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "显示/隐藏 ipython 窗口"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"联系人 JID\"参数"
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8339,148 +9111,44 @@ msgstr ""
 "\"%s\" 不在您的联系人列表中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在运行。因此您无法使用 gajim-remote。"
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"用法:  %s %s %s \n"
-"\t %s"
+"用法: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "参数: "
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "用法: %s 命令 [参数] \n"
 "命令是下列之一: \n"
 
-#: ../src/gajim-remote-plugin.py:496
-#, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"参数太多。\n"
-"输入\"%s help %s\"以获取更多信息"
-
-#: ../src/gajim-remote-plugin.py:500
-#, 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-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "错误的 uri"
-
-#: ../src/gajim-remote.py:109
-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 "改变指定账户的优先级。如果不指明, 将改变所有设置了\"与全局状态同步\"选项的账户"
-
-#: ../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 "要处理的 URI"
-
-#: ../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
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8489,7 +9157,7 @@ msgstr ""
 "参数太多。\n"
 "输入 \"%(basename)s help %(command)s\" 获取更多信息"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8498,10 +9166,14 @@ msgstr ""
 "参数 \"%(arg)s\" 未指定。\n"
 "输入 \"%(basename)s help %(command)s\" 获取更多信息"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "没有给出 URI"
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "错误的 uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "主题"
@@ -8524,177 +9196,214 @@ msgid "You cannot delete your current theme"
 msgstr "无法删除当前主题"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s 现在成了 %(new_nick)s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, 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:472
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: ../src/groupchat_control.py:653
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "对话, 与"
 
-#: ../src/groupchat_control.py:655
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "继续对话"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s 将主题设置为 %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1305 ../src/gui_interface.py:860
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "所有房主可以看到您的全部 JID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "聊天室现在显示了不可用的成员"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "聊天室现在不显示不可用的成员"
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "一个无关隐私的聊天室设置发生了变化"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "聊天室消息记录已启用"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "聊天室消息记录已禁用"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "聊天室现在是非匿名的"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "聊天室现在是半匿名的"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "聊天室现在是完全匿名的"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s 已经被从这个聊天室移除(%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "聊天室记录被启用"
 
-#: ../src/groupchat_control.py:1311
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "一个新的聊天室被创建"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "服务器指定或修改了您的聊天室昵称"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1320
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: ../src/groupchat_control.py:1323
+#: ../src/groupchat_control.py:1606
 #, 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:1332
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1346 ../src/groupchat_control.py:1450
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:1362 ../src/gui_interface.py:734
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s 现在成了 %(new_nick)s"
-
-#: ../src/groupchat_control.py:1404 ../src/groupchat_control.py:1409
-#: ../src/groupchat_control.py:1415
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 已经被从这个聊天室移除(%(reason)s)"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "归属变更"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "聊天室配置变为\"仅成员\""
 
-#: ../src/groupchat_control.py:1417
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "系统关闭"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(nick)s 的归属被 %(actor)s 设置为 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1504
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s 的归属被设置为 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1814
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s 的角色被 %(actor)s 设置为 %(role)s"
 
-#: ../src/groupchat_control.py:1523
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s 的角色被设置为 %(role)s"
 
-#: ../src/groupchat_control.py:1553
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s 离开了"
 
-#: ../src/groupchat_control.py:1558
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: ../src/groupchat_control.py:1560 ../src/gui_interface.py:761
-#: ../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:1804
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "您确定要离开聊天室\"%s\"吗?"
 
-#: ../src/groupchat_control.py:1806
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口, 您将断开此聊天室的连接。"
 
-#: ../src/groupchat_control.py:1810 ../src/gui_interface.py:958
-#: ../src/gui_interface.py:1712 ../src/gui_interface.py:1749
-#: ../src/gui_interface.py:1784 ../src/message_window.py:224
-#: ../src/roster_window.py:2816 ../src/roster_window.py:3476
-#: ../src/roster_window.py:4206
-msgid "_Do not ask me again"
-msgstr "不要再问我了(_D)"
-
-#: ../src/groupchat_control.py:1844
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1845
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "请指定新话题: "
 
-#: ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1853
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称: "
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "聊天室 Jabber ID 包含不合法字符。"
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1884
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "正在销毁 %s"
 
-#: ../src/groupchat_control.py:1885
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8702,22 +9411,22 @@ msgstr ""
 "您正要彻底销毁这个聊天室。\n"
 "您可以在下面指定一个原因: "
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "您也可以输入一个可选的替代地点: "
 
 #. ask for reason
-#: ../src/groupchat_control.py:2076
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "将踢走 %s"
 
-#: ../src/groupchat_control.py:2077 ../src/groupchat_control.py:2404
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因: "
 
 #. ask for reason
-#: ../src/groupchat_control.py:2403
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "将封禁 %s"
@@ -8740,63 +9449,57 @@ msgstr "报告错误(_R)"
 msgid "Details"
 msgstr "细节"
 
-#. we talk about file
-#: ../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:377
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "读文件错误: "
 
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "分析文件错误: "
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:421
+#: ../src/gtkgui_helpers.py:393
 #, 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:795
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim 不是默认的 Jabber 客户端"
 
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "您想要使 Gajim 成为默认的 Jabber 客户端吗?"
 
-#: ../src/gtkgui_helpers.py:797
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "总是在启动时检测 Gajim 是否是默认的 Jabber 客户端"
 
-#: ../src/gtkgui_helpers.py:864
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:837
 #, 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:901
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:127 ../src/gui_interface.py:305
-#: ../src/gui_interface.py:314 ../src/gui_interface.py:319
-#: ../src/gui_interface.py:322 ../src/gui_interface.py:325
-#: ../src/gui_interface.py:330
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "无法加入聊天室"
 
-#: ../src/gui_interface.py:128
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8806,92 +9509,86 @@ msgstr ""
 "您在聊天室 %s 中希望使用的昵称已经被使用或被其他人注册了。\n"
 "在下面指定另一个昵称: "
 
-#: ../src/gui_interface.py:131
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "在发生冲突时总是使用这个昵称"
 
-#: ../src/gui_interface.py:148
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求?"
 
-#: ../src/gui_interface.py:150
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受这个对账户 %s 的请求?"
 
-#: ../src/gui_interface.py:153
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 认证"
 
-#: ../src/gui_interface.py:199 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "需要密码才能加入聊天室 %s。请输入一个密码。"
 
-#: ../src/gui_interface.py:306
-#, python-format
-msgid "Maximum number of users for %s has been reached"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "%s 已经达到了最大的用户数目"
 
-#: ../src/gui_interface.py:315
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "您被聊天室 %s 封禁。"
 
-#: ../src/gui_interface.py:320
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "聊天室 %s 不存在。"
 
-#: ../src/gui_interface.py:323
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "聊天室创建是受限的。"
 
-#: ../src/gui_interface.py:326
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "您在聊天室 %s 中注册的昵称必须被使用。"
 
-#: ../src/gui_interface.py:331
+#: ../src/gui_interface.py:325
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不再聊天室 %s 的成员列表中。"
 
-#: ../src/gui_interface.py:465 ../src/gui_interface.py:469
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, 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:480 ../src/gui_interface.py:495
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "发送 %(message)s 时出现错误( %(error)s )"
-
-#: ../src/gui_interface.py:519 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: ../src/gui_interface.py:544
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gui_interface.py:545
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人\"%s\"已授权您查看他/她的状态。"
 
-#: ../src/gui_interface.py:553
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人\"%s\"移除了对您的认证"
 
-#: ../src/gui_interface.py:554
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8899,99 +9596,99 @@ msgstr ""
 "您将一直看到他/她处于离线状态。\n"
 "要将他/她从您的联系人列表中移除吗?"
 
-#: ../src/gui_interface.py:575 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "已取消认证的"
 
-#: ../src/gui_interface.py:602
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与\"%s\"建立连接"
 
-#: ../src/gui_interface.py:796
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s 将主题设置为 %(subject)s"
-
-#: ../src/gui_interface.py:863
-msgid "Room now shows unavailable member"
-msgstr "聊天室现在显示了不可用的成员"
-
-#: ../src/gui_interface.py:865
-msgid "room now does not show unavailable members"
-msgstr "聊天室现在不显示不可用的成员"
-
-#: ../src/gui_interface.py:867
-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:871
-msgid "Room logging is now enabled"
-msgstr "聊天室消息记录已启用"
-
-#: ../src/gui_interface.py:873
-msgid "Room logging is now disabled"
-msgstr "聊天室消息记录已禁用"
-
-#: ../src/gui_interface.py:875
-msgid "Room is now non-anonymous"
-msgstr "聊天室现在是非匿名的"
-
-#: ../src/gui_interface.py:878
-msgid "Room is now semi-anonymous"
-msgstr "聊天室现在是半匿名的"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:881
-msgid "Room is now fully-anonymous"
-msgstr "聊天室现在是完全匿名的"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:922
+#: ../src/gui_interface.py:658
+#, fuzzy
 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 agent, 但并没有正在运行的 GPG agent 或者它返回了一个错误的密码。\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
+msgstr ""
+"您配置了 Gajim 使用 GPG agent, 但并没有正在运行的 GPG agent 或者它返回了一个"
+"错误的密码。\n"
 
-#: ../src/gui_interface.py:924 ../src/gui_interface.py:931
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "您已经连接, 但没有使用您的 OpenPGP 密钥。"
 
-#: ../src/gui_interface.py:926
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "您的密码不正确"
 
-#: ../src/gui_interface.py:930
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenPGP 密码不正确"
 
-#: ../src/gui_interface.py:956
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "证书已过期"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "输入 GPG密钥 %(keyid)s (账户 %(account)s) 的密码。"
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG 密钥不被信任"
 
-#: ../src/gui_interface.py:956
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr "用于加密这次对话的 GPG 密钥未被信任。您确实想要加密这条消息吗?"
 
-#: ../src/gui_interface.py:968
+#: ../src/gui_interface.py:717
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring 虽然被安装了但是没有正确地启动(环境变量可能没有被正确地设置)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+"Gnome Keyring 虽然被安装了但是没有正确地启动(环境变量可能没有被正确地设置)"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gui_interface.py:1070
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 条新邮件会话"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9006,100 +9703,85 @@ msgstr ""
 "主题: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1152
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gui_interface.py:1189 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "远程联系人停止了传输"
-
-#: ../src/gui_interface.py:1192 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "打开文件错误"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "文件传输完毕"
 
-#: ../src/gui_interface.py:1224
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:1228
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1241
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:1245
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1363
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"无法解密来自 %s 的消息\n"
-"它可能被篡改了。"
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1370
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "无法解密消息"
 
-#: ../src/gui_interface.py:1442
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gui_interface.py:1443
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "<b>请在您本地账户填写新的用户名</b>"
 
-#: ../src/gui_interface.py:1456
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1469
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1480
-msgid "Error."
-msgstr "错误。"
-
-#: ../src/gui_interface.py:1493
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1192
 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:1539
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要发起语音聊天。"
 
-#: ../src/gui_interface.py:1542
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "语音聊天请求"
 
-#: ../src/gui_interface.py:1647
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "验证 SSL 证书出错"
 
-#: ../src/gui_interface.py:1648
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9110,15 +9792,20 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要连接这个服务器吗?"
 
-#: ../src/gui_interface.py:1656
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "忽略这个证书的这个错误。"
 
-#: ../src/gui_interface.py:1676
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL证书错误"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL证书错误"
 
-#: ../src/gui_interface.py:1677
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9134,136 +9821,126 @@ msgstr ""
 "\n"
 "您仍想连接并更新证书的指纹信息吗?"
 
-#: ../src/gui_interface.py:1707 ../src/gui_interface.py:1744
-#: ../src/gui_interface.py:1780
-msgid "Insecure connection"
-msgstr "不安全的连接"
-
-#: ../src/gui_interface.py:1708
-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:1711 ../src/gui_interface.py:1748
-#: ../src/gui_interface.py:1783
-msgid "Yes, I really want to connect insecurely"
-msgstr "是的, 我确实想要不安全地连接"
-
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1447
 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 以阻止这样的事情。您确定要这样做吗?"
+msgstr ""
+"您将通过不安全的连接发送密码。您应该安装 PyOpenSSL 以阻止这样的事情。您确定要"
+"这样做吗?"
 
-#: ../src/gui_interface.py:1781
+#: ../src/gui_interface.py:1489
 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:2354 ../src/gui_interface.py:2377
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "表情图标被禁用"
 
-#: ../src/gui_interface.py:2355
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "您配置的表情图标主题未找到, 所以表情图标被禁用。"
 
-#: ../src/gui_interface.py:2378
+#: ../src/gui_interface.py:2019
 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"
+msgstr ""
+"您配置的表情图标主题无法载入。您可能需要升级 emoticons.py 文件的格式。请参考 "
+"http://trac.gajim.org/wiki/Emoticons"
 
-#: ../src/gui_interface.py:2409 ../src/roster_window.py:3643
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2803
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gui_interface.py:3348
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gui_interface.py:3349
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "输入 GPG密钥 %(keyid)s (账户 %(account)s) 的密码。"
 
-#: ../src/gui_interface.py:3363
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG密钥过期"
 
-#: ../src/gui_interface.py:3364
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "您的 GPG密钥已过期, 您将在没有 OpenPGP 情况下连接到 %s。"
 
 #. ask again
-#: ../src/gui_interface.py:3373
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/gui_interface.py:3374
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点\"取消\""
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "新聊天室(_N)"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "我希望将您添加到我的联系人列表"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "正在建立 %s 目录"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "联系人"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "消息"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "主题"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您确定要清除数据库?（强烈建议 GAJIM 运行时不要进行此操作）"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 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 "
@@ -9276,91 +9953,107 @@ msgstr ""
 "\n"
 "如果您点击\"是\", 请等待..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "数据库错误"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)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] "您确定要删除所选定联系人的历史记录?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "您确定要删除所选定的消息?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "您确定要删除所选定联系人的历史记录?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "取消确认"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "磁盘错误"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "错误: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "错误"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态:  %(status)s "
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "读取文件超时"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "编写代码"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "图片太大"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "您将要关闭多个标签"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "您确定要关闭所有这些吗"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "多人聊天"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "消息"
 
@@ -9372,184 +10065,198 @@ msgstr "- 消息将会被记录"
 msgid "- messages will not be logged"
 msgstr "- 消息将不会被记录"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s 改变了状态"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "忽略"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s 上线了"
+#: ../src/plugins/gui.py:82
+#, fuzzy
+msgid "Plugin"
+msgstr "插件"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s 离开了"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "将封禁 %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr " %(nickname)s 发来的新消息"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "注册失败"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "来自聊天室 %s 的私人消息"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s:  %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "服务发送了畸形的数据"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "来自 %(nickname)s 的消息"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "文件已经存在"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "来自 %(nickname)s 的新消息"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "忽略"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "聊天室设置"
 
-#: ../src/profile_window.py:58
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "文件为空"
+
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "正在获取名片..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3012
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "文件为空"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3015
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "文件不存在"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3017 ../src/roster_window.py:3028
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "错误的数据格式"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日期的格式必须是 YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "信息已收到"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "没有连接的情况下您无法发布您的联系人信息。"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "发送名片..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "信息没有发布"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "发布您的个人信息时发生错误, 请稍后重试。"
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1028
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在\"%s\"将知道您的状态。"
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果\"%s\"接受此请求, 您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG 不可用"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3573
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "您正在参与一个或多个多人聊天"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3574
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 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:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "未同步"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "真得要退出 Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您确定您要退出 Gajim 吗?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "总是关闭 Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "您有正在传输的文件"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "如果现在退出, 正在传输的文件会停止传输。您仍然要退出吗?"
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2730
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9557,119 +10264,119 @@ msgstr ""
 "除非您启用了历史记录而且向您发送消息的联系人在您的联系人列表中, 您才能\n"
 "在以后读到这些消息。"
 
-#: ../src/roster_window.py:2731
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必须阅读它们。"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理\"%s\"将被移除"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法再和使用这个代理的联系人收发消息。"
 
-#: ../src/roster_window.py:2738
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:3001
 #, 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:2811
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您将要屏蔽一个联系人。您确定要继续吗?"
 
-#: ../src/roster_window.py:2813
+#: ../src/roster_window.py:3045
 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:2904
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:2905
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:2912
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:2913
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:2958
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:2959
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从联系人列表中删除组 %s ?"
 
-#: ../src/roster_window.py:2960
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从联系人列表移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:2999
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "指定 OpenPGP 密钥"
 
-#: ../src/roster_window.py:3000
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "选择一个对应于该联系人的密钥。"
 
-#: ../src/roster_window.py:3383
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人\"%s\"将从您的联系人列表中被移除"
 
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3637
 #, 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:3390
+#: ../src/roster_window.py:3642
 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:3396
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "您要继续吗?"
 
-#: ../src/roster_window.py:3400
+#: ../src/roster_window.py:3652
 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:3403
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3407
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的联系人列表中被移除"
 
-#: ../src/roster_window.py:3412
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9678,12 +10385,13 @@ msgstr ""
 "移除这些联系人: %s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: ../src/roster_window.py:3470
+#: ../src/roster_window.py:3722
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "您将发送一个自定义的状态。您确定要继续吗?"
 
-#: ../src/roster_window.py:3472
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9692,31 +10400,32 @@ msgstr ""
 "这个联系人会暂时看到您的状态为 %(status)s, 直到您下次改变您的状态。之后\n"
 "他/她会看到您的全局状态。"
 
-#: ../src/roster_window.py:3491
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:3492
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:4106
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持存储元联系人信息"
 
-#: ../src/roster_window.py:4108
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时不会被保存。"
 
-#: ../src/roster_window.py:4200
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续?"
 
-#: ../src/roster_window.py:4202
+#: ../src/roster_window.py:4552
 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 "
@@ -9725,22 +10434,27 @@ msgstr ""
 "元联系人是将几个联系人组合起来显示在同一行。通常在某个人有几个 Jabber\n"
 "账户或代理账户时用到。"
 
-#: ../src/roster_window.py:4317
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "无效的文件地址: "
 
-#: ../src/roster_window.py:4329
+#: ../src/roster_window.py:4685
 #, 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:4444
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "发送 %s 给 %s"
 
-#: ../src/roster_window.py:4450
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "由 %s 与 %s 创建元联系人"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "由 %s 与 %s 创建元联系人"
@@ -9750,129 +10464,129 @@ msgstr "由 %s 与 %s 创建元联系人"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4889 ../src/roster_window.py:4943
-#: ../src/roster_window.py:4952 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
 #. add
-#: ../src/roster_window.py:4959
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:4964
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "使用 %s 账户"
 
-#: ../src/roster_window.py:5003 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "管理书签(_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5023
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "帐户 %s"
 
-#: ../src/roster_window.py:5124 ../src/roster_window.py:5229
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:5157
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "发布音乐"
 
-#: ../src/roster_window.py:5159
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "发布位置信息"
 
-#: ../src/roster_window.py:5162
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "配置服务..."
 
-#: ../src/roster_window.py:5307
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "最大化全部(_M)"
 
-#: ../src/roster_window.py:5317 ../src/roster_window.py:5491
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: ../src/roster_window.py:5325
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: ../src/roster_window.py:5329
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "向所有在线用户"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5511
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "管理联系人(_M)"
 
 #. Edit Groups
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "编辑群组(_G)"
 
 #. Send single message
-#: ../src/roster_window.py:5575
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "发送单条消息(_S)"
 
 #. Execute Command
-#: ../src/roster_window.py:5622
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "执行命令..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5632
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "管理代理(_M)"
 
 #. Modify Transport
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
 #. Rename
-#: ../src/roster_window.py:5651
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../src/roster_window.py:5711
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "最大化(_M)"
 
-#: ../src/roster_window.py:5720
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: ../src/roster_window.py:5727
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "断开连接(_D)"
 
 #. History manager
-#: ../src/roster_window.py:5816
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "历史记录管理器"
 
-#: ../src/roster_window.py:5827
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: ../src/roster_window.py:6055
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
@@ -9889,24 +10603,14 @@ msgstr "在收到的数据表中有错误"
 msgid "No result"
 msgstr "无结果"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "磁盘写入错误"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "主题: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "确定这些会话属性"
 
-#: ../src/session.py:448
-#, python-format
+#: ../src/session.py:411
+#, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9919,7 +10623,7 @@ msgstr ""
 "\n"
 "是否接受?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9934,146 +10638,151 @@ msgstr ""
 "\n"
 "继续进行会话?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "是否为此联系人使用 OpenPGP?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "隐藏联系人列表(_R)"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "资源: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr "[已屏蔽]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr "[最小化的]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "状态: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "最后状态: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr "自从 %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "已连接"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "已断开连接"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "认证: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "空闲, 自从 %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "空闲了 %s"
 
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "心情: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "心情: "
 
-#: ../src/tooltips.py:702
-#, python-format
-msgid "Activity: %s"
-msgstr "活动: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "活动: "
 
-#: ../src/tooltips.py:706
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "音乐: %s"
 
-#: ../src/tooltips.py:710
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "位置: %s"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "类型: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "已传输: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暂停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "服务还没有详细的信息应答"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10081,62 +10790,420 @@ msgstr ""
 "这个服务无法应答详细的信息。\n"
 "这很可能是服务器的遗留问题, 或者服务器被损坏了"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "未知"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "未知"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "未知"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>角色</b>"
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>归属: </b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣, 但您不关心他/她的状态"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣, 但他/她不关心您的状态"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "没有未处理的认证请求"
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr "带有优先级的资源"
+
+#~ msgid "Choose Client Cert"
+#~ msgstr "选择客户端证书"
+
+#~ msgid "The path to the client certificate and key in PKCS#12 format"
+#~ msgstr "客户端证书路径（PKCS#12 格式）"
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "与此联系人聊天时打开的窗口/标签"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>动作</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>条件</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "高级动作"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "高级通知控件设置"
+
+#~ msgid "All statuses"
+#~ msgstr "所有状态"
+
+#~ msgid "Busy "
+#~ msgstr "忙碌"
+
+#~ msgid "Contact Change Status "
+#~ msgstr "联系人改变了状态"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "联系人已断开连接"
+
+#~ msgid "Don't have "
+#~ msgstr "没有"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "文件传输开始"
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "多人聊天消息高亮显示"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "收到多人聊天消息"
+
+#~ msgid "Have "
+#~ msgstr "有"
+
+#~ msgid "Launch a command"
+#~ msgstr "运行命令"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "一或多个指定的状态..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "在线/和我聊天吧"
+
+#~ msgid "Play a sound"
+#~ msgstr "播放声音"
+
+#~ msgid "Receive a Message"
+#~ msgstr "收到一条消息"
+
+#~ msgid "When "
+#~ msgstr "当"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr "激活窗口管理器事件提示使任务栏的聊天窗口闪烁(_A)"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "禁用自动打开聊天窗口(_D)"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "禁用现有的弹出窗口(_D)"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "禁用现有的此事件的声音(_D)"
+
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "禁用在通知区域中显示事件(_D)"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "禁用在联系人列表中显示事件(_D)"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "使用弹出窗口通知(_I)"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "在联系人列表中显示事件(_S)"
+
+#~ msgid "and I "
+#~ msgstr "与我"
+
+#~ msgid "contact(s)"
+#~ msgstr "联系人"
+
+#~ msgid "everybody"
+#~ msgstr "每个人"
+
+#~ msgid "for "
+#~ msgstr "为"
+
+#~ msgid "group(s)"
+#~ msgstr "群组"
+
+#~ msgid "when I'm in"
+#~ msgstr "当我在"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "显示联系人的名片"
+
+#~ msgid "label"
+#~ msgstr "标签"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "允许他/她查看我的状态(_A)"
+
+#~ msgid "Descrition:"
+#~ msgstr "描述: "
+
+#~ msgid "button"
+#~ msgstr "按钮"
+
+#~ msgid "Advanced..."
+#~ msgstr "高级..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "在联系人列表中显示联系人的活动(_A)"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "在联系人列表中显示联系人正在播放音乐的信息(_T)"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "在联系人列表中显示联系人的心情(_O)"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的活动。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的位置。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人正在播放的音乐。"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "发送单条消息...(_S)"
+
+#~ msgid "User avatar:"
+#~ msgstr "用户头像: "
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim 即时消息软件"
+
+#~ msgid "English"
+#~ msgstr "英语"
+
+#~ msgid "Belarusian"
+#~ msgstr "白俄罗斯语"
+
+#~ msgid "Bulgarian"
+#~ msgstr "保加利亚语"
+
+#~ msgid "Breton"
+#~ msgstr "布列塔尼语"
+
+#~ msgid "Czech"
+#~ msgstr "捷克语"
+
+#~ msgid "German"
+#~ msgstr "德语"
+
+#~ msgid "Greek"
+#~ msgstr "希腊语"
+
+#~ msgid "British"
+#~ msgstr "英语（英国）"
+
+#~ msgid "Esperanto"
+#~ msgstr "世界语"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙语"
+
+#~ msgid "Basque"
+#~ msgstr "巴斯克语"
+
+#~ msgid "French"
+#~ msgstr "法语"
+
+#~ msgid "Croatian"
+#~ msgstr "克罗埃西亚语"
+
+#~ msgid "Italian"
+#~ msgstr "意大利语"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "挪威语 (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "荷兰语"
+
+#~ msgid "Norwegian"
+#~ msgstr "挪威语"
+
+#~ msgid "Polish"
+#~ msgstr "波兰语"
+
+#~ msgid "Portuguese"
+#~ msgstr "葡萄牙语"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "巴西葡萄牙语"
+
+#~ msgid "Russian"
+#~ msgstr "俄语"
+
+#~ msgid "Serbian"
+#~ msgstr "塞尔维亚语"
+
+#~ msgid "Slovak"
+#~ msgstr "斯洛伐克语"
+
+#~ msgid "Swedish"
+#~ msgstr "瑞典语"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "中文"
+
+#~ msgid "Spelling language"
+#~ msgstr "拼写语言"
+
+#~ 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 ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr "改变这个值以改变显示的 LaTeX 方程的大小。更高则更大。"
+
+#~ msgid "all or space separated status"
+#~ msgstr "all 或 空格分割的一些状态"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', 或'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' 或 ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "检查连接或稍后重试"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "在执行命令\"%(command)s\"时发生错误: %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "错误: 无法读取文件 %s"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "无法绑定端口%s。"
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr "或许您有另一个正在运行的 Gajim 实例。文件传输将被取消。"
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "一个 GTK+ Jabber 客户端"
+
+#~ msgid "Condition"
+#~ msgstr "条件"
+
+#~ msgid "when I am "
+#~ msgstr "当我"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "需要 gpg 和 python-GnuPGInterface。"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "转换 $$ $$ 之间的 LaTeX 表达式。"
+
+#~ 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 或 ImageMagick)。您需要在高级设置编辑器"
+#~ "中将 'use_latex' 设置为真。"
+
+#~ 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 或 ImageMagick) (全部在 MikTeX 中)。您"
+#~ "需要在高级设置编辑器中将 'use_latex' 设置为真。"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "需要 python-farsight。"
+
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "下列中的一项: offline, online, chat, away, xa, dnd, invisible"
+
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr "返回当前的状态信息 (如不指定账户则返回全局设置)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "用法:  %s %s %s \n"
+#~ "\t %s"
+
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "参数太多。\n"
+#~ "输入\"%s help %s\"以获取更多信息"
+
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "参数\"%s\"未指定。\n"
+#~ "输入\"%s help %s\"以获取更多信息"
+
+#~ msgid "Contacts"
+#~ msgstr "联系人"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "磁盘写入错误"
+
+#~ msgid "Subject: %s"
+#~ msgstr "主题: %s"
+
+#~ msgid "Mood: %s"
+#~ msgstr "心情: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "活动: %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9a60f2484..62af8fb10 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.15a1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-08 08:26+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2011-09-07 23:11+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -20,301 +20,292 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\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/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "狀態(_S)"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "個人事件"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "開始聊天(_S)…"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "加入聊天室(_G)…"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "加入聯絡人(_A)…"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "探索服務(_D)"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "執行命令(_E)…"
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "修改帳號資訊(_M)"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "開啟 Gmail 收件匣(_O)"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "個人事件"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "開始聊天(_S)…"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "狀態(_S)"
+msgid "_Modify Account"
+msgstr "修改帳號資訊(_M)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: 帳號建立精靈"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>正在連線伺服器</b>\n"
-"\n"
-"請等待…"
+"您必須擁有一個帳號以連線\n"
+"Jabber 網路"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "I already have an account I want to _use"
+msgstr "我已經有想要使用的帳號了(_U)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "我想註冊一個新帳號(_R)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>請選擇一個選項</b>:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>請填寫您現有帳號的資訊</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>請選擇一個伺服器</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "密碼(_P):"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"將這個證書加入到可信任證書清單。\n"
-"這個證書的 SHA1 指紋資訊: \n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "儲存密碼(_W)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "匿名認證(_Y)"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "如果選取，Gajim 會記錄本帳號的密碼"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "當我點擊\"結束\"時連線"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: 帳號建立精靈"
+msgid "Anon_ymous authentication"
+msgstr "匿名認證(_Y)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "我已經有想要使用的帳號了(_U)"
+msgid "<b>Please select a server</b>"
+msgstr "<b>請選擇一個伺服器</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "我想註冊一個新帳號(_R)"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "伺服器(_S):"
 
 #: ../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 會記錄本帳號的密碼"
+msgid "Prox_y:"
+msgstr "代理伺服器(_Y):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 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:1289 ../src/config.py:1392 ../src/config.py:1703
-#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363
-#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730
-#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
-#: ../src/dialogs.py:532 ../src/roster_window.py:3092
-#: ../src/roster_window.py:3098 ../src/roster_window.py:3103
-msgid "None"
-msgstr "無"
+msgid "Use custom hostname/port"
+msgstr "使用自訂的主機名稱/連接埠"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "代理伺服器(_Y):"
+msgid "_Hostname:"
+msgstr "主機名稱(_H):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "儲存密碼(_W)"
+msgid "_Port:"
+msgstr "連接埠(_P):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "連線後設定我的側寫"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "進階(_A)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "使用自訂的主機名稱/連接埠"
-
-#: ../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."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"您必須擁有一個帳號以連線\n"
-"Jabber 網路"
+"將這個證書加入到可信任證書清單。\n"
+"這個證書的 SHA1 指紋資訊: \n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:17
-msgid "_Advanced"
-msgstr "進階(_A)"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "完成(_F)"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "主機名稱(_H):"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>正在連線伺服器</b>\n"
+"\n"
+"請等待…"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:61
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "Connect when I press Finish"
+msgstr "當我點擊\"結束\"時連線"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:63
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "_Password:"
-msgstr "密碼(_P):"
+msgid "Set my profile when I connect"
+msgstr "連線後設定我的側寫"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "連接埠(_P):"
+msgid "_Finish"
+msgstr "完成(_F)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-msgid "_Server:"
-msgstr "伺服器(_S):"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>雜項</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "無"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "帳號"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>個人資訊</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "加入"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>代理伺服器</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "刪除"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "依據狀態調整(_A)"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "重新命名(_N)"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "帳號"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "啟用(_E)"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "帳號"
+msgid "Anonymous authentication"
+msgstr "匿名認證"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "管理作業"
+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 ""
+"資源被傳送給伺服器以將用不同客戶端登入的同一帳號區分為兩個或更多部分(取\n"
+"決於登入的客戶端的數目)。比如，您可以利用\"家庭\"和\"工作\"兩個資源同時\n"
+"連線到伺服器。擁有最高優先等級的資源得到伺服器的事件回應。(請看下面)"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "匿名認證"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "連線中斷後自動重連"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "同步聯絡人"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "瀏覽…"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "點擊以請求另一個帳號所有聯絡人的認證"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Gajim 啟動時連線(_O)"
+msgid "Chan_ge Password"
+msgstr "變更密碼(_G)"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "Certificate is e_ncrypted"
-msgstr "憑證已加密(_N)"
+msgid "Click to change account's password"
+msgstr "點擊以變更該帳號的密碼"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Chan_ge Password"
-msgstr "變更密碼(_G)"
+msgid "Administration operations"
+msgstr "管理作業"
 
 #: ../data/gui/accounts_window.ui.h:15
 msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr "如果選取，Gajim 在透過不安全的網路連線傳送密碼前會詢問您"
+"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 ""
+"優先等級是當多個客戶端使用同一帳號連線到伺服器時，伺服器決定事件回應對\n"
+"像的依據。優先等級最高的客戶端將得到事件回應"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "選擇密鑰(_K)…"
+msgid "A_djust to status"
+msgstr "依據狀態調整(_A)"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "點擊以變更該帳號的密碼"
+msgid "Priority will change automatically according to your status."
+msgstr "優先等級將根據您的狀態自動轉換。"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "點擊以請求另一個帳號所有聯絡人的認證"
+msgid "Priori_ty:"
+msgstr "優先等級(_T):"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "客戶端證書"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim 啟動時連線(_O)"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "連線"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "名稱:"
+msgid "Resour_ce:"
+msgstr "資源(_C):"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
-#: ../src/notify.py:311 ../src/notify.py:334 ../src/notify.py:383
-#: ../src/notify.py:399
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr "客戶端證書檔案(_C)"
 
-#. 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:56
-#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
-#: ../src/roster_window.py:3034 ../src/roster_window.py:5652
-msgid "General"
-msgstr "一般"
+#: ../data/gui/accounts_window.ui.h:25
+msgid "Browse..."
+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 "Certificate is e_ncrypted"
+msgstr "憑證已加密(_N)"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "如果選取，Gajim 會從一個 GPG agent (比如 Seahorse)得到密碼"
+msgid "Client certificate"
+msgstr "客戶端證書"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "帳號"
 
 #: ../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 "C_onnect on Gajim startup"
+msgstr "Gajim 啟動時連線(_O)"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -323,6 +314,18 @@ msgid ""
 msgstr "如果選取，Gajim 會在啟動時自動使用本帳號連線 jabber 伺服器"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "連線中斷後自動重連"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "儲存與所有聯絡人的聊天記錄(_L)"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "將帳號狀態與全域狀態同步(_R)"
+
+#: ../data/gui/accounts_window.ui.h:34
 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 "
@@ -331,168 +334,197 @@ 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"
-"You might consider to change possible firewall settings."
-msgstr ""
-"如果用於接收訊息的預設連接埠不合適，您可以在這裡選擇另外一個。\n"
-"您可能需要變更防火牆設定。"
-
-#: ../data/gui/accounts_window.ui.h:34
-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:1826
-#: ../src/dialogs.py:837
-msgid "Jabber ID:"
-msgstr "Jabber ID"
+msgid "Use file transfer proxies"
+msgstr "使用檔案傳輸代理伺服器"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "姓:"
+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:37
-msgid "Mer_ge accounts"
-msgstr "合併帳號(_G)"
+#. 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:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "一般"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
-#: ../src/config.py:2377
-msgid "No key selected"
-msgstr "沒有選擇密鑰"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "使用 HTTP__PROXY 環境變數(_U)"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "個人資訊"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "管理…"
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>代理伺服器</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "優先等級(_T):"
+msgid "_Warn before using an insecure connection"
+msgstr "在使用不安全的連線之前警告(_W)"
 
 #: ../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 ""
-"優先等級是當多個客戶端使用同一帳號連線到伺服器時，伺服器決定事件回應對\n"
-"像的依據。優先等級最高的客戶端將得到事件回應"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr "如果選取，Gajim 在透過不安全的網路連線傳送密碼前會詢問您"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "優先等級將根據您的狀態自動轉換。"
+msgid "Send _keep-alive packets"
+msgstr "傳送資料封包以防止連線逾時"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602
-msgid "Re_name"
-msgstr "重新命名(_N)"
+#: ../data/gui/accounts_window.ui.h:44
+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:45
-msgid "Resour_ce:"
-msgstr "資源(_C):"
+msgid "Use cust_om hostname/port"
+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 ""
-"資源被傳送給伺服器以將用不同客戶端登入的同一帳號區分為兩個或更多部分(取\n"
-"決於登入的客戶端的數目)。比如，您可以利用\"家庭\"和\"工作\"兩個資源同時\n"
-"連線到伺服器。擁有最高優先等級的資源得到伺服器的事件回應。(請看下面)"
+msgid "_Hostname: "
+msgstr "主機名稱(_H): "
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "儲存與所有聯絡人的聊天記錄(_L)"
+msgid "_Port: "
+msgstr "連接埠號碼(_P): "
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>雜項</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "傳送資料封包以防止連線逾時"
+msgid "Connection"
+msgstr "連線"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "將帳號狀態與全域狀態同步(_R)"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "沒有選擇密鑰"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "將帳號狀態與全域狀態同步(_Z)"
+msgid "Choose _Key..."
+msgstr "選擇密鑰(_K)…"
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "同步聯絡人"
-
-#: ../data/gui/accounts_window.ui.h:53
 msgid "Use G_PG Agent"
 msgstr "使用 G_PG Agent"
 
+#: ../data/gui/accounts_window.ui.h:53
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "如果選取，Gajim 會從一個 GPG agent (比如 Seahorse)得到密碼"
+
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use cust_om hostname/port"
-msgstr "使用自訂主機名稱/連接埠號碼"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om port:"
-msgstr "使用自訂連接埠號碼:"
+msgid "_Edit Personal Information..."
+msgstr "編輯個人資訊…"
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use file transfer proxies"
-msgstr "使用檔案傳輸代理伺服器"
+msgid "Information about you, as stored in the server"
+msgstr "伺服器中儲存的關於您的資訊"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "_Client Cert File:"
-msgstr "客戶端證書檔案(_C)"
+msgid "<b>Personal Information</b>"
+msgstr "<b>個人資訊</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Edit Personal Information..."
-msgstr "編輯個人資訊…"
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "個人資訊"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "啟用(_E)"
+#: ../data/gui/accounts_window.ui.h:59
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 啟動時連線(_O)"
 
 #: ../data/gui/accounts_window.ui.h:60
-msgid "_Hostname: "
-msgstr "主機名稱(_H): "
+msgid "Synchroni_ze account status with global status"
+msgstr "將帳號狀態與全域狀態同步(_Z)"
+
+#: ../data/gui/accounts_window.ui.h:61
+msgid "Use cust_om port:"
+msgstr "使用自訂連接埠號碼:"
 
 #: ../data/gui/accounts_window.ui.h:62
-msgid "_Manage..."
-msgstr "管理…"
+msgid ""
+"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"
+"您可能需要變更防火牆設定。"
 
 #: ../data/gui/accounts_window.ui.h:64
-msgid "_Port: "
-msgstr "連接埠號碼(_P): "
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "名稱:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Warn before using an insecure connection"
-msgstr "在使用不安全的連線之前警告(_W)"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "姓:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_use HTTP__PROXY environment variable"
-msgstr "使用 HTTP__PROXY 環境變數(_U)"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Jabber ID"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "合併帳號(_G)"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "帳號(_C):"
+msgid "Add New Contact"
+msgstr "加入聯絡人"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "允許此聯絡人看到我的狀態(_L)"
+msgid "A_ccount:"
+msgstr "帳號(_C):"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "加入聯絡人"
+msgid "_Protocol:"
+msgstr "協定(_P):"
 
-#: ../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 "我想加入您到我的聯絡人清單"
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "使用者 ID(_U):"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "暱稱(_N):"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "群組(_G):"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "允許此聯絡人看到我的狀態(_L)"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "_Save subscription message"
+msgstr "儲存認證訊息(_S)"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -503,7 +535,11 @@ msgstr ""
 "加入此協定的聯絡人。\n"
 "點擊註冊按鈕處理。"
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "註冊(_G):"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -511,397 +547,366 @@ msgstr ""
 "您必須連線才能\n"
 "增加此協定的聯絡人。"
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "群組(_G):"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "_Nickname:"
-msgstr "暱稱(_N):"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "協定(_P):"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "註冊(_G):"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "儲存認證訊息(_S)"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "使用者 ID(_U):"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "我想加入您到我的聯絡人清單"
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>發生了一個錯誤:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>選擇要執行的命令</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "請稍等，正在獲取命令清單…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc 命令 - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>選擇要執行的命令</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "請再檢查一遍"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "錯誤描述…"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "請稍等，正在傳送命令…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "完成(_F)"
+msgid "Please wait..."
+msgstr "請稍等…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "請稍等，正在獲取命令清單…"
+msgid "This jabber entity does not expose any commands."
+msgstr "這個 Jabber 節點沒有提供任何命令"
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "請稍等，正在傳送命令…"
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>發生了一個錯誤:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "請稍等…"
+msgid "Error description..."
+msgstr "錯誤描述…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "這個 Jabber 節點沒有提供任何命令"
+msgid "F_inish"
+msgstr "完成(_F)"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>描述</b>"
+msgid "Advanced Configuration Editor"
+msgstr "進階設定編輯器"
 
 #: ../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 以使某些設定生效"
+msgid "Filter:"
+msgstr "過濾器:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "進階設定編輯器"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>描述</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "過濾器:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>注意:</b>您必須重新啟動 gajim 以使某些設定生效"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "恢復為預設顏色設定(_R)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "刪除 MOTD"
+msgid "Show _XML Console"
+msgstr "顯示 XML 主控臺(_X)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "刪除每日訊息"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "編輯隱私策略清單(_P)…"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "管理員(_A)"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "向所有目前連線到這個伺服器的使用者傳送一條訊息"
+msgid "_Send Server Message..."
+msgstr "傳送伺服器訊息(_S)…"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "設定 MOTD…"
+msgid "Sends a message to users currently connected to this server"
+msgstr "向所有目前連線到這個伺服器的使用者傳送一條訊息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "設定每日訊息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "顯示 XML 主控臺(_X)"
+msgid "Set MOTD..."
+msgstr "設定 MOTD…"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "更新 MOTD…"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "更新每日訊息"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "更新 MOTD…"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "管理員(_A)"
+msgid "Delete MOTD"
+msgstr "刪除 MOTD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "傳送伺服器訊息(_S)…"
+msgid "Deletes Message of the Day"
+msgstr "刪除每日訊息"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr "<i>Method Auto</i>"
+msgid "No"
+msgstr "No"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr "<i>Method Local</i>"
+msgid "Yes"
+msgstr "Yes"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr "<i>Method Manual</i>"
+msgid "Prefer"
+msgstr "Prefer"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-msgid "Auto"
-msgstr "Auto"
-
-#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Concede"
 msgstr "Concede"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "Forbid"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "<i>Method Manual</i>"
+msgstr "<i>Method Manual</i>"
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "No"
+msgid "<i>Method Local</i>"
+msgstr "<i>Method Local</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-msgid "Prefer"
-msgstr "Prefer"
+msgid "<i>Method Auto</i>"
+msgstr "<i>Method Auto</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Yes"
+msgid "Auto"
+msgstr "Auto"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entry:"
+msgid "New entry received"
+msgstr "New entry received"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "You have received new entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed name:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Last modified:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "New entry received"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "被阻斷的聯絡人"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5621
-#: ../src/roster_window.py:5748 ../src/roster_window.py:5881
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "解除阻斷(_U)"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>訊息:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "設定活動"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "設定活動"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>訊息:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>心情:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>訊息:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "變更密碼"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "再次輸入以確認:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "輸入新的密碼"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "再次輸入以確認:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>輸入新的狀態訊息</b>"
+msgid "Save as Preset..."
+msgstr "另存為…"
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "活動:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "心情:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "活動:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "預設的訊息:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "另存為…"
+msgid "<b>Type your new status message</b>"
+msgstr "<b>輸入新的狀態訊息</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "加入聊天室(_G)"
+msgid "_Copy Link Location"
+msgstr "複製連結位置(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "加入至聯絡人清單(_A)…"
+msgid "_Open Link in Browser"
+msgstr "在瀏覽器中開啟連結(_O)"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "複製 JID/電子郵件位址(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "複製連結位置(_C)"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "開啟郵件編輯器(_O)"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "在瀏覽器中開啟連結(_O)"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "開始聊天(_S)"
 
-#: ../data/gui/chat_control.ui.h:1
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "加入聊天室(_G)"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "加入至聯絡人清單(_A)…"
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "顯示表情清單(Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "向聯絡人清單中加入聯絡人(Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "邀請聯絡人參與對話(Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "邀請聯絡人參與對話(Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "瀏覽聊天記錄(Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "顯示進階功能選單(Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+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:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "傳送(_S)"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 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 "顯示格式清單(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 "顯示進階功能選單(Alt+D)"
-
-#: ../data/gui/chat_control.ui.h:19
-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:275
-msgid "_Send"
-msgstr "傳送(_S)"
+msgid "*"
+msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "標籤"
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "邀請(_V)"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "邀請朋友!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "多人聊天伺服器"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "請選擇一個多人聊天伺服器"
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -909,120 +914,136 @@ msgstr ""
 "您將開始進行多人聊天。\n"
 "選擇您想要邀請的聯絡人"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "要求檢視他/她的狀態(_S)"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "請選擇一個多人聊天伺服器"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "加入特殊提示(_N)…"
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "多人聊天伺服器"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "指定 Open_PGP 密鑰…"
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "邀請(_V)"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "執行命令…"
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "開始聊天(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "編輯群組(_G)…"
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "傳送單條訊息(_M)…"
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "傳送檔案(_F)…"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5557
-#: ../src/roster_window.py:5716
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "邀請到(_V)"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "移除(_R)"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "切換Open_PGP加密"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "切換E2E加密"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5567
-#: ../src/roster_window.py:5805
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "傳送個性化狀態(_T)"
 
-#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
-msgid "Send Single _Message..."
-msgstr "傳送單條訊息(_M)…"
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "執行命令…"
+
+#: ../data/gui/contact_context_menu.ui.h:10
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "管理聯絡人"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "傳送檔案(_F)…"
+msgid "_Rename..."
+msgstr "重新命名(_R)…"
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "設定自訂頭像(_A)…"
+msgid "Edit _Groups..."
+msgstr "編輯群組(_G)…"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "開始聊天(_C)"
+msgid "Assign Open_PGP Key..."
+msgstr "指定 Open_PGP 密鑰…"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "切換E2E加密"
+msgid "Set Custom _Avatar..."
+msgstr "設定自訂頭像(_A)…"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "切換Open_PGP加密"
+msgid "Add Special _Notification..."
+msgstr "加入特殊提示(_N)…"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "認證(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "允許他/她檢視我的狀態(_A)"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "允許此聯絡人看到我的狀態(_L)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5629
-#: ../src/roster_window.py:5754 ../src/roster_window.py:5884
-msgid "_Block"
-msgstr "阻斷(_B)"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "要求檢視他/她的狀態(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 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:9 ../data/gui/roster_window.ui.h:23
-#: ../src/roster_window.py:5955
-msgid "_History"
-msgstr "命令歷程(_H)"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "忽略(_I)"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "阻斷(_B)"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "管理聯絡人"
+msgid "_Unignore"
+msgstr "取消忽略(_U)"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "重新命名(_R)…"
+msgid "_Ignore"
+msgstr "忽略(_I)"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "認證(_S)"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "移除(_R)"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "取消忽略(_U)"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "命令歷程(_H)"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "請填寫表格。"
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "聊天室設定"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "請填寫表格。"
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "編輯群組"
@@ -1035,55 +1056,47 @@ msgstr "<b>ESession</b>資訊"
 msgid "_Verify"
 msgstr "辨別(_V)"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "特性"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Gajim 支援的特性清單</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "特性"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "傳送中，傳輸完成和停止傳輸的檔案清單"
+msgid "File Transfers"
+msgstr "檔案傳輸"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "取消檔案傳輸"
+msgid "Shows a list of file transfers between you and others"
+msgstr "顯示您與他人進行的傳輸檔案清單"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "取消選取檔案的傳輸"
+msgid "file transfers list"
+msgstr "檔案傳輸清單"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "取消選取檔案傳輸並刪除未完成檔案"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "傳送中，傳輸完成和停止傳輸的檔案清單"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "清除(_U)"
+msgid "_Notify me when a file transfer is complete"
+msgstr "檔案傳輸完成時提醒我(_N)"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "檔案傳輸"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "當檔案傳輸完成時彈出提示"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "隱藏該視窗"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "從清單移除已完成，已取消和失敗的檔案傳輸"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "從清單中移除檔案傳輸。"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-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"
@@ -1091,79 +1104,105 @@ msgstr ""
 "該作業會從清單中移除單一檔案傳輸。如果傳輸正在進行，它將先被終止，而後\n"
 "被移除"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "清除(_U)"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "暫停(_P)"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "當檔案傳輸完成時彈出提示"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "取消選取檔案傳輸並刪除未完成檔案"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
-msgid "_Continue"
-msgstr "繼續(_C)"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "取消檔案傳輸"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "檔案傳輸完成時提醒我(_N)"
+msgid "Cancels the selected file transfer"
+msgstr "取消選取檔案的傳輸"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "開啟資料夾(_O)"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "隱藏該視窗"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "暫停(_P)"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "繼續(_C)"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "檔案傳輸清單"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "開啟資料夾(_O)"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>各聊天狀態下標籤顏色</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 msgid "Account row"
 msgstr "帳號"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1030
-msgid "Bold"
-msgstr "粗體"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "群組"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "聯絡人"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "聊天視窗上方橫幅"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "正在編輯"
+msgid "Gajim Themes Customization"
+msgstr "Gajim 主題自訂"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "聯絡人"
+msgid "Text _color:"
+msgstr "文字顏色(_C):"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "字型風格:"
+msgid "_Background:"
+msgstr "背景(_B)"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim 主題自訂"
+msgid "Text _font:"
+msgstr "文字字型(_F):"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "已離開"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "群組"
+msgid "Font style:"
+msgstr "字型風格:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "未活動的"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "粗體"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1031
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "斜體"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "暫停編輯"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "正在編輯"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "未活動的"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>各聊天狀態下標籤顏色</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "已離開"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1171,7 +1210,7 @@ msgstr ""
 "多人聊天\n"
 "訊息"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1179,109 +1218,97 @@ msgstr ""
 "多人聊天指示性\n"
 "訊息"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "暫停編輯"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "文字顏色(_C):"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "文字字型(_F):"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "背景(_B)"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "變更暱稱(_N)…"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "管理聊天室(_M)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "變更主題(_S)…"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "設定聊天室(_R)…"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "將本聊天室加入書籤(_B)"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "刪除聊天室(_D)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "管理聊天室(_M)"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "關閉時最小化視窗"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_control_popup_menu.ui.h:7
 msgid "_Request Voice"
 msgstr "要求語音(_R)"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "將本聊天室加入書籤(_B)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "_Send Private Message"
+msgstr "傳送私人聊天訊息(_S)"
+
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Mo_derator"
-msgstr "仲裁人(_D)"
+msgid "Send _File"
+msgstr "傳送檔案(_F)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "室友動作"
 
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "Send _File"
-msgstr "傳送檔案(_F)"
+msgid "_Voice"
+msgstr "語音(_V)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
-msgid "_Add to Roster"
-msgstr "加入至聯絡人清單(_A)"
+msgid "Mo_derator"
+msgstr "仲裁人(_D)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "成員(_M)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:7
-msgid "_Ban"
-msgstr "封禁(_B)"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "所有人(_O)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Member"
-msgstr "成員(_M)"
+#: ../data/gui/gc_occupants_menu.ui.h:10
+msgid "_Ban"
+msgstr "封禁(_B)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Owner"
-msgstr "所有人(_O)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:13
-msgid "_Send Private Message"
-msgstr "傳送私人聊天訊息(_S)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:15
-msgid "_Voice"
-msgstr "語音(_V)"
+msgid "_Add to Roster"
+msgstr "加入至聯絡人清單(_A)"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "將本聊天室加入書籤(Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "顯示格式清單(Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "變更您的暱稱(Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 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/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "將本聊天室加入書籤(Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1293,33 +1320,19 @@ msgid "From:"
 msgstr "從:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 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."
-msgstr ""
-"<b>警告:</b>\n"
-"如果您要進行大量的刪除，請確認 Gajim 不再執行。\n"
-"一般而言，如果您正在與某個聯絡人聊天，請不要刪除與他的聊天記錄。"
+msgid "Gajim History Logs Manager"
+msgstr "Gajim 命令歷程記錄管理器"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>歡迎使用 Gajim 命令歷程記錄管理器</b></big>"
 
-#: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "匯出"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Gajim 命令歷程記錄管理器"
-
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1333,163 +1346,187 @@ msgstr ""
 "使用這個程式來刪除或匯出命令歷程記錄。您可以在左側進行選擇且/或在下方進行搜"
 "尋。"
 
-#: ../data/gui/history_manager.ui.h:9
+#: ../data/gui/history_manager.ui.h:6
+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."
+msgstr ""
+"<b>警告:</b>\n"
+"如果您要進行大量的刪除，請確認 Gajim 不再執行。\n"
+"一般而言，如果您正在與某個聯絡人聊天，請不要刪除與他的聊天記錄。"
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "搜尋資料庫(_S)"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "所有聊天命令歷程"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "對話命令歷程"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "匯出"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 msgid "Enter JID or Contact name"
 msgstr "輸入 JID 或是聯絡人名稱"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 msgid "Groupchat Histories"
 msgstr "多人聊天命令歷程"
 
+#: ../data/gui/history_window.ui.h:3
+msgid "All Chat Histories"
+msgstr "所有聊天命令歷程"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "對話命令歷程"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "搜尋:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "記錄聊天命令歷程(_L)"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "記錄聯絡人狀態變化(_L)"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
-msgstr "approve"
+msgid "expire"
+msgstr "expire"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
-msgstr "body"
+msgid "save"
+msgstr "save"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr "concede"
+msgid "otr"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr "expire"
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr "false"
+msgid "body"
+msgstr "body"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
-msgstr "forbid"
+msgid "false"
+msgstr "false"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../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:8
+msgid "stream"
+msgstr "stream"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
-msgstr "oppose"
+msgid "approve"
+msgstr "approve"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
-msgstr "otr"
+msgid "concede"
+msgstr "concede"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
-msgstr "prefer"
+msgid "forbid"
+msgstr "forbid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
-msgstr "require"
+msgid "oppose"
+msgstr "oppose"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr "save"
+msgid "prefer"
+msgstr "prefer"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
-msgstr "stream"
-
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Bro_wse Rooms"
+msgid "require"
+msgstr "require"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2328
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "當我連線後自動加入此聊天室(_A)"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "聊天室:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "暱稱:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "最近:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "最近:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+msgid "Join this room _automatically when I connect"
+msgstr "當我連線後自動加入此聊天室(_A)"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-msgid "Room:"
-msgstr "聊天室:"
+msgid "_Bookmark this room"
+msgstr "將本聊天室加入書籤(_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "伺服器:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-msgid "_Bookmark this room"
-msgstr "將本聊天室加入書籤(_B)"
+msgid "Bro_wse Rooms"
+msgstr "Bro_wse Rooms"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "加入(_J)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "A_uto join"
-msgstr "自動聯結(_U)"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "如果選取，Gajim 會在啟動時加入此聊天室"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "書籤管理"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimi_ze on Auto Join"
-msgstr "自動聯結時縮到最小(_Z)"
+msgid "Roo_m:"
+msgstr "聊天室(_M):"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Title:"
+msgstr "標題(_T):"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Pr_int status:"
 msgstr "印出狀態(_I):"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Roo_m:"
-msgstr "聊天室(_M):"
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "A_uto join"
+msgstr "自動聯結(_U)"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "如果選取，Gajim 會在啟動時加入此聊天室"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "_Title:"
-msgstr "標題(_T):"
+msgid "Minimi_ze on Auto Join"
+msgstr "自動聯結時縮到最小(_Z)"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1500,122 +1537,127 @@ msgid "_Configure"
 msgstr "配置(_C)"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>屬性</b>"
+msgid "HTTP Connect"
+msgstr "HTTP 連線"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>設定</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP 連線"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "管理代理伺服器設定"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "類型(_T):"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "密碼(_W)"
+msgid "_Name:"
+msgstr "名稱(_N):"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "代理伺服器位址(_H):"
+msgid "<b>Properties</b>"
+msgstr "<b>屬性</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "代理伺服器連接埠(_P):"
+msgid "Use HTTP prox_y"
+msgstr "使用 HTTP 代理(_Y)"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "使用 HTTP 代理(_Y)"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "代理伺服器需要認證"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "使用者名稱(_U):"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Pass_word:"
+msgstr "密碼(_W)"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "名稱(_N):"
+msgid "Proxy _Host:"
+msgstr "代理伺服器位址(_H):"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "類型(_T):"
+msgid "Proxy _Port:"
+msgstr "代理伺服器連接埠(_P):"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "使用者名稱(_U):"
+msgid "<b>Settings</b>"
+msgstr "<b>設定</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "管理聯絡人(_M)"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "密文"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;empty&gt;"
+msgid "Plugins"
+msgstr "外掛程式"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<empty>"
+msgid "Install from zip"
+msgstr "從 zip 檔安裝"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "作者:"
+msgid "&lt;empty&gt;"
+msgstr "&lt;empty&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Configure"
-msgstr "配置"
+msgid "Version:"
+msgstr "版本:"
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Description:"
-msgstr "描述:"
+msgid "<empty>"
+msgstr "<empty>"
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Homepage:"
-msgstr "首頁:"
+msgid "Authors:"
+msgstr "作者:"
 
 #: ../data/gui/plugins_window.ui.h:7
-msgid "Install from zip"
-msgstr "從 zip 檔安裝"
+msgid "Homepage:"
+msgstr "首頁:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Installed"
-msgstr "已安裝"
+msgid "homepage url"
+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 "Description:"
+msgstr "描述:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid "Plugins"
-msgstr "外掛程式"
-
-#: ../data/gui/plugins_window.ui.h:11
 msgid "Uninstall"
 msgstr "卸載"
 
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Configure"
+msgstr "配置"
+
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Version:"
-msgstr "版本:"
+msgid "Installed"
+msgstr "已安裝"
 
 #: ../data/gui/plugins_window.ui.h:13
-msgid "homepage url"
-msgstr "首頁連結"
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr "外掛程式的描述會被顯示在這裡。這些文字在外掛程式視窗初始化時將被去除"
 
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
@@ -1626,984 +1668,994 @@ msgid "Event desc"
 msgstr "事件"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>進階配置編輯器</b>"
+msgid "Use default applications"
+msgstr "使用預設的應用程式"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>應用程式</b>"
+msgid "Custom"
+msgstr "自訂"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>音訊</b>"
+msgid "All chat states"
+msgstr "所有聊天狀態"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>自動調整狀態</b>"
+msgid "Composing only"
+msgstr "僅正在編輯"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>聊天視窗外觀</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "停用"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>聊天視窗中文字顏色</b>"
+msgid "Never"
+msgstr "永遠不"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>聊天狀態提示</b>"
+msgid "Only when pending events"
+msgstr "僅當有未處理的事件時"
 
 #: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>連線</b>"
+msgid "Always"
+msgstr "總是"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "彈出提示"
 
-#. 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>"
+msgid "Notify me about it"
+msgstr "提醒我"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>字型</b>"
+msgid "Show only in roster"
+msgstr "只顯示在聯絡人清單中"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail 選項</b>"
+msgid "Detached roster with detached chats"
+msgstr "聊天視窗與聯絡人清單分離，且互相分離"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "單一聊天視窗，與聯絡人清單分離"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>預設狀態訊息</b>"
+msgid "Single window for everything"
+msgstr "只使用單一視窗"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>隱私策略</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "聊天視窗與聯絡人清單分離，依據帳號分組"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>聯絡人清單外觀</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "聊天視窗與聯絡人清單分離，依據類型分組"
 
 #: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>聲音</b>"
+msgid "Last state"
+msgstr "最後狀態"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>狀態訊息</b>"
+msgid "Preferences"
+msgstr "參數"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>主題</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>視訊</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"如果選取，Gajim 會在聯絡人清單和多人聊天視窗中顯示聯絡人清單中的聯絡人細節"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>可視化提示</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(例如: stunserver.org)</i>"
+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:23
-msgid "Advanced"
-msgstr "進階"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "在聯絡人清單中顯示聯絡人的位置資訊(_L)"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "All chat states"
-msgstr "所有聊天狀態"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "Allow _OS information to be sent"
-msgstr "允許傳送關於作業系統的資訊(_O)"
+msgid "Sort contacts by status"
+msgstr "將聯絡人按狀態排序"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow my _idle time to be sent"
-msgstr "允許傳送關於閒置時間的資訊(_I)"
+msgid "in _roster"
+msgstr "在聯絡人清單中(_R)"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
+msgid "in _group chats"
+msgstr "在多人聊天視窗中(_G)"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow sound when I'm _busy"
-msgstr "在我忙碌時允許播放聲音(_B)"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>聯絡人清單外觀</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Always"
-msgstr "總是"
+msgid "_Window behavior:"
+msgstr "視窗行為(_W)"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Ask status message when I:"
-msgstr "詢問狀態訊息，當我:"
+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:31 ../src/features_window.py:106
-msgid "Audio / Video"
-msgstr "音訊/視訊"
+#: ../data/gui/preferences_window.ui.h:31
+msgid "_Emoticons:"
+msgstr "表情(_E):"
 
 #: ../data/gui/preferences_window.ui.h:32
-msgid "Audio input device"
-msgstr "音訊輸入裝置"
+msgid "Ma_ke message windows compact"
+msgstr "使訊息視窗精簡(_K)"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio output device"
-msgstr "音訊輸出裝置"
+msgid "Hide all buttons in chat windows"
+msgstr "在聊天視窗中隱藏所有按鈕"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Chat message:"
-msgstr "聊天訊息:"
+msgid "_Ignore rich content in incoming messages"
+msgstr "忽略收到的訊息中的富文字內容(_I)"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "在啟動是偵測 Gajim 是否是預設的 Jabber 客戶端程式"
+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:36
-msgid "Composing only"
-msgstr "僅正在編輯"
+msgid "_Highlight misspelled words"
+msgstr "拼寫檢查(_H)"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Configure color and font of the interface"
-msgstr "配置介面顏色與字型"
+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 會在聊天視窗中將編輯框中的拼寫錯誤高亮度顯示。如果沒有通\n"
+"過在編輯框點擊右鍵的方式明確設定語言，聯絡人或聊天室的預設語言將被\n"
+"使用。"
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Contact's message:"
-msgstr "聯絡人訊息:"
+msgid "_Show roster on startup:"
+msgstr "啟動時顯示名冊(_S):"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's nickname:"
-msgstr "聯絡人暱稱"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "收到任意多人聊天訊息播放的聲音。"
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Custom"
-msgstr "自訂"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Detached roster with chat grouped by account"
-msgstr "聊天視窗與聯絡人清單分離，依據帳號分組"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>聊天視窗外觀</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by type"
-msgstr "聊天視窗與聯絡人清單分離，依據類型分組"
+msgid "When new event is received:"
+msgstr "當收到新的事件:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with detached chats"
-msgstr "聊天視窗與聯絡人清單分離，且互相分離"
+msgid "Notify me about contacts that sign _in"
+msgstr "提醒我聯絡人登入(_I)"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with single chat"
-msgstr "單一聊天視窗，與聯絡人清單分離"
+msgid "Notify me about contacts that sign _out"
+msgstr "提醒我聯絡人登出(_O)"
 
-#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
-#: ../src/config.py:672
-msgid "Disabled"
-msgstr "停用"
+#: ../data/gui/preferences_window.ui.h:45
+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:46
-msgid "Display _activity of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的活動(_A)"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _extra email details"
-msgstr "顯示額外的郵件資訊(_E)"
+msgid "Notify on new _GMail email"
+msgstr "新 Gmail 郵件通知"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _location of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的位置資訊(_L)"
+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:49
-msgid "Display _tunes of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人正在播放音樂的資訊(_T)"
+msgid "Display _extra email details"
+msgstr "顯示額外的郵件資訊(_E)"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display a_vatars of contacts in roster"
-msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr "如果選取，Gajim 將同時包含新電子郵件傳送者的資訊"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display m_ood of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的心情(_O)"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail 選項</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display status _messages of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
+msgid "Show notification area icon:"
+msgstr "在通知區域顯示圖示:"
 
 #: ../data/gui/preferences_window.ui.h:53
-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 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定您想在聊天\n"
-"視窗中顯示的聊天狀態資訊。"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>可視化提示</b>"
 
 #: ../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 "
-"send to the other party."
-msgstr ""
-"Gajim 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定要發給第三方的"
-"聊天狀態資訊。"
+msgid "Play _sounds"
+msgstr "播放聲音(_S)"
 
 #: ../data/gui/preferences_window.ui.h:55
-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 "Ma_nage..."
+msgstr "管理(_N)…"
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "在我忙碌時允許播放聲音(_B)"
 
 #: ../data/gui/preferences_window.ui.h:57
-msgid "Hide all buttons in chat windows"
-msgstr "在聊天視窗中隱藏所有按鈕"
+msgid "<b>Sounds</b>"
+msgstr "<b>聲音</b>"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
+msgid "Notifications"
+msgstr "通知"
 
 #: ../data/gui/preferences_window.ui.h:59
 msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr "如果選取，Gajim 將同時包含新電子郵件傳送者的資訊"
+"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 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定您想在聊天\n"
+"視窗中顯示的聊天狀態資訊。"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr "如果選取，Gajim 在電腦閒置時會將您的狀態設定為離開。"
+msgid "_Display chat state notifications:"
+msgstr "顯示聊天狀態資訊(_D):"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr "如果選取，Gajim 會在電腦閒置更長時間後將您的狀態設定為離開很久了。"
+"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:62
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"如果選取，Gajim 會在聯絡人清單和多人聊天視窗中顯示聯絡人清單中的聯絡人細節"
+msgid "_Send chat state notifications:"
+msgstr "傳送聊天狀態資訊(_S):"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"如果選取，Gajim 會在聯絡人清單和多人聊天視窗中聯絡人名稱下方顯示聯絡人狀態訊"
-"息"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>聊天狀態提示</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的活動。"
+msgid "Personal Events"
+msgstr "個人事件"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的位置。"
+msgid "_Away after:"
+msgstr "在此時間後設定狀態為離開(_A):"
 
 #: ../data/gui/preferences_window.ui.h:66
 msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "如果選取，Gajim 在電腦閒置時會將您的狀態設定為離開。"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人正在播放的音樂。"
+msgid "_Not available after:"
+msgstr "在此時間後設定狀態為離開很久了(_N):"
 
 #: ../data/gui/preferences_window.ui.h:68
 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 會在聊天視窗中將編輯框中的拼寫錯誤高亮度顯示。如果沒有通\n"
-"過在編輯框點擊右鍵的方式明確設定語言，聯絡人或聊天室的預設語言將被\n"
-"使用。"
+"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:69
-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 "minutes"
+msgstr "分鐘"
 
 #: ../data/gui/preferences_window.ui.h:70
 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 加密時，必須對方同意\n"
-"記錄，否則 Gajim 不會記錄。"
-
-#: ../data/gui/preferences_window.ui.h:71
-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:72
-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...)"
+"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 會以協定特定的方式顯示狀態圖示。(例如，MSN 聯絡人會以同\n"
-"MSN 相同的圖示顯示線上，離開，忙，等等狀態…)"
+"離開狀態的自動訊息。如果為空，Gajim 不會變更目前的狀態訊息\n"
+"$S會被上個狀態訊息替換\n"
+"$T會被自動離開的逾時時間替換"
 
 #: ../data/gui/preferences_window.ui.h:73
 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:74
-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:75
-msgid "Last state"
-msgstr "最後狀態"
+"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"
+"$S會被上個狀態訊息替換\n"
+"$T會被自動無法使用的逾時時間替換"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "記錄加密的作業階段(_E)"
+msgid "<b>Auto Status</b>"
+msgstr "<b>自動調整狀態</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "使訊息視窗精簡(_K)"
+msgid "Ask status message when I:"
+msgstr "詢問狀態訊息，當我:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "管理(_N)…"
+msgid "Sign _in"
+msgstr "登入(I)"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Never"
-msgstr "永遠不"
+msgid "Sign _out"
+msgstr "離開登入(_O)"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-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:81
-msgid "Notify me about contacts that sign _in"
-msgstr "提醒我聯絡人登入(_I)"
+msgid "<b>Status Messages</b>"
+msgstr "<b>狀態訊息</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "提醒我聯絡人登出(_O)"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>預設狀態訊息</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-msgid "Notify me about it"
-msgstr "提醒我"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "狀態"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "新 Gmail 郵件通知"
+msgid "Use system _default"
+msgstr "使用系統預設(_D)"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr "僅當有未處理的事件時"
+msgid "Chat message:"
+msgstr "聊天訊息:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "個人事件"
+msgid "<b>Font</b>"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "播放聲音(_S)"
+msgid "Use _transports icons"
+msgstr "使用代理的圖示設定(_T)"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
-msgstr "彈出提示"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"如果選取，Gajim 會以協定特定的方式顯示狀態圖示。(例如，MSN 聯絡人會以同\n"
+"MSN 相同的圖示顯示線上，離開，忙，等等狀態…)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "參數"
+msgid "Status _iconset:"
+msgstr "狀態圖示集(_I):"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr "STUN 伺服器的主機名稱。如果沒有給出，Gajim 會嘗試從伺服器上發現一個。"
+msgid "Configure color and font of the interface"
+msgstr "配置介面顏色與字型"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "主題:(_H)"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "STUN 伺服器:"
+msgid "<b>Themes</b>"
+msgstr "<b>主題</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr "在通知區域顯示圖示:"
+msgid "Contact's nickname:"
+msgstr "聯絡人暱稱"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid "Show only in roster"
-msgstr "只顯示在聯絡人清單中"
+msgid "Your nickname:"
+msgstr "您的暱稱:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "登入(I)"
+msgid "_Status message:"
+msgstr "狀態訊息:(_S)"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "離開登入(_O)"
+msgid "_URL highlight:"
+msgstr "URL 高亮度顯示:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr "只使用單一視窗"
+msgid "_Reset to Default Colors"
+msgstr "恢復為預設顏色設定(_R)"
 
 #: ../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 將顯示原本的訊息"
-"內容。"
+msgid "Contact's message:"
+msgstr "聯絡人訊息:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "將聯絡人按狀態排序"
+msgid "Your message:"
+msgstr "您的訊息:"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
-msgid "Status"
-msgstr "狀態"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "多人聊天訊息高亮度顯示"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "狀態圖示集(_I):"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>聊天視窗中文字顏色</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "風格"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "主題:(_H)"
+msgid "Audio input device"
+msgstr "音訊輸入裝置"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"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"
-"$S會被上個狀態訊息替換\n"
-"$T會被自動離開的逾時時間替換"
+msgid "Audio output device"
+msgstr "音訊輸出裝置"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "<b>Audio</b>"
+msgstr "<b>音訊</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
+msgstr "視訊輸入裝置"
 
 #: ../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"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
-msgstr ""
-"離開很久的自動訊息。如果為空，Gajim 不會變更目前的狀態訊息\n"
-"$S會被上個狀態訊息替換\n"
-"$T會被自動無法使用的逾時時間替換"
+msgid "Video output device"
+msgstr "視訊輸出裝置"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr "視訊圖框速率"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
+msgstr "視訊尺寸"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "使用代理的圖示設定(_T)"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr "使用預設的應用程式"
+msgid "<b>Video</b>"
+msgstr "<b>視訊</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "使用系統預設(_D)"
+msgid "STUN server:"
+msgstr "STUN 伺服器:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr "視訊圖框速率"
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(例如: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr "視訊輸入裝置"
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
-msgstr "視訊輸出裝置"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr "STUN 伺服器的主機名稱。如果沒有給出，Gajim 會嘗試從伺服器上發現一個。"
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr "視訊尺寸"
+msgid "<b>Connection</b>"
+msgstr "<b>連線</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "當收到新的事件:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr "音訊/視訊"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "您的訊息:"
+msgid "_File manager:"
+msgstr "檔案管理器:(_F)"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "您的暱稱:"
+msgid "_Mail client:"
+msgstr "郵件客戶端(_M):"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "在此時間後設定狀態為離開(_A):"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "顯示聊天狀態資訊(_D):"
+msgid "<b>Custom</b>"
+msgstr "<b>自訂</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "表情(_E):"
+msgid "<b>Applications</b>"
+msgstr "<b>應用程式</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "檔案管理器:(_F)"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "忽略聯絡人清單以外的聯絡人觸發的事件(_I)"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "拼寫檢查(_H)"
+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:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "忽略聯絡人清單以外的聯絡人觸發的事件(_I)"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "允許傳送關於作業系統的資訊(_O)"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "忽略收到的訊息中的富文字內容(_I)"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "記錄聯絡人狀態變化(_L)"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "允許傳送關於作業系統的資訊(_O)"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "郵件客戶端(_M):"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "在此時間後設定狀態為離開很久了(_N):"
+msgid "Log _encrypted chat session"
+msgstr "記錄加密的作業階段(_E)"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "開啟(_O)…"
+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 加密時，必須對方同意\n"
+"記錄，否則 Gajim 不會記錄。"
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "恢復為預設顏色設定(_R)"
+msgid "Allow my _idle time to be sent"
+msgstr "允許傳送關於閒置時間的資訊(_I)"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "傳送聊天狀態資訊(_S):"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Show roster on startup:"
-msgstr "啟動時顯示名冊(_S):"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Status message:"
-msgstr "狀態訊息:(_S)"
+msgid "<b>Privacy</b>"
+msgstr "<b>隱私策略</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_URL highlight:"
-msgstr "URL 高亮度顯示:"
+msgid "_Log status changes of contacts"
+msgstr "記錄聯絡人狀態變化(_L)"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "_Window behavior:"
-msgstr "視窗行為(_W)"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _group chats"
-msgstr "在多人聊天視窗中(_G)"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "在啟動是偵測 Gajim 是否是預設的 Jabber 客戶端程式"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "in _roster"
-msgstr "在聯絡人清單中(_R)"
+msgid "_Open..."
+msgstr "開啟(_O)…"
 
 #: ../data/gui/preferences_window.ui.h:140
-msgid "minutes"
-msgstr "分鐘"
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>進階配置編輯器</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "進階"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "隱私策略清單:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>加入/編輯規則</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "隱私策略清單"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>規則清單</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>隱私策略清單</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "為此作業階段啟用"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "每次啟動時啟用"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>規則清單</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "全部"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>加入/編輯規則</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "全部(包含認證)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "允許"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "JabberID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "所有在群組中的"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Order:"
+msgid "all by subscription"
+msgstr "所有(除了認證)"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3966
-msgid "Privacy List"
-msgstr "隱私策略清單"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "全部"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "所有(除了認證)"
+msgid "to send me messages"
+msgstr "向我傳送訊息"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "所有在群組中的"
+msgid "to send me queries"
+msgstr "向我傳送查詢"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "both"
+msgid "to view my status"
+msgstr "檢視我的狀態"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "from"
+msgid "to send me status"
+msgstr "向我傳送狀態"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "none"
+msgid "All (including subscription)"
+msgstr "全部(包含認證)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "to"
+msgid "Order:"
+msgstr "Order:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "向我傳送訊息"
+msgid "none"
+msgstr "none"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "向我傳送查詢"
+msgid "both"
+msgstr "both"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "向我傳送狀態"
+msgid "from"
+msgstr "from"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "檢視我的狀態"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>位址</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>頭像:</b>"
+msgid "to"
+msgstr "to"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>生日:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>城市:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>姓:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>公司:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Country:</b>"
-msgstr "<b>國家:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>中間名稱:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>Department:</b>"
-msgstr "<b>部門:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>字首:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:13
-msgid "<b>Extra Address:</b>"
-msgstr "<b>附加位址:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>名稱:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:15
-msgid "<b>Family:</b>"
-msgstr "<b>姓:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>字尾:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>全名稱</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>街道:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Given:</b>"
-msgstr "<b>名稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>城市:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:19
-msgid "<b>Homepage:</b>"
-msgstr "<b>首頁:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>州:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>附加位址:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Middle:</b>"
-msgstr "<b>中間名稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>郵遞區號:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Name:</b>"
-msgstr "<b>名稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>國家:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Nickname:</b>"
-msgstr "<b>暱稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>位址</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Phone No.:</b>"
-msgstr "<b>電話號碼:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>首頁:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Position:</b>"
-msgstr "<b>職位:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>名稱:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:27
-msgid "<b>Postal Code:</b>"
-msgstr "<b>郵遞區號:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>暱稱:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>電話號碼:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:29
-msgid "<b>Prefix:</b>"
-msgstr "<b>字首:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "格式:  YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>Role:</b>"
-msgstr "<b>角色:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>生日:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:32
-msgid "<b>State:</b>"
-msgstr "<b>州:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:34
-msgid "<b>Street:</b>"
-msgstr "<b>街道:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>頭像:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "按一下以設定您的頭像"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:38
-msgid "<b>Suffix:</b>"
-msgstr "<b>字尾:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "個人資訊"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/profile_window.ui.h:30
 #: ../data/gui/vcard_information_window.ui.h:42
-msgid "About"
-msgstr "關於"
+msgid "<b>Company:</b>"
+msgstr "<b>公司:</b>"
+
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>職位:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "按一下以設定您的頭像"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>部門:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "Format: YYYY-MM-DD"
-msgstr "格式:  YYYY-MM-DD"
+#: ../data/gui/vcard_information_window.ui.h:45
+msgid "<b>Role:</b>"
+msgstr "<b>角色:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "Personal Info"
-msgstr "個人資訊"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "工作"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>您想要做什麼?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "關於"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "僅從 Gajim 移除帳號(_O)"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "同時從 Gajim 和伺服器移除帳號(_S)"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>您想要做什麼?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5639
-#: ../src/roster_window.py:5764 ../src/roster_window.py:5894
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "移除(_R)"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "聯絡人清單項交換"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 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 "訊息標準 <目前未被使用，因此會被自動隱藏>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "聯絡人清單項交換"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "加入聯絡人(_C)…"
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+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:2
-msgid "Fea_tures"
-msgstr "特性(_T)"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "檔案傳輸(_T)"
-
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "被頻繁提問的問題 (線上)"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "動作(_A)"
 
 #: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "線上求助"
+msgid "Add _Contact..."
+msgstr "加入聯絡人(_C)…"
 
-#: ../data/gui/roster_window.ui.h:8
-msgid "P_lugins"
-msgstr "外掛程式(_L)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "編輯(_E)"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "側寫，頭像(V)"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "帳號(_A)"
 
 #: ../data/gui/roster_window.ui.h:11
-msgid "Show Only _Active Contacts"
-msgstr "只顯示活動的聯絡人(_A)"
+msgid "Profile, A_vatar"
+msgstr "側寫，頭像(V)"
 
 #: ../data/gui/roster_window.ui.h:12
-msgid "Show Trans_ports"
-msgstr "顯示代理(_P)"
+msgid "P_lugins"
+msgstr "外掛程式(_L)"
 
 #: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "檢視(_V)"
+
+#: ../data/gui/roster_window.ui.h:14
 msgid "Show _Offline Contacts"
 msgstr "顯示離線聯絡人"
 
-#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
-msgid "Show _Roster"
-msgstr "顯示聯絡人清單(_R)"
-
 #: ../data/gui/roster_window.ui.h:15
-msgid "_Accounts"
-msgstr "帳號(_A)"
+msgid "Show Only _Active Contacts"
+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:16
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "動作(_A)"
+#, fuzzy
+msgid "Show T_ransports"
+msgstr "顯示代理(_P)"
+
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
+msgid "Show _Roster"
+msgstr "顯示聯絡人清單(_R)"
 
 #: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "檔案傳輸(_T)"
+
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "編輯(_E)"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "線上求助"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "常見問題(_A)"
 
-#: ../data/gui/roster_window.ui.h:22
-msgid "_Help"
-msgstr "求助(_H)"
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "被頻繁提問的問題 (線上)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "檢視(_V)"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "請等待，正在搜尋…"
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "特性(_T)"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "搜尋"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "請等待，正在搜尋…"
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "加入聯絡人(_C)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5906
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "搜尋(_S)"
 
@@ -2623,41 +2675,37 @@ msgstr "註冊到"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "回復本條訊息"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "到:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "傳送(_D)"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "傳送訊息"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "傳送訊息並關閉視窗"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "回復(_R)"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "到:"
+msgid "Reply to this message"
+msgstr "回復本條訊息"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "回復(_R)"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "傳送並關閉(_S)"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "傳送訊息並關閉視窗"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "授權(_T)"
+msgid "Subscription Request"
+msgstr "認證請求"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "向聯絡人授權則他/她將知道您是否線上"
+msgid "_Deny"
+msgstr "拒絕(_D)"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2665,259 +2713,269 @@ msgid ""
 "connected"
 msgstr "拒絕向聯絡人授權則他/她將無法知道您是否線上"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "認證請求"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "授權(_T)"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "拒絕(_D)"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "向聯絡人授權則他/她將知道您是否線上"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "同步聯絡人"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "選擇您想要與之同步的帳號"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "選擇您想要同步的聯絡人"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "同步: 選擇聯絡人"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "靜音"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "傳送單條訊息(_M)"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "顯示所有未處理事件(_E)"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "選擇您想要同步的聯絡人"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "狀態(_T)"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "多人聊天(_G)"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>請求:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "傳送單條訊息(_M)"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>客戶端:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "顯示所有未處理事件(_E)"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Configured avatar:</b>"
-msgstr "<b>已設定頭像:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "靜音"
 
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Contact time:</b>"
-msgstr "<b>聯絡人時間:</b>"
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "聯絡人資訊"
 
-#: ../data/gui/vcard_information_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>資源:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>狀態:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:36
-msgid "<b>Subscription:</b>"
-msgstr "<b>認證:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>客戶端:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:39
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>系統:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>聯絡人時間:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>User avatar:</b>"
 msgstr "<b>使用者頭像:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-msgid "Comments"
-msgstr "註釋"
+#: ../data/gui/vcard_information_window.ui.h:9
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>已設定頭像:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "聯絡人"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>認證:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:45
-msgid "Contact Information"
-msgstr "聯絡人資訊"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>請求:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "更多"
 
-#: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>過濾器</b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "聯絡人"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "註釋"
+
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber 通信</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML 輸入</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "隱藏 IN stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "隱藏 IQ stanzas"
+msgid "Hide OUT stanzas"
+msgstr "隱藏 OUT stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "隱藏 Message stanzas"
+msgid "Hide Presence stanzas"
+msgstr "隱藏 Presence stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "隱藏 OUT stanzas"
+msgid "Hide IQ stanzas"
+msgstr "隱藏 IQ stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "隱藏 Presence stanzas"
+msgid "Hide Message stanzas"
+msgstr "隱藏 Message stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "資訊/查詢"
+msgid "<b>Filter</b>"
+msgstr "<b>過濾器</b>"
 
 #. 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
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "資訊/查詢"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Presence"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Message"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Presence"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML 輸入</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "修改帳號(_M)…"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "本地 JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "個人"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "資源:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "一個 GTK+ 的 Jabber 客戶端"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "個人"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim 即時訊息軟體"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber 即時訊息客戶端"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "一個 GTK+ 的 Jabber 客戶端"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "取消確認"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "您正在執行一個命令。確定要取消嗎?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 msgid "Invalid Form"
 msgstr "不合法的格式"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 msgid "The form is not filled correctly."
 msgstr "表格沒有被正確地填寫。"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "服務傳送了異常的資料"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "服務變更了作業階段識別碼"
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "服務回傳了一個錯誤。"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "啟用的"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "未啟用的"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1050
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Color"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "類型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(無)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "隱藏"
 
@@ -2927,255 +2985,181 @@ msgid "You have received new entries (and %d not displayed):"
 msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "您收到了新的事件 (還有 %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)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:84
-msgid "English"
-msgstr "英語"
-
-#: ../src/chat_control.py:84
-msgid "Belarusian"
-msgstr "白俄語"
-
-#: ../src/chat_control.py:84
-msgid "Bulgarian"
-msgstr "保加利亞語"
-
-#: ../src/chat_control.py:84
-msgid "Breton"
-msgstr "布列塔尼語"
-
-#: ../src/chat_control.py:84
-msgid "Czech"
-msgstr "捷克語"
-
-#: ../src/chat_control.py:84
-msgid "German"
-msgstr "德語"
-
-#: ../src/chat_control.py:84
-msgid "Greek"
-msgstr "希臘語"
-
-#: ../src/chat_control.py:84
-msgid "British"
-msgstr "英語(英國)"
-
-#: ../src/chat_control.py:84
-msgid "Esperanto"
-msgstr "世界語"
-
-#: ../src/chat_control.py:84
-msgid "Spanish"
-msgstr "西班牙語"
-
-#: ../src/chat_control.py:84
-msgid "Basque"
-msgstr "巴斯克語"
-
-#: ../src/chat_control.py:84
-msgid "French"
-msgstr "法語"
-
-#: ../src/chat_control.py:84
-msgid "Croatian"
-msgstr "克羅埃西亞語"
-
-#: ../src/chat_control.py:84
-msgid "Italian"
-msgstr "義大利語"
-
-#: ../src/chat_control.py:84
-msgid "Norwegian (b)"
-msgstr "挪威語 (b)"
-
-#: ../src/chat_control.py:84
-msgid "Dutch"
-msgstr "荷蘭語"
-
-#: ../src/chat_control.py:84
-msgid "Norwegian"
-msgstr "挪威語"
-
-#: ../src/chat_control.py:84
-msgid "Polish"
-msgstr "波蘭語"
-
-#: ../src/chat_control.py:84
-msgid "Portuguese"
-msgstr "葡萄牙語"
-
-#: ../src/chat_control.py:84
-msgid "Brazilian Portuguese"
-msgstr "巴西葡萄牙語"
-
-#: ../src/chat_control.py:84
-msgid "Russian"
-msgstr "俄語"
-
-#: ../src/chat_control.py:84
-msgid "Serbian"
-msgstr "塞爾維亞語"
-
-#: ../src/chat_control.py:84
-msgid "Slovak"
-msgstr "斯洛伐克語"
-
-#: ../src/chat_control.py:84
-msgid "Swedish"
-msgstr "瑞典語"
-
-#: ../src/chat_control.py:84
-msgid "Chinese (Ch)"
-msgstr "漢語"
-
-#: ../src/chat_control.py:227
+#: ../src/chat_control.py:209
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/chat_control.py:232
+#: ../src/chat_control.py:214
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:237
+#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "錯誤。"
 
-#: ../src/chat_control.py:562
-msgid "Spelling language"
-msgstr "拼寫語言"
-
 #. we are not connected
-#: ../src/chat_control.py:594 ../src/chat_control.py:810
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "一個連線無法使用"
 
-#: ../src/chat_control.py:595 ../src/chat_control.py:811
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "連線之後您的訊息才能傳送"
 
-#: ../src/chat_control.py:1032
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "底線"
 
-#: ../src/chat_control.py:1033
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "劃去"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "字型"
 
-#: ../src/chat_control.py:1065
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "清楚格式"
 
-#: ../src/chat_control.py:1142
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "確定要傳送檔案?"
 
-#: ../src/chat_control.py:1143
+#: ../src/chat_control.py:1158
 #, 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:1623 ../src/chat_control.py:2135
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG 加密已啟用"
 
-#: ../src/chat_control.py:1644 ../src/chat_control.py:1647
-msgid "Requires python-farsight."
-msgstr "需要 python-farsight。"
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "這個聯絡人不支援檔案傳輸"
 
 #. Add to roster
-#: ../src/chat_control.py:1673 ../src/common/contacts.py:149
-#: ../src/common/contacts.py:270 ../src/common/helpers.py:60
-#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2222
-#: ../src/dialogs.py:2251 ../src/gui_interface.py:467
-#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
-#: ../src/roster_window.py:1644 ../src/roster_window.py:1646
-#: ../src/roster_window.py:1979 ../src/roster_window.py:3507
-#: ../src/roster_window.py:3534
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "不在聯絡人清單中"
 
-#: ../src/chat_control.py:1704
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "切換語音作業階段"
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "切換視訊作業階段"
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "特性在 Windows 下無法使用。"
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "傳送檔案(_F)"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "這個聯絡人不支援檔案傳輸"
 
-#: ../src/chat_control.py:1707
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "您需要知道這個聯絡人的真實 JID 才能向他/她傳送檔案。"
 
-#: ../src/chat_control.py:1814
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 狀態: %(state)s，原因: %(reason)s"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2098
 #, 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:2115 ../src/dialogs.py:5027
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "沒有指定 GPG 密鑰"
 
-#: ../src/chat_control.py:2116
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr "尚未為這個聯絡人指定 GPG 密鑰。因此您不能用 GPG 加密資訊。"
 
-#: ../src/chat_control.py:2125
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG 加密已停用"
 
-#: ../src/chat_control.py:2151
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "作業階段將被記錄"
 
-#: ../src/chat_control.py:2153
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "作業階段將不會被記錄"
 
 #. encryption %s active
-#: ../src/chat_control.py:2170
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "是"
 
-#: ../src/chat_control.py:2170
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "不是"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2172
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "會"
 
-#: ../src/chat_control.py:2172
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "不會"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2176
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "且已被認證"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2180
+#: ../src/chat_control.py:2294
 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:2187
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3184,69 +3168,68 @@ msgstr ""
 "%(type)s 加密 %(status)s 活動 %(authenticated)s。\n"
 "您的聊天作業階段 %(logged)s 將被記錄。"
 
-#: ../src/chat_control.py:2331
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "作業階段協商已取消"
 
-#: ../src/chat_control.py:2341
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr "本次作業階段將在伺服器上被存檔"
 
-#: ../src/chat_control.py:2343
+#: ../src/chat_control.py:2451
 msgid "This session WILL NOT be archived on server"
 msgstr "本次作業階段將不會在伺服器上被存檔"
 
-#: ../src/chat_control.py:2352
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "本次作業階段已被加密"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "且會被記錄"
 
-#: ../src/chat_control.py:2357
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "且不會被記錄"
 
-#: ../src/chat_control.py:2362
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "遠端聯絡人的身分未確認。點擊盾型按鈕檢視詳情。"
 
-#: ../src/chat_control.py:2364
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E 加密被停用"
 
-#: ../src/chat_control.py:2408 ../src/chat_control.py:2421
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "下面的訊息沒有被加密"
 
-#: ../src/chat_control.py:2414
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "下面的訊息是加密的"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2685
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "您剛剛收到一條來自 \"%s\" 的訊息"
 
-#: ../src/chat_control.py:2686
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您關閉此標籤並且停用了命令歷程，此訊息會丟失。"
 
-#: ../src/chat_control.py:2853 ../src/common/connection_handlers_events.py:864
-#: ../src/common/connection_handlers.py:945
-#: ../src/common/connection_handlers.py:1055
-#: ../src/common/connection_handlers.py:1712 ../src/common/connection.py:451
-#: ../src/common/logger.py:1126 ../src/gajim.py:208 ../src/session.py:97
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "資料庫錯誤"
 
-#: ../src/chat_control.py:2854
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3254,7 +3237,7 @@ msgid ""
 msgstr ""
 "資料庫檔案 (%s) 不能被讀取。請嘗試修復它或是移除它(所有命令歷程記錄會丟失)。"
 
-#: ../src/chat_control.py:3090 ../src/gui_interface.py:1032
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3263,128 +3246,410 @@ msgstr ""
 "無法解密來自 %s 的訊息\n"
 "它可能被篡改了。"
 
-#: ../src/chat_control.py:3123
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s 的狀態是 %(status)s"
 
-#: ../src/common/check_paths.py:38
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "檔案傳輸"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "大小:  %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "帳號(_A)"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "檔案傳輸已完成"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "多人聊天邀請"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "遠端聯絡人停止了傳輸"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "開啟檔案錯誤"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "檔案傳輸已停止"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "檔案傳輸已取消"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "無法與對方建立連線。"
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "向聯絡人傳送檔案"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr " %s 找不到"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "離開"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "離開很久了"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "隱藏該視窗"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "切換Open_PGP加密"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "向聯絡人傳送檔案"
+
+#: ../src/command_system/implementation/standard.py:198
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s 不是一個合法的日誌層級"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "一個連線無法使用"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "連線無法使用"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "變更您的暱稱(Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "無效的暱稱"
+
+#: ../src/command_system/implementation/standard.py:284
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "要使用的暱稱"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "關閉多人聊天標籤/視窗前詢問。"
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "傳送 %s 給 %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "您被邀請到一個聊天室"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "無效的伺服器"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "歸屬變更"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s 不是一個聊天室的名稱。"
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "缺失的\"聯絡人 JID\"參數"
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "建立日誌資料庫"
 
-#: ../src/common/check_paths.py:86
+#: ../src/common/check_paths.py:87
 msgid "creating cache database"
 msgstr "建立快取資料庫"
 
-#: ../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:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一個檔案但它應該是一個目錄"
 
-#: ../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:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
+#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim 即將離開"
 
-#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一個目錄但它應該是一個檔案"
 
-#: ../src/common/check_paths.py:352
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目錄"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "變更狀態資訊"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "變更狀態"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "設定狀態類型與描述"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "線上"
 
-#: ../src/common/commands.py:106 ../src/common/helpers.py:242
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "離開"
-
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "離開很久了"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "請無打擾"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "離線 - 未連線"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "狀態描述:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "狀態發生了變化。"
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "離開聊天室"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "聊天室 %(room_jid)s 的 %(nickname)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "您還沒有加入聊天室。"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 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:128
-#: ../src/common/helpers.py:60 ../src/roster_window.py:817
-#: ../src/roster_window.py:1648 ../src/roster_window.py:1650
-#: ../src/roster_window.py:2512 ../src/roster_window.py:5524
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "多人聊天"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "您離開了下列聊天室:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "轉發未讀訊息"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "所有未讀訊息都已被轉發。"
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr " 轉發未讀訊息然後中斷連線"
 
@@ -3409,7 +3674,8 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (離開，因為閒置超過了$T分鐘)"
 
 #: ../src/common/config.py:83
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動離開的時間替換。"
 
 #: ../src/common/config.py:85
@@ -3421,7 +3687,8 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (離開很久了，因為閒置超過了$T分鐘)"
 
 #: ../src/common/config.py:86
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動無法使用的時間替換。"
 
 #: ../src/common/config.py:89
@@ -3454,42 +3721,92 @@ msgid "Status message text color."
 msgstr "狀態訊息文字顏色"
 
 #: ../src/common/config.py:102
+msgid "Contact signed in notification color."
+msgstr ""
+
+#. limegreen
+#: ../src/common/config.py:103
+msgid "Contact signout notification color"
+msgstr ""
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "在彈出提示中預覽訊息?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "檔案傳輸請求"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "檔案傳輸已取消"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "當檔案傳輸完成時彈出提示"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "多人聊天邀請"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "收到訊息的暱稱的字型。"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "發出訊息的暱稱字型。"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "收到訊息的文字字型。"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "發出訊息的文字字型。"
 
-#: ../src/common/config.py:106
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "狀態訊息文字字型。"
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折疊的列(帳號和組)的清單(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:108 ../src/common/config.py:496
-#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
-#: ../src/common/optparser.py:526 ../src/gui_interface.py:2634
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "預設"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "拼寫檢查的語言"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3499,7 +3816,7 @@ msgstr ""
 "'有時' - 如 iChat 風格每隔幾分鐘顯示時間。\n"
 "'永遠不' - 永遠不顯示時間。"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:125
 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. "
@@ -3508,16 +3825,16 @@ msgstr ""
 "使用模糊時鐘列印時間。模糊度的值從 1 到 4，或是 0 停用模糊時鐘。1 是最精確的"
 "時鐘，4 是最不精確的。只在'有時'顯示時間時使用。"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "將成對出現的 * / _ 視為可能的格式控制字元。"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果為真，則不移除 */_。這樣 *abc* 將被加粗但 * * 不會被移除。"
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3527,25 +3844,26 @@ msgstr ""
 "考http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果\n"
 "您想使用此功能，請安裝 docutils)"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "當在多人聊天中使用暱稱補全(Tab)時加到暱稱後的字元。"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:142
 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:151
+#: ../src/common/config.py:160
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
+"If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr "如果為真，當隱藏名冊時 Gajim 將會儲存名冊位置，並於顯示名冊時還原。"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3555,67 +3873,70 @@ msgstr ""
 "\"[小時:分鐘]\"。請參考 Python doc 關於 strftime 的文件:\n"
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "在對話中顯示在暱稱前的字元"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "在對話中顯示在暱稱後的字元"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:177
 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:169
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "在聯絡人清單標題中加入 * 和 [n]?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr "聊天標籤/視窗被重新開啟時顯示之前進行的對話的最後多少列。"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "上次談話的最後幾列保留多少分鐘。"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:182
+#, fuzzy
 msgid ""
-"How many lines to request to server when entering a groupchat. -1 means no "
+"How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:183
+#, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:184
 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:175
+#: ../src/common/config.py:185
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr "當我們從會議中被踢出時，是否應該啟用自動重新加入？"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+Enter 傳送訊息，Enter 開始新列(紫茉莉 ICQ 客戶端預設作業)。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "為 Ctrl+KeyUP 儲存多少列。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3623,11 +3944,11 @@ msgid ""
 msgstr ""
 "自訂位址，在其中應包含 %s，%s 是單字/片語; 或'WIKTIONARY'以使用 wiktionary。"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果選取，Gajim 可以被 gajim-remote 遠端控制。"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:195
 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 "
@@ -3638,48 +3959,51 @@ msgstr ""
 "態(如果它們沒有將 listen_to_network_manager 設定為假而且它們被設定為與\n"
 "全域狀態同步)。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr "在聊天視窗中顯示聊天狀態通知。可以是全部，近正在編輯，停用中的一個。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr "當不是每條訊息都顯示時間('有時'顯示時間)時，每多少分鐘顯示時間。"
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "關閉多人聊天標籤/視窗前詢問。"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前總是詢問。"
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前永遠不詢問。"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "如果有可能丟失資料的控制項(不會被最小化的聊天，私人聊天，多人聊天)，在關\n"
 "閉有標籤的視窗前詢問。"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3687,27 +4011,33 @@ msgstr ""
 "逗號分割的清單。在有位址翻譯/連接埠轉發的情況下，除了本地介面，還將向其中\n"
 "的主機傳送檔案傳輸請求。"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規定 1 KiB = 1024 bytes(位元組)，1 KB = 1000 bytes。"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "在通知區域中提示事件"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "只有一個對話時顯示標籤?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天視窗中顯示標籤組的邊框。"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "在標籤上顯示關閉按鈕?"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:220
 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 "
@@ -3718,16 +4048,16 @@ msgstr ""
 "法的組有 1，2，5，14，15，16，17 和 18。更高的數字更安全，但在您開始會\n"
 "話時需要更長的時間計算"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "在彈出提示中預覽訊息?"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分號隔開的在多人聊天中將高亮度顯示的單字清單。"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:247
 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."
@@ -3735,12 +4065,12 @@ msgstr ""
 "如果為真，按一下視窗管理器的 X 按鈕會離開 Gajim。此一設定僅當啟用通知區域圖示"
 "時會生效。"
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "如果為真， Gajim 會在每次啟動時偵測它是否是預設的 jabber 客戶端。"
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3748,7 +4078,7 @@ msgstr ""
 "如果為真， Gajim 會在每個含有未讀訊息的標籤上顯示一個圖示。根據主題，該圖示可"
 "能是動態的。"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3756,11 +4086,11 @@ msgstr ""
 "如果為真， Gajim 將在聯絡人清單視窗中每一個聯絡人名稱的下方顯示狀態資訊(如果"
 "不為空)。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "定義了在聯絡人清單中頭像的顯示位置。可以是左或右"
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:257
 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."
@@ -3768,7 +4098,7 @@ msgstr ""
 "如過為真，Gajim 會向每一個快取的頭像太久或上次未能獲得其頭像的聯絡人請求頭"
 "像。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:258
 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."
@@ -3776,9 +4106,10 @@ msgstr ""
 "如果為假，Gajim 將不會在聯絡人的狀態或狀態訊息變化時在聊天視窗中顯示一列提"
 "示。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
@@ -3790,32 +4121,32 @@ msgstr ""
 "有的狀態訊息。如果是\"登入與登出\"，Gajim 將只提示聊天室中中登入與登出\n"
 "訊息。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:261
 msgid "Log XHTML messages instead of plain text messages."
 msgstr "記錄 XHTML 訊息以代替純文字訊息。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "當聯絡人剛剛登入時的背景色。"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "當聯絡人剛剛登出時的背景色。"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "如果為真，恢復顯示的訊息將用較小的字型顯示。"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "不顯示代理本身的頭像。"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "不要將聯絡人清單視窗顯示在系統的工作列中。"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:268
 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 "
@@ -3824,7 +4155,7 @@ msgstr ""
 "如果為真並且安裝的 GTK+ 和 PyGTK 的版本至少為 2.8，當有未處理事件時使窗\n"
 "口閃爍(大部分視窗管理器的預設回應)"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:270
 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 "
@@ -3834,7 +4165,8 @@ msgstr ""
 "\"以停止在多人聊天中傳送 SHA 資訊。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:250
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3842,7 +4174,7 @@ msgid ""
 "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 "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "控制新訊息被放置的視窗。\n"
@@ -3853,7 +4185,7 @@ msgstr ""
 "'peracct' - 每個帳號的訊息傳送到一個單獨的視窗。\n"
 "'pertype' - 每種類型的訊息 (例如，聊天 及 多人聊天) 傳送到一個單獨的視窗。"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:274
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -3865,74 +4197,74 @@ msgstr ""
 "「永不」- 永不顯示名冊。\n"
 "「last_state」- 還原最後狀態名冊。"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如果為假，您將不會在視窗中看到頭像。"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如果為真，按 Escape 鍵將關閉標籤/視窗。"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "在聊天視窗中隱藏按鈕。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "在多人聊天視窗中隱藏標語"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "在雙人聊天視窗中隱藏標語"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在多人聊天視窗中隱藏室友清單。"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:281
 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:259
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "當合併連續暱稱時縮排。"
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "平滑捲動聊天視窗中的訊息"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "在多人聊天中用於暱稱的顏色清單，以\":\"分隔。"
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "當所有分頁中沒有未讀訊息時按 Ctrl-Tab 轉到下一個正在編輯的標籤。"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr "是否顯示確認元聯絡人建立對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否顯示確認阻斷聯絡人對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否顯示確認傳送自訂狀態對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:289
 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 "
@@ -3941,74 +4273,60 @@ msgstr ""
 "如果為真，您將可以在修改帳號視窗中為您的帳號可以設定一個負的優先等級。注意!當"
 "您使用負的優先等級登入時您將不能從伺服器收到任何訊息。"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr "如果為真，Gajim 會使用 Gnome Keyring (如果可用) 儲存帳號的密碼。"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:291
 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:269
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr "如果為真，Gajim 會在帳號和群組所在列顯示線上和總共聯絡人數目。"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:293
 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:271
+#: ../src/common/config.py:294
 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:272
-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:273
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "時間，如果在此時間內沒有活動，將變更狀態視窗關閉。"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在對話中最多顯示的列數。最舊的那些列會被清除。"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:297
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr "如果為真，由 notification-daemon 建立的提示視窗會依附於通知區域圖示。"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr "兩次檢查閒置之間的時間間隔。"
 
-#: ../src/common/config.py:277
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr "變更這個值以變更顯示的 LaTeX 方程的大小。更高則更大。"
-
-#: ../src/common/config.py:278
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4016,33 +4334,38 @@ msgstr ""
 "合法的 URI Scheme。只有這個清單中的 Scheme 會被接受為\"真正的\" URI。(mailto "
 "和 xmpp 被分開處理)"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:300
+#, fuzzy
 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!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "請求所有離線聯絡人的離線狀態訊息，當一個帳號建立連線時。警告: 這會傳送大量的"
 "請求!"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "如果為真，多人聊天中會像 shell 一樣自動補全"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr "何時顯示自己。可以是\"總是\"，\"當用其他資源連線時\"或\"永遠不\""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr "可選地修正 jingle 視訊輸出的圖框速率。比如: 10/1 或 25/2"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "可選地縮放 jingle 視訊輸出尺寸。比如: 320x240"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 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."
@@ -4050,23 +4373,46 @@ msgstr ""
 "如果為真，Gajim 在使用 jingle 時會嘗試使用 STUN 伺服器。伺服器可以由"
 "\"stun_server\"選項給出，或由 jabber 伺服器給出。"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr "在使用 jingle 時使用的 STUN 伺服器"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:314
 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:306
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr "優先等級將根據您的狀態自動變更。優先等級在 autopriority_* 選項中定義。"
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:340
 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"
@@ -4075,77 +4421,92 @@ msgstr ""
 "\"，\"請勿\n"
 "打擾\"，\"隱身\"。注意: 僅當 restore_last_status 被停用時這個選項其作用"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "如果啟用，則恢復上次使用的狀態。"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "如果為真，聯絡人的認證請求將被自動接受。"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "如果為假，這個帳號將被停用且不會出現在聯絡人清單視窗中。"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr "如果停用，即使 GPG 被配置，也不使用 GPG 密鑰簽名 presences。"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "為這個帳號啟用 ESession 加密。"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim 是否應該在可能時自動發起加密的作業階段?"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr "應嘗試的連線類型的有序清單(用空格分隔)。可以包含 tls，ssl，或 plain"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr "在使用明文連線傳送密碼前顯示一個警告對話方塊。"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用標準 SSL 函式庫前顯示一個警告對話方塊。"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:354
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "在透過明文連線傳送明文密碼前顯示警告對話框。"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "應忽略的 SSL 錯誤清單，以空格分隔"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "在不活動後傳送的空白"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "在不活動後傳送的 XMPP ping"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr "在重新連線前等待 ping alive packet 的回應多少秒"
 
 #. yes, no, ask
-#: ../src/common/config.py:348
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "為 Jabberd2 變通"
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4153,164 +4514,222 @@ msgstr ""
 "如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔"
 "案傳輸。"
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "對回執請求的回應"
 
-#: ../src/common/config.py:366
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "傳送回執請求"
 
-#: ../src/common/config.py:375
+#: ../src/common/config.py:403
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
 
-#: ../src/common/config.py:376
+#: ../src/common/config.py:404
 msgid "Allow Gajim to send your local time."
 msgstr "允許 Gajim 發送您的本地時間。"
 
-#: ../src/common/config.py:377
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr "在協商加密的作業階段時，Gajim 是否應該假設您想要您的訊息被記錄?"
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:408
 msgid "Message that is sent to contacts you want to add"
 msgstr "向您希望加入的聯絡人傳送的訊息"
 
-#: ../src/common/config.py:381
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr "上次從伺服器同步命令歷程記錄"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "匿名認證"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "匿名認證(_Y)"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否為此聯絡人使用 OpenPGP?"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "對於此聯絡人，Gajim 是否應該自動發起加密作業階段，當可能時?"
 
-#: ../src/common/config.py:445 ../src/common/config.py:448
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "想要進行拼寫檢查的語言"
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
+
+#: ../src/common/config.py:484
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
+
+#: ../src/common/config.py:487
+#, fuzzy
+msgid ""
+"State whether plugins should be activated on startup (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:456 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡覺"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "馬上回來"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "幾分鐘就回來。"
 
-#: ../src/common/config.py:458 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃東西"
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "我在吃東西，請留言"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "電影"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "我正在看電影。"
 
-#: ../src/common/config.py:460 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "打電話"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "我正在打電話"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "我正在享受戶外生活。"
 
-#: ../src/common/config.py:473
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "我現在線上。"
 
-#: ../src/common/config.py:474
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: ../src/common/config.py:475 ../src/config.py:1609
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "很快回來。"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "我已經很久不在了。"
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "請勿打擾。"
 
-#: ../src/common/config.py:478 ../src/common/config.py:479
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "再見!"
 
-#: ../src/common/config.py:489
+#: ../src/common/config.py:526
 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:490
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天訊息播放的聲音。"
 
-#: ../src/common/config.py:499 ../src/common/optparser.py:310
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "綠色"
 
-#: ../src/common/config.py:503 ../src/common/optparser.py:296
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "雜貨店"
 
-#: ../src/common/config.py:507
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "人類別"
 
-#: ../src/common/config.py:511
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers_events.py:345
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "To"
+
+#: ../src/common/connection_handlers_events.py:370
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4319,25 +4738,23 @@ msgstr ""
 "JID %s 不符合 RFC 標準。它沒有被加入聯絡人清單。請使用諸如 http://jru."
 "jabberstudio.org/ 的聯絡人清單管理工具移除它"
 
-#: ../src/common/connection_handlers_events.py:776
+#: ../src/common/connection_handlers_events.py:825
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "來自 %s 的解除認證請求"
 
-#: ../src/common/connection_handlers_events.py:861
-#: ../src/common/connection_handlers.py:339
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1053
-#: ../src/common/connection_handlers.py:1710 ../src/common/connection.py:448
-#: ../src/common/logger.py:1124 ../src/gajim.py:390
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "磁碟寫入錯誤"
 
-#: ../src/common/connection_handlers_events.py:865
-#: ../src/common/connection_handlers.py:946
-#: ../src/common/connection_handlers.py:1056
-#: ../src/common/connection_handlers.py:1713 ../src/common/connection.py:452
-#: ../src/common/logger.py:1127 ../src/gajim.py:209 ../src/session.py:98
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4348,122 +4765,128 @@ msgstr ""
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:886
+#: ../src/common/connection_handlers_events.py:935
 msgid "Room has been destroyed"
 msgstr "聊天室已經被銷毀了"
 
-#: ../src/common/connection_handlers_events.py:894
+#: ../src/common/connection_handlers_events.py:943
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "做為替代，您可以加入這個聊天室: %s"
 
-#: ../src/common/connection_handlers_events.py:967
-#: ../src/common/connection.py:259 ../src/config.py:2106 ../src/config.py:2115
-#: ../src/config.py:2183 ../src/config.py:3619 ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3079
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
 msgid "Invalid Jabber ID"
 msgstr "無效的 Jabber ID"
 
-#: ../src/common/connection_handlers_events.py:968
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "收到了一個從一個無效的 JID 傳送的訊息，它已經被忽略了。"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1005
-#: ../src/gui_interface.py:415 ../src/gui_interface.py:429
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
 
-#: ../src/common/connection_handlers_events.py:1422
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "不明的 SSL 錯誤: %d"
 
-#: ../src/common/connection_handlers_events.py:1950 ../src/dialogs.py:2771
-#: ../src/notify.py:260
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "新單條訊息"
 
-#: ../src/common/connection_handlers_events.py:1952
+#: ../src/common/connection_handlers_events.py:2213
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 發來的新訊息"
 
-#: ../src/common/connection_handlers_events.py:1956 ../src/dialogs.py:2772
-#: ../src/notify.py:261
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "新個人訊息"
 
-#: ../src/common/connection_handlers_events.py:1958
+#: ../src/common/connection_handlers_events.py:2219
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "來自聊天室 %s 的私人訊息"
 
-#: ../src/common/connection_handlers_events.py:1961
+#: ../src/common/connection_handlers_events.py:2222
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s:  %(message)s"
 
-#: ../src/common/connection_handlers_events.py:1964
+#: ../src/common/connection_handlers_events.py:2225
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "來自 %(nickname)s 的訊息"
 
-#: ../src/common/connection_handlers_events.py:1968 ../src/dialogs.py:2771
-#: ../src/notify.py:260
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
 msgid "New Message"
 msgstr "新訊息"
 
-#: ../src/common/connection_handlers_events.py:1970
+#: ../src/common/connection_handlers_events.py:2231
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "來自 %(nickname)s 的新訊息"
 
-#: ../src/common/connection_handlers_events.py:2099
+#: ../src/common/connection_handlers_events.py:2375
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 變更了狀態"
 
-#: ../src/common/connection_handlers_events.py:2101
-#: ../src/groupchat_control.py:202 ../src/groupchat_control.py:1755
-#: ../src/history_window.py:447
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的狀態是 %(status)s"
 
-#: ../src/common/connection_handlers_events.py:2106 ../src/dialogs.py:2783
-#: ../src/notify.py:274
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
 msgid "Contact Changed Status"
 msgstr "聯絡人狀態變更"
 
-#: ../src/common/connection_handlers_events.py:2108
+#: ../src/common/connection_handlers_events.py:2383
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上線了"
 
 #. default value
-#: ../src/common/connection_handlers_events.py:2113 ../src/dialogs.py:2767
-#: ../src/notify.py:256
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
 msgid "Contact Signed In"
 msgstr "聯絡人登入"
 
-#: ../src/common/connection_handlers_events.py:2115
+#: ../src/common/connection_handlers_events.py:2389
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 離開了"
 
-#: ../src/common/connection_handlers_events.py:2120 ../src/dialogs.py:2769
-#: ../src/notify.py:258
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
 msgid "Contact Signed Out"
 msgstr "聯絡人離開登入"
 
-#: ../src/common/connection_handlers.py:95
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+#: ../src/common/connection_handlers.py:92
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "無法載入閒置模組"
 
-#: ../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 的註冊資訊未按時抵達"
@@ -4477,178 +4900,178 @@ msgstr "註冊成功"
 msgid "Registration with agent %s succeeded"
 msgstr "註冊成功，agent %s"
 
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "註冊失敗"
 
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "註冊失敗，agent %(agent)s，錯誤 %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:573 ../src/common/connection.py:1546
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "不支援隱身"
 
-#: ../src/common/connection_handlers.py:574 ../src/common/connection.py:1547
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "帳號 %s 不支援隱身"
 
-#: ../src/common/connection_handlers.py:1755
+#: ../src/common/connection_handlers.py:1956
 msgid "I would like to add you to my roster."
 msgstr "我想將您加入到我的聯絡人清單。"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "無法獲得發行者的證書"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "無法獲得證書吊銷清單"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "無法解密證書籤名稱"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "無法解密證書吊銷清單的簽名"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "無法解碼發行者的公鑰"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "證書籤名稱失敗"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "吊銷證書清單簽名失敗"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "證書還未生效"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "證書已過期"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "證書吊銷清單還未生效"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "證書吊銷清單已過期"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "格式錯誤，在證書的'不早於'欄位"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "格式錯誤，在證書的'不遲於'欄位"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'最後更新'欄位"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'下次更新'欄位"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "記憶體耗盡"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "自簽名的證書"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "自簽名的證書，在證書鏈中"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "無法獲得本地發行者證書"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "無法驗證第一個證書"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "證書鏈太長"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "證書已被吊銷"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "無效的 CA 證書"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "超過了路徑長度限制"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "不支援的證書用途"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "不被信任的證書"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "證書被拒絕"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Subject 與 發行者 不匹配"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 與 subject key identifier 不匹配"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 與 發行者序號 不匹配"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "密鑰用途中不包含證書籤名稱"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "應用程式驗證失敗"
 
-#: ../src/common/connection.py:260 ../src/dialogs.py:3080
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, 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:282
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "遠端 presence 未簽名，也未指定密鑰。"
 
-#: ../src/common/connection.py:285
+#: ../src/common/connection.py:307
 #, 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:337
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本條訊息已 *加密* (見: XEP:`27`]"
 
-#: ../src/common/connection.py:435
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4657,74 +5080,77 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:845
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帳號\"%s\"的連線丟失"
 
-#: ../src/common/connection.py:846
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "手動重連。"
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "伺服器 %(name)s 對註冊請求的回應有誤: %(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:899
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "伺服器 %s 提供了一個不同的註冊表單"
 
-#. wrong answer
-#: ../src/common/connection.py:915
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "答案錯誤"
 
-#: ../src/common/connection.py:916
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服務代理 %(name)s 對註冊請求的回應有誤: %(error)s"
 
-#: ../src/common/connection.py:1224 ../src/common/connection.py:1358
-#: ../src/common/connection.py:1972
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "沒有能夠連線到\"%s\""
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "沒有能夠連線到\"%s\""
 
-#: ../src/common/connection.py:1225 ../src/gui_interface.py:524
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "檢查連線或稍後重試。"
 
-#: ../src/common/connection.py:1230
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "伺服器回應: %s"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "連線代理伺服器失敗"
 
-#: ../src/common/connection.py:1275 ../src/common/connection.py:1337
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "沒有能夠連線到帳號 %s"
 
-#: ../src/common/connection.py:1276 ../src/common/connection.py:1338
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帳號 %s 的連線丟失。重新嘗試連線。"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s 證書的認證可能是無效的"
 
-#: ../src/common/connection.py:1304
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4733,7 +5159,7 @@ msgstr ""
 "\n"
 "SSL 錯誤: <b>%s</b>"
 
-#: ../src/common/connection.py:1306
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4742,24 +5168,33 @@ msgstr ""
 "\n"
 "不明 SSL 錯誤: %d"
 
-#: ../src/common/connection.py:1359
-msgid "Check your connection or try again later"
-msgstr "檢查連線或稍後重試"
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "%s 證書的認證可能是無效的"
 
-#: ../src/common/connection.py:1393
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "沒有能夠連線到\"%s\""
+
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\"登入驗證失敗"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "請檢查登入資訊和密碼的正確性"
 
-#: ../src/common/connection.py:1468
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "移除隱私策略清單時發生錯誤"
 
-#: ../src/common/connection.py:1469
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4768,65 +5203,65 @@ msgstr ""
 "隱私策略清單 %s 還沒有被移除。它可能在您的某個連線的資源中是活動的。停用它然"
 "後重試。"
 
-#: ../src/common/connection.py:1839
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "已傳送聯絡人: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1842
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "已傳送聯絡人:"
 
-#: ../src/common/connection.py:1989 ../src/common/connection.py:2012
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "由於隱身狀態，未獲取"
 
-#: ../src/common/connection.py:2542
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "移除註冊失敗"
 
-#: ../src/common/connection.py:2543
+#: ../src/common/connection.py:2827
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "在伺服器上 %(server)s 移除註冊失敗: %(error)s"
 
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:60
-#: ../src/gui_interface.py:467
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "旁觀者"
 
-#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
-#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:856
-#: ../src/roster_window.py:1552 ../src/roster_window.py:1640
-#: ../src/roster_window.py:1642 ../src/roster_window.py:1804
-#: ../src/roster_window.py:2480
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "服務代理"
 
-#: ../src/common/contacts.py:366
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "不在聯絡人清單中"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 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:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 相容性無法使用"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus 在這臺電腦上沒有正常執行"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus 在這臺電腦上沒有正常執行: 未發現系統匯流排"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus 在這臺電腦上沒有正常執行: 未發現作業階段匯流排"
 
@@ -4838,7 +5273,7 @@ msgstr "不能讀取資料庫。"
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr "服務無法使用: Gajim 不在執行，或是 remote_control 為假"
 
-#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "在這臺電腦上沒有 D-Bus 或是 Python 模組缺失"
 
@@ -5023,271 +5458,290 @@ msgstr "一週末"
 msgid "Weekend!"
 msgstr "週末"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr "使用者名稱必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "在使用者名稱中有無效的字元。"
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr "伺服器名稱必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "主機名稱中有無效的字元。"
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "伺服器的位址是必須的。"
 
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr "資源必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:178
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "資源中含有無效字元。"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:220 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "離開很久了(_N)"
 
-#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
 msgid "Not Available"
 msgstr "離開很久了"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: ../src/common/helpers.py:230 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:240
 msgid "?user status:_Available"
 msgstr "線上(_A)"
 
-#: ../src/common/helpers.py:235 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 msgid "?user status:Available"
 msgstr "線上"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "正在連線"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "離開(_A)"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "離線(_O)"
 
-#: ../src/common/helpers.py:247 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "離線"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "隱身(_I)"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:259
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "有錯誤"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "無"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "From"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "無"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "認證"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "無"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "參與者"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "參與者"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "訪客"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "訪客"
 
-#: ../src/common/helpers.py:309 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "無"
 
-#: ../src/common/helpers.py:311 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:313 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "管理員"
 
-#: ../src/common/helpers.py:315 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "成員"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "注意著與您的對話"
 
-#: ../src/common/helpers.py:356
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "正在輸入訊息…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "暫停輸入訊息"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "關閉了聊天視窗或標籤"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:631
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:638
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:648
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 條訊息未處理"
 
-#: ../src/common/helpers.py:1112
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " 來自聊天室 %s"
 
-#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " 來自使用者 %s"
 
-#: ../src/common/helpers.py:1117
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " 來自 %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 個未處理事件"
 
-#: ../src/common/helpers.py:1162
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr "您好，我是$name"
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "讀取檔案逾時"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "圖片太大"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "證書吊銷清單還未生效"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "讀取檔案逾時"
+
+#: ../src/common/jingle_rtp.py:114
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 設定錯誤"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5306,11 +5760,11 @@ msgstr ""
 "錯誤: \n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr "GStreamer 錯誤"
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5319,106 +5773,114 @@ msgstr ""
 "錯誤: %s\n"
 "除錯資訊: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr "音訊輸入"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr "音訊輸出"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr "視訊輸入"
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr "視訊輸出"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "在執行命令\"%(command)s\"時發生錯誤: %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s 不是一個合法的日誌層級"
 
-#: ../src/common/multimedia_helpers.py:39
+#: ../src/common/multimedia_helpers.py:41
 msgid " Default device"
 msgstr "預設裝置"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:60
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr "音訊測試"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:79
-#: ../src/common/multimedia_helpers.py:93
-#: ../src/common/multimedia_helpers.py:111
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr "自動偵測"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
 #, python-format
 msgid "Pulse: %s"
 msgstr "Pulse: %s"
 
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:77
-#: ../src/common/multimedia_helpers.py:105
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr "偽裝音訊輸出"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:90
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr "視訊測試"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#: ../src/common/multimedia_helpers.py:108
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "綠色"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Fake video output"
+msgstr "視訊輸出"
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X 視窗系統 (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:110
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr "X 視窗系統 (沒有Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "錯誤: 無法讀取檔案 %s"
+msgid "Error: cannot open %s for reading"
+msgstr "錯誤: 無法按讀開啟檔案 %s"
 
-#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:385
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "遷移記錄資料庫到索引"
 
@@ -6055,19 +6517,116 @@ msgstr "學習"
 msgid "Writing"
 msgstr "寫作"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "預設"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "海洋"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "藏起來"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "帳號"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "帳號"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "描述"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "錯誤"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "一"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "聊天室"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+#, fuzzy
+msgid "street"
+msgstr "stream"
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "不明演出者"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "不明標題"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "不明來源"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6076,20 +6635,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> 作者 <i>%(artist)s</i>\n"
 "出自 <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-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 實體。檔案傳輸將被取消。"
-
 #. we're not english
-#: ../src/common/stanza_session.py:424
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6097,7 +6644,7 @@ msgstr ""
 "[這是加密作業階段的一部分。如果您看到了這條訊息，一定是有什麼地方發生錯誤"
 "了。]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi 錯誤"
 
@@ -6110,73 +6657,71 @@ msgstr ""
 "%s\n"
 "Link-local 訊息可能無法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
-#: ../src/common/zeroconf/connection_zeroconf.py:219
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "無法啟動本地服務"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "無法繫結連接埠 %d。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:220
-#: ../src/common/zeroconf/connection_zeroconf.py:304
-#: ../src/common/zeroconf/connection_zeroconf.py:317
-#: ../src/common/zeroconf/connection_zeroconf.py:333
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "請檢查 avahi-daemon 是否正在執行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:303
-#: ../src/common/zeroconf/connection_zeroconf.py:316
-#: ../src/common/zeroconf/connection_zeroconf.py:332
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "無法變更帳號\"%s\"的狀態"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:351
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "您的訊息未能被傳送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:365
-#: ../src/common/zeroconf/connection_zeroconf.py:404
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "聯絡人離線。您的訊息未能被傳送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:431
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "無法建立到主機的連線: 傳送資料逾時。"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:193
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "加入服務錯誤。 %s"
 
-#: ../src/config.py:406
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "預設訊息"
 
-#: ../src/config.py:415
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "啟用"
 
-#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3115
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "預設"
 
-#: ../src/config.py:746 ../src/dialogs.py:1493
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "語言 %s 的詞典無法使用"
 
-#: ../src/config.py:747
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6184,209 +6729,210 @@ msgid ""
 msgstr ""
 "您需安裝 %s 詞典以使用拼寫檢查，或是設定拼寫檢查選項以選擇另外一種語言。(_L)"
 
-#: ../src/config.py:1223
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "狀態訊息標題"
 
-#: ../src/config.py:1223
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "狀態訊息文字"
 
 #. Name column
-#: ../src/config.py:1523 ../src/dialogs.py:2528 ../src/dialogs.py:2595
-#: ../src/dialogs.py:3382 ../src/disco.py:886 ../src/disco.py:1744
-#: ../src/disco.py:2046 ../src/history_window.py:90
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/config.py:1618
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "現在重新登入?"
 
-#: ../src/config.py:1619
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有調整立即生效，您必須重新登入。"
 
-#: ../src/config.py:1773 ../src/config.py:1906
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在這臺電腦上無法使用"
 
-#: ../src/config.py:1946 ../src/config.py:1993
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "未讀取的事件"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "移除帳號前請檢視所有未處理事件。"
 
-#: ../src/config.py:1976
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在帳號 %s 開啟聊天"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和多人聊天視窗將會關閉。您想繼續嗎?"
 
-#: ../src/config.py:1989 ../src/config.py:2531 ../src/config.py:2567
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "正在連線到伺服器"
 
-#: ../src/config.py:1990
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "如要變更帳號名稱，需中斷連線。"
 
-#: ../src/config.py:1994
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr "如要變更帳號名稱，需先處理所有未處理事件"
 
-#: ../src/config.py:2000
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "帳號名稱已經被佔用"
 
-#: ../src/config.py:2001
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "該名稱已被您的另一個帳號使用。請選擇其他名稱"
 
-#: ../src/config.py:2005 ../src/config.py:2009
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "無效的帳號名稱"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "帳號名稱不能為空。"
 
-#: ../src/config.py:2010
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "帳號名稱不能包含空格。"
 
-#: ../src/config.py:2087
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "重新命名帳號"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "為帳號 %s 輸入新的名稱"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式為 \"使用者@伺服器名稱\"。"
 
-#: ../src/config.py:2339 ../src/config.py:3665
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "無效輸入"
 
-#: ../src/config.py:2340 ../src/config.py:3666
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "自訂連接埠必須為連接埠號碼。"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "獲取密鑰失敗"
 
-#: ../src/config.py:2362
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "沒有可用的 OpenPGP 私鑰"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密鑰選擇"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "選擇您的 OpenPGP 密鑰"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "不明的帳號可用"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "您必須在編輯個人資訊前建立帳號。"
 
-#: ../src/config.py:2412 ../src/dialogs.py:2281 ../src/dialogs.py:2517
-#: ../src/dialogs.py:2705 ../src/disco.py:515 ../src/profile_window.py:361
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "尚未連線到伺服器"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "無法離線編輯個人資訊。"
 
-#: ../src/config.py:2417
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "您的伺服器不支援 Vcard"
 
-#: ../src/config.py:2418
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "您的伺服器無法儲存您的個人資訊。"
 
-#: ../src/config.py:2532 ../src/config.py:2568
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "要停用帳號，您必須中斷連線。"
 
-#: ../src/config.py:2537
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "帳號本地已存在。"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "請在使用本地訊息前重新命名或移除它。"
 
-#: ../src/config.py:2695
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "編輯 %s"
 
-#: ../src/config.py:2697
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "註冊到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2733
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "封禁名單"
 
-#: ../src/config.py:2734
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "成員清單"
 
-#: ../src/config.py:2734
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "室長清單"
 
-#: ../src/config.py:2735
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "管理員清單"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2799 ../src/disco.py:893 ../src/history_manager.py:207
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2809
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2816
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../src/config.py:2822
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2849
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "封禁…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2851
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6394,11 +6940,11 @@ msgstr ""
 "<b>想做封禁誰?</b>\n"
 "\n"
 
-#: ../src/config.py:2853
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "正在加入成員…"
 
-#: ../src/config.py:2854
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6406,11 +6952,11 @@ msgstr ""
 "<b>想要將誰加為成員?</b>\n"
 "\n"
 
-#: ../src/config.py:2856
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "加入室長…"
 
-#: ../src/config.py:2857
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6418,11 +6964,11 @@ msgstr ""
 "<b>您想要讓誰成為室長?</b>\n"
 "\n"
 
-#: ../src/config.py:2859
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "加入管理員…"
 
-#: ../src/config.py:2860
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6430,7 +6976,7 @@ msgstr ""
 "<b>您想要讓誰成為管理員?</b>\n"
 "\n"
 
-#: ../src/config.py:2861
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6446,108 +6992,103 @@ msgstr ""
 "4。domain (欄位名稱本身匹配，任何 user@domain，\n"
 "domain/resource，或是包含一個子欄位名稱的位址也匹配)。"
 
-#: ../src/config.py:2962
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "移除帳號 %s"
 
-#: ../src/config.py:2977
+#: ../src/config.py:3048
 msgid "Account is disabled"
 msgstr "帳號被停用"
 
-#: ../src/config.py:2978
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr "要從伺服器移除註冊，帳號必須被啟用。"
 
-#: ../src/config.py:2991 ../src/gui_interface.py:278
-#: ../src/gui_interface.py:696
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "需要密碼"
 
-#: ../src/config.py:2992 ../src/gui_interface.py:676
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "輸入帳號 %s 的密碼"
 
-#: ../src/config.py:2993 ../src/gui_interface.py:696
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../src/config.py:3003
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: ../src/config.py:3004
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，將會丟失連線"
 
-#: ../src/config.py:3018
+#: ../src/config.py:3089
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "連線伺服器 %s 失敗"
 
-#: ../src/config.py:3019
+#: ../src/config.py:3090
 msgid "What would you like to do?"
 msgstr "您想做什麼?"
 
-#: ../src/config.py:3020
+#: ../src/config.py:3091
 msgid "Remove only from Gajim"
 msgstr "僅從 Gajim 移除帳號"
 
-#: ../src/config.py:3021
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何東西。我過一會兒會重試一下"
 
-#: ../src/config.py:3115
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "全部"
 
-#: ../src/config.py:3116
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "只是進入和離開"
 
-#: ../src/config.py:3117
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "無"
 
-#: ../src/config.py:3189
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "新聊天室"
 
-#: ../src/config.py:3222
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "此書籤含無效資料"
 
-#: ../src/config.py:3223
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "請確認填寫伺服器與聊天室欄位或移除此書籤。"
 
-#. invalid char
-#: ../src/config.py:3348 ../src/dialogs.py:2070
-msgid "Invalid nickname"
-msgstr "無效的暱稱"
-
-#: ../src/config.py:3349 ../src/config.py:3360 ../src/config.py:3369
-#: ../src/config.py:3380 ../src/config.py:3388
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "不允許的字元"
 
-#: ../src/config.py:3360 ../src/config.py:3368 ../src/config.py:3380
-#: ../src/config.py:3641
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "無效的伺服器"
 
-#: ../src/config.py:3387
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "無效聊天室"
 
-#: ../src/config.py:3557
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "帳號已成功加入"
 
-#: ../src/config.py:3558 ../src/config.py:3564
+#: ../src/config.py:3615 ../src/config.py:3621
 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 "
@@ -6556,32 +7097,32 @@ msgstr ""
 "您可以點擊\"進階\"按鈕以設定進階帳號選項，或稍後選擇主視窗\"編輯\"選單下\"帳"
 "號\"選單項。"
 
-#: ../src/config.py:3563
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "註冊新帳號成功"
 
-#: ../src/config.py:3602
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "無效使用者名稱"
 
-#: ../src/config.py:3604
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "必須提供使用者名稱來配置此帳號。"
 
-#: ../src/config.py:3642
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "請指定一個伺服器。您將註冊到這個伺服器。"
 
-#: ../src/config.py:3698 ../src/gui_interface.py:1174
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "證書已經在檔案中"
 
-#: ../src/config.py:3699 ../src/gui_interface.py:1175
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "證書已經在檔案 %s 中，所以它沒有被再次加入。"
 
-#: ../src/config.py:3788
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6596,7 +7137,7 @@ msgstr ""
 "SSL 錯誤: %(error)s\n"
 "您仍然想要連線到這個伺服器嗎?"
 
-#: ../src/config.py:3794 ../src/gui_interface.py:1203
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6607,77 +7148,89 @@ msgstr ""
 "這個證書的 SHA1 指紋資訊: \n"
 "%s"
 
-#: ../src/config.py:3826 ../src/config.py:3860
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "建立帳號期間發生錯誤"
 
-#: ../src/config.py:3925
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "帳號名稱已經被使用"
 
-#: ../src/config.py:3926
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "您已經有帳號使用這個名稱了。"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP節點沒有被移除"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP 節點 %(node)s 沒有被移除: %(message)s"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4147
 #, python-format
 msgid "Configure %s"
 msgstr "組配 %s"
 
-#: ../src/config.py:4101 ../src/plugins/gui.py:73
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "活動"
 
-#: ../src/config.py:4109
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:4144
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "最初收到的訊息"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "最初收到的訊息"
 
-#: ../src/config.py:4145
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "已聚焦收到的下一筆訊息"
 
-#: ../src/config.py:4147
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "解除聚焦收到的下一筆訊息"
 
-#: ../src/config.py:4148
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "已連線的聯絡人"
 
-#: ../src/config.py:4149
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "聯絡人已中斷連線"
 
-#: ../src/config.py:4150
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "訊息已傳送"
 
-#: ../src/config.py:4151
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "多人聊天訊息高亮度顯示"
 
-#: ../src/config.py:4152
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天訊息"
 
-#: ../src/config.py:4153
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "收到 GMail 郵件"
 
-#: ../src/conversation_textview.py:603
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6686,235 +7239,235 @@ msgstr ""
 "這個圖示是說這條訊息還沒有被遠端收到。如果這個圖示已經存在很久了，很可能這條"
 "訊息丟失了。"
 
-#: ../src/conversation_textview.py:622
+#: ../src/conversation_textview.py:673
 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:742
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "參照(_Q)"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\"的動作(_A)"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "檢視 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:767
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "從字典中搜尋(_D)"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:835
 #, 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:797
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "網路搜尋位址缺少 \"%s\""
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "在網際網路上搜尋(_S)"
 
-#: ../src/conversation_textview.py:806
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "做為連結開啟(_L)"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1310
+#: ../src/conversation_textview.py:1386
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
 msgstr[0] "%(nb_days)i天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1359 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主題: %s\n"
 
-#: ../src/dataforms_widget.py:565
+#: ../src/dataforms_widget.py:575
 msgid "Unable to load image"
 msgstr "無法載入圖像"
 
-#: ../src/dataforms_widget.py:567
+#: ../src/dataforms_widget.py:577
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "不支援的媒體類型: %s"
 
-#: ../src/dataforms_widget.py:582
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr "此一項是必須的"
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Jabber ID 已經在清單中了"
 
-#: ../src/dataforms_widget.py:628
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "您輸入的 Jabber ID 已經在清單中了。請選擇另外一個。"
 
 #. Default jid
-#: ../src/dataforms_widget.py:639
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "聯絡人名稱: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:197
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "群組"
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "群組內"
 
-#: ../src/dialogs.py:295
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "聯絡人名稱"
 
-#: ../src/dialogs.py:475
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "設定 Mood"
 
-#: ../src/dialogs.py:595
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 狀態訊息"
 
-#: ../src/dialogs.py:609
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "狀態訊息"
 
-#: ../src/dialogs.py:800
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "覆寫狀態訊息?"
 
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "這個名稱已被使用。您想要覆寫這個狀態訊息嗎?"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "另存為預設狀態訊息"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "請為這個狀態訊息輸入一個名稱"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM 位址:"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG 號碼:"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ 號碼:"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN 位址:"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 位址:"
 
-#: ../src/dialogs.py:879
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "請填入您想加入到帳號 %s 的聯絡人的資訊"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "請填入您想加入的聯絡人的資訊"
 
-#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
-#: ../src/dialogs.py:3615
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "無效的使用者ID"
 
-#: ../src/dialogs.py:1081
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "使用者ID不應包含資源。"
 
-#: ../src/dialogs.py:1086
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "您不能將您自己加入到您的聯絡人清單中。"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "聯絡人已經在聯絡人清單中"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "此聯絡人已經在您的聯絡人清單中了"
 
-#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "使用者 ID:"
 
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1279
 #, fuzzy
 msgid "A GTK+ Jabber/XMPP client"
 msgstr "一個 GTK+ 的 Jabber 客戶端"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本:"
 
-#: ../src/dialogs.py:1275
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本:"
 
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "目前的開發者:"
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "既往開發者:"
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "感謝:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1305
 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:1311
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
@@ -6923,7 +7476,7 @@ msgstr ""
 "Guanhao Yin <yinguanhao@gmail.com>\n"
 "趙惟倫 <chaoweilun@gmail.com>"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6935,244 +7488,287 @@ msgstr ""
 "言。\n"
 "高亮度拼寫錯誤的特性不會被啟用。"
 
-#: ../src/dialogs.py:1872
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "不安全的連線"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"您即將透過不安全的連線與帳號 %(account)s (%(server)s) 連接。這意味著您的所有"
+"對話都會不經加密地被交換。您確定要這樣做嗎？"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "是的，我確實想要不安全地連線"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+msgid "_Do not ask me again"
+msgstr "不要再問我了(_D)"
+
+#: ../src/dialogs.py:1950
 msgid "_Resume"
 msgstr "再續(_R)"
 
-#: ../src/dialogs.py:1880
+#: ../src/dialogs.py:1958
 msgid "Re_place"
 msgstr "置換(_P)"
 
-#: ../src/dialogs.py:2071 ../src/dialogs.py:2470
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "暱稱包含不合法字元。"
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(jid)s 對帳號 %(account)s 的認證請求"
 
-#: ../src/dialogs.py:2192
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s 的認證請求"
 
-#: ../src/dialogs.py:2276 ../src/gui_interface.py:1925
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已經在聊天室 %s"
 
-#: ../src/dialogs.py:2282
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必須連線才能加入聊天室。"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用帳號 %s 加入聊天室"
 
-#: ../src/dialogs.py:2457
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "錯誤的 uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "這不是一個聊天室"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "無效的帳號"
 
-#: ../src/dialogs.py:2458
+#: ../src/dialogs.py:2599
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "您需要選擇一個帳號，用它來加入聊天室。"
 
-#: ../src/dialogs.py:2469
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "不合法的暱稱"
 
-#: ../src/dialogs.py:2474 ../src/dialogs.py:2480
-#: ../src/groupchat_control.py:2079
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "無效的聊天室 Jabber ID"
 
-#: ../src/dialogs.py:2475
+#: ../src/dialogs.py:2617
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "請輸入聊天室的 Jabber ID，以 room@server 的形式。"
 
-#: ../src/dialogs.py:2481 ../src/groupchat_control.py:2080
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "聊天室 Jabber ID 包含不合法字元。"
 
-#: ../src/dialogs.py:2485 ../src/gui_interface.py:1907
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "這不是一個聊天室"
 
-#: ../src/dialogs.py:2486 ../src/gui_interface.py:1908
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是一個聊天室的名稱。"
 
-#: ../src/dialogs.py:2518
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未連線時，您不能同步您的聯絡人。"
 
-#: ../src/dialogs.py:2531
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "伺服器"
 
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "這個帳號已經連線到伺服器"
 
-#: ../src/dialogs.py:2568
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "這個帳號連線後您才可以與之同步"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "同步"
 
-#: ../src/dialogs.py:2654
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用帳號 %s 開始聊天"
 
-#: ../src/dialogs.py:2656
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "開始聊天"
 
-#: ../src/dialogs.py:2657
+#: ../src/dialogs.py:2802
 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:2684 ../src/dialogs.py:3065 ../src/dialogs.py:3295
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "連線無法使用"
 
-#: ../src/dialogs.py:2685 ../src/dialogs.py:3066 ../src/dialogs.py:3296
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "請確認您已經連線到 \"%s\"。"
 
-#: ../src/dialogs.py:2694 ../src/dialogs.py:2697
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "無效的 JID"
 
-#: ../src/dialogs.py:2697
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "無法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2706
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "連線後才可變更密碼。"
 
-#: ../src/dialogs.py:2725
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "無效密碼"
 
-#: ../src/dialogs.py:2725
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "您必須輸入密碼"
 
-#: ../src/dialogs.py:2729
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "密碼不符"
 
-#: ../src/dialogs.py:2730
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "在兩個輸入框中輸入的密碼必須一致。"
 
-#: ../src/dialogs.py:2772 ../src/gui_interface.py:813 ../src/notify.py:270
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "新電子郵件"
 
-#: ../src/dialogs.py:2774 ../src/gui_interface.py:868 ../src/notify.py:263
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "檔案傳輸請求"
 
-#: ../src/dialogs.py:2776 ../src/gui_interface.py:775
-#: ../src/gui_interface.py:839 ../src/notify.py:265
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "檔案傳輸錯誤"
 
-#: ../src/dialogs.py:2778 ../src/gui_interface.py:914
-#: ../src/gui_interface.py:937 ../src/gui_interface.py:954
-#: ../src/notify.py:267
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "檔案傳輸完成"
 
-#: ../src/dialogs.py:2779 ../src/gui_interface.py:917 ../src/notify.py:268
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "檔案傳輸已停止"
 
-#: ../src/dialogs.py:2781 ../src/gui_interface.py:609 ../src/notify.py:272
-msgid "Groupchat Invitation"
-msgstr "多人聊天邀請"
-
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "單條訊息，使用帳號 %s"
 
-#: ../src/dialogs.py:2986
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "單條訊息，在帳號 %s"
 
-#: ../src/dialogs.py:2988
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "單條訊息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2991
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "傳送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3014
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3037
+#: ../src/dialogs.py:3185
 #, 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:3116
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "回復: %s"
 
-#: ../src/dialogs.py:3117
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 寫道: \n"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "帳號 %s 的 XML 主控臺"
 
-#: ../src/dialogs.py:3178
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr " XML 主控臺"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3325
+#: ../src/dialogs.py:3478
 msgid "add"
 msgstr "加入"
 
-#: ../src/dialogs.py:3325
+#: ../src/dialogs.py:3478
 msgid "modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3479
 msgid "remove"
 msgstr "移除"
 
-#: ../src/dialogs.py:3355
+#: ../src/dialogs.py:3508
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7180,181 +7776,178 @@ msgid ""
 msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些聯絡人。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3371 ../src/dialogs.py:3417
-msgid "Add"
-msgstr "加入"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3373 ../src/dialogs.py:3448
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "修改"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3375 ../src/dialogs.py:3472
-msgid "Delete"
-msgstr "刪除"
-
-#: ../src/dialogs.py:3379
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3385
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "群組"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3493
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s 建議我將您加入到我的聯絡人清單。"
 
-#: ../src/dialogs.py:3507
-#, python-format
-msgid "Added  %s contacts"
-msgstr "加入了 %s 聯絡人"
+#: ../src/dialogs.py:3660
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "加入了 %s 聯絡人"
 
-#: ../src/dialogs.py:3544
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "移除了 %s 聯絡人"
+#: ../src/dialogs.py:3698
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "移除了 %s 聯絡人"
 
-#: ../src/dialogs.py:3584 ../src/dialogs.py:3761
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存檔偏好設定"
 
-#: ../src/dialogs.py:3624
+#: ../src/dialogs.py:3779
 msgid "Invalid expire value"
 msgstr "無效的過期值"
 
-#: ../src/dialogs.py:3625
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr "過期值必須是一個有效的正整數。"
 
-#: ../src/dialogs.py:3672
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr "在表格中有一處錯誤"
 
-#: ../src/dialogs.py:3892
+#: ../src/dialogs.py:4047
 msgid "There is an error"
 msgstr "有一處錯誤"
 
-#: ../src/dialogs.py:3960
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "隱私策略清單 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3964
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的隱私策略清單"
 
-#: ../src/dialogs.py:4031
+#: ../src/dialogs.py:4186
 #, 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:4036
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順序: %(order)s，動作: %(action)s"
 
-#: ../src/dialogs.py:4087
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>編輯規則</b>"
 
-#: ../src/dialogs.py:4198
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>加入規則</b>"
 
-#: ../src/dialogs.py:4297
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的隱私策略清單"
 
-#: ../src/dialogs.py:4299
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "隱私策略清單"
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "不合法的清單名稱"
 
-#: ../src/dialogs.py:4389
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "您必須輸入一個名稱以建立一個隱私策略清單。"
 
-#: ../src/dialogs.py:4421
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "您被邀請到一個聊天室"
 
-#: ../src/dialogs.py:4424
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact 邀請您加入一個聊天室"
 
-#: ../src/dialogs.py:4426
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact 邀請您參加聊天室 %(room_jid)s"
 
-#: ../src/dialogs.py:4434
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "註釋: %s"
 
-#: ../src/dialogs.py:4436
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "您是否接受邀請?"
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr "選擇客戶端證書 #PCKS12"
 
-#: ../src/dialogs.py:4508 ../src/dialogs.py:4550 ../src/dialogs.py:4606
-#: ../src/dialogs.py:4694
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/dialogs.py:4513
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr "PKCS12 檔案"
 
-#: ../src/dialogs.py:4540
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "選擇聲音"
 
-#: ../src/dialogs.py:4555
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav聲音"
 
-#: ../src/dialogs.py:4593
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "選擇圖像"
 
-#: ../src/dialogs.py:4611
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "圖像"
 
-#: ../src/dialogs.py:4681
+#: ../src/dialogs.py:4847
 msgid "Choose Archive"
 msgstr "選擇歸檔檔案"
 
-#: ../src/dialogs.py:4699
+#: ../src/dialogs.py:4865
 msgid "Zip files"
 msgstr "Zip 檔案"
 
-#: ../src/dialogs.py:4725
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "當 %s 變為:"
 
-#: ../src/dialogs.py:4727
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在為 %s 加入特殊提示"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7365,19 +7958,19 @@ msgstr ""
 "\n"
 "作業階段的短認證字串是 <b>%(sas)s</b>。"
 
-#: ../src/dialogs.py:4950
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "您已經確認了這個聯絡人的身分。"
 
-#: ../src/dialogs.py:4956 ../src/dialogs.py:5040
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "聯絡人身分已確認"
 
-#: ../src/dialogs.py:4962
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "重新驗證…"
 
-#: ../src/dialogs.py:4967
+#: ../src/dialogs.py:5133
 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 "
@@ -7386,19 +7979,19 @@ msgstr ""
 "為了確保<b>只有</b>您期望的人可以看到您傳送的訊息或給您傳送訊息，您需要驗證他"
 "們的身分資訊。請點擊下面的按鈕。"
 
-#: ../src/dialogs.py:4970 ../src/dialogs.py:5021 ../src/dialogs.py:5034
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "聯絡人身分未確認"
 
-#: ../src/dialogs.py:4975
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "確認…"
 
-#: ../src/dialogs.py:4986
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "您確認了聯絡人的身分嗎?"
 
-#: ../src/dialogs.py:4987
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7412,58 +8005,63 @@ msgstr ""
 "\n"
 "這次作業階段的短認證字串是 <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4988
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "您與遠端聯絡人通話並驗證了 SAS 嗎?"
 
-#: ../src/dialogs.py:5022
+#: ../src/dialogs.py:5189
 #, 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:5028
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr "沒有為這個聯絡人指定密鑰。因此您無法加密訊息。"
 
-#: ../src/dialogs.py:5035
+#: ../src/dialogs.py:5202
+#, fuzzy
 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."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "盡管為這個聯絡人指定了密鑰，但您<b>不信任</b>他的密鑰，因此訊息<b>無法</b>被"
 "加密。使用您的 GPG 客戶端以信任他的密鑰。"
 
-#: ../src/dialogs.py:5041
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr "聯絡人被指定了 GPG 密鑰，且您信任他的密鑰，所以訊息會被加密。"
 
-#: ../src/dialogs.py:5106
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr "一個音訊和視訊"
 
-#: ../src/dialogs.py:5108
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr "一個音訊"
 
-#: ../src/dialogs.py:5110
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr "一個視訊"
 
-#: ../src/dialogs.py:5114
+#: ../src/dialogs.py:5281
 #, 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 作業階段。您要回應嗎?"
 
-#: ../src/dialogs.py:5182
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
 #, python-format
 msgid "Certificate for account %s"
 msgstr "帳號憑證 %s"
 
-#: ../src/dialogs.py:5182
+#: ../src/dialogs.py:5376
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -7502,129 +8100,134 @@ msgstr ""
 "<b>指紋</b>\n"
 "SHA1 指紋:%(sha1)s"
 
-#: ../src/dialogs.py:5216 ../src/dialogs.py:5233
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
 msgid "View cert..."
 msgstr "檢視憑證…"
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "客戶端證書"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "會議"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "連線後才可瀏覽可用服務"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帳號 %s 來發掘服務"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "搜尋服務"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "找不到該服務"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:762
 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:765 ../src/disco.py:1102
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "該服務無法瀏覽"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "此服務沒有項目可瀏覽。"
 
-#: ../src/disco.py:806 ../src/disco.py:816
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "無效的伺服器名稱"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用帳號 %(account)s 瀏覽位址 %(address)s"
 
-#: ../src/disco.py:914
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: ../src/disco.py:1103
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "此服務不包含任何項目可瀏覽。"
 
-#: ../src/disco.py:1343
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "執行命令(_E)…"
 
-#: ../src/disco.py:1353 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "註冊(_G)"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已掃描 %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "使用者"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2443
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "書籤已設定"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2444
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "聊天室\"%s\"已在您的書籤中。"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2458
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "書籤加入成功"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2459
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以透過\"動作\"選單管理您的書籤。"
 
-#: ../src/disco.py:2055
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "訂閱"
 
-#: ../src/disco.py:2063
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "節點"
 
-#: ../src/disco.py:2127
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "新發表"
 
-#: ../src/disco.py:2133
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: ../src/disco.py:2139
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "退訂(_S)"
 
@@ -7638,7 +8241,8 @@ msgid ""
 msgstr "一個用於驗證伺服器的證書以保證連線安全的函式庫。"
 
 #: ../src/features_window.py:52 ../src/features_window.py:53
-msgid "Requires python-pyopenssl."
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "需要 python-pyopenssl。"
 
 #: ../src/features_window.py:54
@@ -7654,8 +8258,10 @@ msgid "Requires python-avahi."
 msgstr "需要 python-avahi。"
 
 #: ../src/features_window.py:57
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
 
 #: ../src/features_window.py:58
 msgid "Command line"
@@ -7671,18 +8277,19 @@ msgstr "需要 python-dbus。"
 
 #: ../src/features_window.py:61 ../src/features_window.py:69
 #: ../src/features_window.py:73 ../src/features_window.py:77
-#: ../src/features_window.py:85 ../src/features_window.py:89
+#: ../src/features_window.py:89 ../src/features_window.py:105
 #: ../src/features_window.py:109 ../src/features_window.py:113
-#: ../src/features_window.py:117
 msgid "Feature not available under Windows."
 msgstr "特性在 Windows 下無法使用。"
 
 #: ../src/features_window.py:62
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP 訊息加密"
 
 #: ../src/features_window.py:63
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "用 gpg 密鑰加密聊天訊息。"
 
 #: ../src/features_window.py:64
@@ -7757,6 +8364,11 @@ msgstr "對正在編輯的訊息進行拼寫檢查。"
 msgid "Requires libgtkspell."
 msgstr "需要 libgtkspell。"
 
+#: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "需要 libgtkspell。"
+
 #: ../src/features_window.py:86
 msgid "Notification"
 msgstr "通知"
@@ -7788,46 +8400,22 @@ msgid "Requires python2.5."
 msgstr "需要 python2.5。"
 
 #: ../src/features_window.py:94
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:95
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "轉換 $$ $$ 之間的 LaTeX 運算式。"
-
-#: ../src/features_window.py:96
-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 或 ImageMagick)。您需要在進階設定編輯器中"
-"將 'use_latex' 設定為真。"
-
-#: ../src/features_window.py:97
-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 或 ImageMagick) (全部在 MikTeX 中)。您需要"
-"在進階設定編輯器中將 'use_latex' 設定為真。"
-
-#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "End to End 訊息加密"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "加密聊天訊息。"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "需要 python-crypto。"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST 產生器"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7835,195 +8423,199 @@ msgstr ""
 "從 RST 程式碼產生 XHTML 輸出 (參考 http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)。"
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "需要 python-docutils。"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr "開始進行語音視訊通話的能力。"
 
-#: ../src/features_window.py:108
-msgid "Requires python-farsight and gstreamer-plugins-bad."
+#: ../src/features_window.py:104
+#, fuzzy
+msgid "Requires python-farstream and gstreamer-plugins-bad."
 msgstr "需要 python-farsight 和 gstreamer-plugins-bad。"
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "UPnP-IGD"
 msgstr "UPnP-IGD"
 
-#: ../src/features_window.py:111
+#: ../src/features_window.py:107
 msgid "Ability to request your router to forward port for file transfer."
 msgstr "要求您的路由器於檔案傳送時轉用通訊埠的能力。"
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:108
 msgid "Requires python-gupnp-igd."
 msgstr "需要 python-gupnp-igd。"
 
-#: ../src/features_window.py:114
+#: ../src/features_window.py:110
 msgid "UPower"
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
 msgid "Ability to disconnect properly just before suspending the machine."
 msgstr ""
 
-#: ../src/features_window.py:116
+#: ../src/features_window.py:112
 #, fuzzy
 msgid "Requires upower and python-dbus."
 msgstr "需要 python-dbus。"
 
-#: ../src/features_window.py:124
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "可用"
 
-#: ../src/features_window.py:131
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "特性"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "檔案"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "時間"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "處理序"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "檔案名稱:  %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, 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/history_manager.py:541
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "傳送者:  %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "接收者: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "儲存在: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "檔案傳輸已完成"
-
-#: ../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
-msgid "Connection with peer cannot be established."
-msgstr "無法與對方建立連線。"
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者:  %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "錯誤訊息: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "檔案傳輸已停止"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:266
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "選擇要傳送的檔案…"
 
-#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "描述: "
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim 無法存取此檔案"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "此檔案正在被其他程式使用。"
 
-#: ../src/filetransfers_window.py:330
-#, python-format
-msgid "File: %s"
-msgstr "檔案:  %s"
-
-#: ../src/filetransfers_window.py:336
-#, python-format
-msgid "Type: %s"
-msgstr "類型: %s"
-
-#: ../src/filetransfers_window.py:338
-#, python-format
-msgid "Description: %s"
-msgstr "描述:  %s"
-
-#: ../src/filetransfers_window.py:339
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s 想傳送給您一個檔案:"
-
-#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "無法覆寫現有檔案\"%s\""
 
-#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "檔案名稱已經存在且您沒有權限覆寫它。"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "檔案已經存在"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 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:379 ../src/gtkgui_helpers.py:862
+#. 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:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目錄 \"%s\" 不可寫"
 
-#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "您沒有權限在這個目錄裡建立檔案。"
 
-#: ../src/filetransfers_window.py:389
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "另存為…"
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "檔案:  %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "類型: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "描述:  %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s 想傳送給您一個檔案:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "傳送側寫…"
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "檔案傳輸錯誤"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:459
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8031,77 +8623,118 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:552
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "無效檔案"
 
-#: ../src/filetransfers_window.py:595
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "檔案: "
 
-#: ../src/filetransfers_window.py:599
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "無法傳送空檔案"
 
-#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "名稱: "
 
-#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "傳送者: "
 
-#: ../src/filetransfers_window.py:787
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/gajim.py:191
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "message"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "表情(_E):"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "只顯示在聯絡人清單中"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "進階設定編輯器"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s 設定錯誤"
+
+#: ../src/gajim.py:149
+#, fuzzy
+msgid "Configure logging system"
+msgstr "組配 %s"
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim 需要 X 伺服器才能執行。離開…"
 
-#: ../src/gajim.py:193
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "匯入 PyGTK 失敗: %s"
 
-#: ../src/gajim.py:235
-msgid "Gajim needs PyGTK 2.16 or above"
+#: ../src/gajim.py:256
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim 需要 PyGTK 2.16 或更高版本"
 
-#: ../src/gajim.py:236
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:257
+#, fuzzy
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim 需要 PyGTK 2.16 或更高版本才能執行。離開…"
 
-#: ../src/gajim.py:238
-msgid "Gajim needs GTK 2.16 or above"
+#: ../src/gajim.py:259
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim 需要 GTK 2.16 或更高版本"
 
-#: ../src/gajim.py:239
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+#: ../src/gajim.py:260
+#, fuzzy
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim 需要 GTK 2.16 或更高版本才能執行。離開…"
 
-#: ../src/gajim.py:248
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim 需要 pywin32 才能執行"
 
-#: ../src/gajim.py:249
+#: ../src/gajim.py:270
 #, python-format
 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:365
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim 已經在執行"
 
-#: ../src/gajim.py:366
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8109,62 +8742,64 @@ msgstr ""
 "Gajim 另一個實體似乎正在執行\n"
 "不管怎樣，仍然執行?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "為特定命令顯示求助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "為命令顯示求助"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "顯示/隱藏聯絡人清單視窗"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "為下一筆未處理事件彈出視窗"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "列印聯絡人清單中所有聯絡人。每個聯絡人一列。"
 
-#: ../src/gajim-remote.py: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"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "帳號"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "只顯示指定帳號的聯絡人"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "列印註冊的帳號"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "變更一個或多個帳號狀態"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "狀態"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:110
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -8172,29 +8807,37 @@ msgstr ""
 "下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有設定，使用"
 "帳號先前的狀態"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "狀態訊息"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "變更帳號的狀態。如果不指明，將變更設定\"與全域同步\"選項的帳號"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:118
 msgid "Changes the priority of account or accounts"
 msgstr "變更一個或多個帳號的優先等級"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "優先等級"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:120
 msgid "priority you want to give to the account"
 msgstr "您想要給予這個帳號的優先等級"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:122
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -8202,23 +8845,23 @@ msgstr ""
 "變更指定帳號的優先等級。如果不指明，將變更所有設定了\"與全域狀態同步\"選項的"
 "帳號"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "顯示對話方塊用於給聯絡人傳送訊息"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，將從此帳號清單下移出聯絡人"
 
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr "訊息內容。帳號必須被指定或為\"\""
 
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:140
 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 "
@@ -8227,29 +8870,29 @@ msgstr ""
 "傳送新聊天訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 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.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "訊息內容"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "PGP 密鑰"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 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.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，訊息將被用此帳號傳送"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 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 "
@@ -8258,213 +8901,216 @@ msgstr ""
 "傳送新單條訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "主題"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "訊息主題"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "向一個您加入的聊天室傳送新訊息。"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "要收到這條訊息的聊天室的 JID"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "獲得聯絡人的詳細資訊"
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "聯絡人的 JID "
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "獲得帳號的詳細資訊"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "帳號名稱"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "向聯絡人傳送檔案"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "檔案"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "檔案路徑"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，檔案將被用此帳號傳送"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "列出所有的參數及它們的值"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "將\"密鑰\"的值設為\"值\""
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "鍵=值"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 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.py:208
 msgid "Deletes a preference item"
 msgstr "刪除一個參數項"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "鍵"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "需要刪除的參數名稱"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "將目前Gajim的國家設定寫入 .config 檔案"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "向聯絡人清單加入聯絡人"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "為此帳號加入新聯絡人"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "回傳目前狀態(如不指定帳號將回傳全域設定)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "回傳目前狀態資訊(如不指定帳號將回傳全域設定)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "回傳未讀訊息數"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "開啟 '開始聊天' 對話方塊"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "開始聊天，使用這個帳號"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "傳送自訂 XML"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "傳送 XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 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
+#: ../src/gajim-remote.py:269
 msgid "Change the avatar"
 msgstr "變更頭像"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Picture to use"
 msgstr "要使用的圖片"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 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
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "處理一個 xmpp:/ uri"
 
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:280
 msgid "URI to handle"
 msgstr "要處理的 URI"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:281
 msgid "Account in which you want to handle it"
 msgstr "您想要用其處理它的帳號"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:283
 msgid "Message content"
 msgstr "訊息內容"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "加入聊天室"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "聊天室"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:289
 msgid "Room JID"
 msgstr "聊天室 JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "暱稱"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
 msgid "Nickname to use"
 msgstr "要使用的暱稱"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "密碼"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
 msgid "Password to enter the room"
 msgstr "進入聊天室的密碼"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:292
 msgid "Account from which you want to enter the room"
 msgstr "您想要用其加入聊天室的帳號"
 
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "請檢查 Gajim 是否正在執行"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "顯示/隱藏 ipython 視窗"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"聯絡人 JID\"參數"
 
-#: ../src/gajim-remote.py:349
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8473,15 +9119,15 @@ msgstr ""
 "\"%s\" 不在您的聯絡人清單中。\n"
 "請為傳送此訊息指定帳號。"
 
-#: ../src/gajim-remote.py:352
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "沒有活動的帳號"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在執行。因此您無法使用 gajim-remote。"
 
-#: ../src/gajim-remote.py:432
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8490,25 +9136,27 @@ msgstr ""
 "用法: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "參數:"
 
-#: ../src/gajim-remote.py:440
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr " %s 找不到"
 
-#: ../src/gajim-remote.py:446
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "用法: %s 命令 [參數] \n"
 "命令是下列之一: \n"
 
-#: ../src/gajim-remote.py:515
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8517,7 +9165,7 @@ msgstr ""
 "參數太多。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8526,11 +9174,11 @@ msgstr ""
 "參數 \"%(arg)s\" 未指定。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: ../src/gajim-remote.py:539
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr "沒有給出 URI"
 
-#: ../src/gajim-remote.py:541
+#: ../src/gajim-remote.py:543
 msgid "Wrong uri"
 msgstr "錯誤的 uri"
 
@@ -8556,209 +9204,214 @@ msgid "You cannot delete your current theme"
 msgstr "無法刪除目前主題"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "請先選擇其他主題做為目前主題"
 
-#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1557
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s 現在成了 %(new_nick)s"
 
-#: ../src/groupchat_control.py:230
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "傳送私有訊息失敗"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:232
+#: ../src/groupchat_control.py:238
 #, 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:560
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "插入暱稱"
 
-#: ../src/groupchat_control.py:743
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "對話，與"
 
-#: ../src/groupchat_control.py:745
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "繼續對話"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1268
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s 將主題設定為 %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1240 ../src/groupchat_control.py:1499
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "所有室友可以看到您的全部 JID"
 
-#: ../src/groupchat_control.py:1243
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "聊天室現在顯示了無法使用的成員"
 
-#: ../src/groupchat_control.py:1245
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "聊天室現在不顯示無法使用的成員"
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1293
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "一個無關隱私的聊天室設定發生了變化"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1297
 msgid "Room logging is now enabled"
 msgstr "聊天室訊息記錄已啟用"
 
-#: ../src/groupchat_control.py:1253
+#: ../src/groupchat_control.py:1299
 msgid "Room logging is now disabled"
 msgstr "聊天室訊息記錄已停用"
 
-#: ../src/groupchat_control.py:1255
+#: ../src/groupchat_control.py:1301
 msgid "Room is now non-anonymous"
 msgstr "聊天室現在是非匿名的"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1304
 msgid "Room is now semi-anonymous"
 msgstr "聊天室現在是半匿名的"
 
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1307
 msgid "Room is now fully-anonymous"
 msgstr "聊天室現在是完全匿名的"
 
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1504
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "聊天室記錄被啟用"
 
-#: ../src/groupchat_control.py:1506
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "一個新的聊天室被建立"
 
-#: ../src/groupchat_control.py:1509
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "伺服器指定或修改了您的聊天室暱稱"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1515
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: ../src/groupchat_control.py:1518
+#: ../src/groupchat_control.py:1606
 #, 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:1527
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1541 ../src/groupchat_control.py:1645
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "您現在成了 %s "
 
-#: ../src/groupchat_control.py:1599 ../src/groupchat_control.py:1604
-#: ../src/groupchat_control.py:1610
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: ../src/groupchat_control.py:1601
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "歸屬變更"
 
-#: ../src/groupchat_control.py:1606
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "聊天室配置變為\"僅成員\""
 
-#: ../src/groupchat_control.py:1612
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "系統關閉"
 
-#: ../src/groupchat_control.py:1695
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(nick)s 的歸屬被 %(actor)s 設定為 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s 的歸屬被設定為 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1714
+#: ../src/groupchat_control.py:1814
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s 的角色被 %(actor)s 設定為 %(role)s"
 
-#: ../src/groupchat_control.py:1718
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s 的角色被設定為 %(role)s"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s 離開了"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: ../src/groupchat_control.py:2006
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "您確定要離開聊天室\"%s\"嗎?"
 
-#: ../src/groupchat_control.py:2008
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果關閉此視窗，您將中斷此聊天室的連線。"
 
-#: ../src/groupchat_control.py:2012 ../src/gui_interface.py:668
-#: ../src/gui_interface.py:1277 ../src/gui_interface.py:1317
-#: ../src/gui_interface.py:1358 ../src/message_window.py:224
-#: ../src/roster_window.py:2942 ../src/roster_window.py:3617
-#: ../src/roster_window.py:4386
-msgid "_Do not ask me again"
-msgstr "不要再問我了(_D)"
-
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "正在更換話題"
 
-#: ../src/groupchat_control.py:2047
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "請指定新話題:"
 
-#: ../src/groupchat_control.py:2054
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "正在更換暱稱"
 
-#: ../src/groupchat_control.py:2055
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "請指定您想使用的新暱稱:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "聊天室 Jabber ID 包含不合法字元。"
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2086
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "正在銷毀 %s"
 
-#: ../src/groupchat_control.py:2087
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8766,22 +9419,22 @@ msgstr ""
 "您正要徹底銷毀這個聊天室。\n"
 "您可以在下面指定一個原因:"
 
-#: ../src/groupchat_control.py:2089
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "您也可以輸入一個可選的替代地點:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2284
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "將踢走 %s"
 
-#: ../src/groupchat_control.py:2285 ../src/groupchat_control.py:2617
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "您可以指定一個原因:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2616
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "將封禁 %s"
@@ -8804,63 +9457,57 @@ msgstr "報告錯誤(_R)"
 msgid "Details"
 msgstr "細節"
 
-#. we talk about file
-#: ../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:348
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "讀檔案錯誤:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "分析檔案錯誤:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:392
+#: ../src/gtkgui_helpers.py:393
 #, 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:766
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim 不是預設的 Jabber 客戶端"
 
-#: ../src/gtkgui_helpers.py:767
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "您想要使 Gajim 成為預設的 Jabber 客戶端嗎?"
 
-#: ../src/gtkgui_helpers.py:768
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "總是在啟動時偵測 Gajim 是否是預設的 Jabber 客戶端"
 
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "不支援擴充"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:837
 #, 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:872
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "圖片另存為…"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:126 ../src/gui_interface.py:290
-#: ../src/gui_interface.py:299 ../src/gui_interface.py:305
-#: ../src/gui_interface.py:308 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:316
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "無法加入聊天室"
 
-#: ../src/gui_interface.py:127
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8870,86 +9517,86 @@ msgstr ""
 "您在聊天室 %s 中希望使用的暱稱已經被使用或被其他人註冊了。\n"
 "在下面指定另一個暱稱:"
 
-#: ../src/gui_interface.py:130
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "在發生衝突時總是使用這個暱稱"
 
-#: ../src/gui_interface.py:147
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "是否接受這個請求?"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受這個對帳號 %s 的請求?"
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 認證"
 
-#: ../src/gui_interface.py:195 ../src/notify.py:276
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "連線失敗"
 
-#: ../src/gui_interface.py:279
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "需要密碼才能加入聊天室 %s。請輸入一個密碼。"
 
-#: ../src/gui_interface.py:291
+#: ../src/gui_interface.py:299
 #, python-format
 msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "已經達到了 <b>%s</b> 的最大使用者數目"
 
-#: ../src/gui_interface.py:300
+#: ../src/gui_interface.py:308
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "您被多人聊天 <b>%s</b> 封禁。"
 
-#: ../src/gui_interface.py:306
+#: ../src/gui_interface.py:314
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "多人聊天 <b>%s</b> 不存在。"
 
-#: ../src/gui_interface.py:309
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "聊天室建立是受限的。"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:320
 #, python-format
 msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "您已註冊的暱稱必須在多人聊天 <b>%s</b> 中使用。"
 
-#: ../src/gui_interface.py:317
+#: ../src/gui_interface.py:325
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不在聊天室 %s 的成員清單中。"
 
-#: ../src/gui_interface.py:400 ../src/gui_interface.py:404
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "錯誤 %(code)s: %(msg)s"
 
-#: ../src/gui_interface.py:456 ../src/notify.py:278
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "認證請求"
 
-#: ../src/gui_interface.py:481
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "授權被接受"
 
-#: ../src/gui_interface.py:482
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "聯絡人\"%s\"已授權您檢視他/她的狀態。"
 
-#: ../src/gui_interface.py:490
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "聯絡人\"%s\"移除了對您的認證"
 
-#: ../src/gui_interface.py:491
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8957,72 +9604,96 @@ msgstr ""
 "您將一直看到他/她處於離線狀態。\n"
 "要將他/她從您的聯絡人清單中移除嗎?"
 
-#: ../src/gui_interface.py:512 ../src/notify.py:280
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "已取消認證的"
 
-#: ../src/gui_interface.py:523
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "無法與\"%s\"建立連線"
 
-#: ../src/gui_interface.py:621
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "您配置了 Gajim 使用 GPG agent，但並沒有正在執行的 GPG agent 或是它回傳了一個"
 "錯誤的密碼。\n"
 
-#: ../src/gui_interface.py:623 ../src/gui_interface.py:631
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "您已經連線，但沒有使用您的 OpenPGP 密鑰。"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "您的密碼不正確"
 
-#: ../src/gui_interface.py:630
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenPGP 密碼不正確"
 
-#: ../src/gui_interface.py:643
+#: ../src/gui_interface.py:681
 msgid "Certificate Passphrase Required"
 msgstr "要求憑證密語"
 
-#: ../src/gui_interface.py:644
+#: ../src/gui_interface.py:682
 #, python-format
 msgid "Enter the passphrase for the certificate for account %s"
 msgstr "輸入密語用於帳號憑證 %s"
 
-#: ../src/gui_interface.py:666
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG 密鑰不被信任"
 
-#: ../src/gui_interface.py:666
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr "用於加密這次對話的 GPG 密鑰未被信任。您確實想要加密這條訊息嗎?"
 
-#: ../src/gui_interface.py:679
+#: ../src/gui_interface.py:717
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
 msgstr "Gnome Keyring 雖然已安裝但未正確啟動 (環境變數可能沒有正確設定)"
 
-#: ../src/gui_interface.py:786
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s 上的新郵件"
 
-#: ../src/gui_interface.py:788
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 條新郵件作業階段"
 
-#: ../src/gui_interface.py:801
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9037,78 +9708,85 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:866
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想傳送給您一個檔案。"
 
-#: ../src/gui_interface.py:903 ../src/roster_window.py:1891
-msgid "Remote contact stopped transfer"
-msgstr "遠端聯絡人停止了傳輸"
-
-#: ../src/gui_interface.py:906 ../src/roster_window.py:1893
-msgid "Error opening file"
-msgstr "開啟檔案錯誤"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "檔案傳輸完成"
 
-#: ../src/gui_interface.py:938
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的從 %(name)s 收到檔案  %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:942
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:955
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的給 %(name)s 傳送了檔案 %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:959
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1034
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "無法解密訊息"
 
-#: ../src/gui_interface.py:1046
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "使用者名稱衝突"
 
-#: ../src/gui_interface.py:1047
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "<b>請在您本地帳號填寫新的使用者名稱</b>"
 
-#: ../src/gui_interface.py:1062
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "資源衝突"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1192
 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:1108
+#: ../src/gui_interface.py:1247
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要發起語音聊天。"
 
-#: ../src/gui_interface.py:1111
+#: ../src/gui_interface.py:1250
 msgid "Voice Chat Request"
 msgstr "語音聊天請求"
 
-#: ../src/gui_interface.py:1198
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "驗證 SSL 證書發生錯誤"
 
-#: ../src/gui_interface.py:1199
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9119,15 +9797,20 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要連線這個伺服器嗎?"
 
-#: ../src/gui_interface.py:1208
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "忽略這個證書的這個錯誤。"
 
-#: ../src/gui_interface.py:1233
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL 憑證驗證"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "SSL證書錯誤"
 
-#: ../src/gui_interface.py:1234
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9143,27 +9826,7 @@ msgstr ""
 "\n"
 "您仍想連線並更新證書的指紋資訊嗎?"
 
-#: ../src/gui_interface.py:1270 ../src/gui_interface.py:1312
-#: ../src/gui_interface.py:1354
-msgid "Insecure connection"
-msgstr "不安全的連線"
-
-#: ../src/gui_interface.py:1271
-#, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) with an "
-"insecure connection. This means all your conversations will be exchanged "
-"unencrypted. Are you sure you want to do that?"
-msgstr ""
-"您即將透過不安全的連線與帳號 %(account)s (%(server)s) 連接。這意味著您的所有"
-"對話都會不經加密地被交換。您確定要這樣做嗎？"
-
-#: ../src/gui_interface.py:1276 ../src/gui_interface.py:1316
-#: ../src/gui_interface.py:1357
-msgid "Yes, I really want to connect insecurely"
-msgstr "是的，我確實想要不安全地連線"
-
-#: ../src/gui_interface.py:1313
+#: ../src/gui_interface.py:1447
 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?"
@@ -9171,24 +9834,24 @@ msgstr ""
 "您將透過不安全的連線傳送密碼。您應該安裝 PyOpenSSL 以阻止這樣的事情。您確定要"
 "這樣做嗎?"
 
-#: ../src/gui_interface.py:1355
+#: ../src/gui_interface.py:1489
 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:1864 ../src/gui_interface.py:1887
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "表情圖示被停用"
 
-#: ../src/gui_interface.py:1865
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "您配置的表情圖示主題找不到，所以表情圖示被停用。"
 
-#: ../src/gui_interface.py:1888
+#: ../src/gui_interface.py:2019
 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 "
@@ -9197,89 +9860,92 @@ msgstr ""
 "您配置的表情圖示主題無法載入。您可能需要升級 emoticons.py 檔案的格式。請參考 "
 "http://trac.gajim.org/wiki/Emoticons"
 
-#: ../src/gui_interface.py:1932 ../src/roster_window.py:3784
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 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:2319
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "無法儲存您的設定。"
 
-#: ../src/gui_interface.py:2869
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gui_interface.py:2870
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "輸入 GPG 密鑰 %(keyid)s (帳號 %(account)s) 的密碼。"
 
-#: ../src/gui_interface.py:2884
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG 密鑰過期"
 
-#: ../src/gui_interface.py:2885
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3059
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "您的 GPG 密鑰已過期，您將在沒有 OpenPGP 情況下連線到 %s。"
 
 #. ask again
-#: ../src/gui_interface.py:2894
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "錯誤欄位"
 
-#: ../src/gui_interface.py:2895
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "請重新輸入您的 GPG 欄位或點\"取消\""
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "新聊天室(_N)"
 
-#: ../src/gui_menu_builder.py:419
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "我希望將您加入到我的聯絡人清單"
 
-#: ../src/history_manager.py:116
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "正在建立 %s 目錄"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "無法找到命令歷程記錄資料庫"
 
-#. holds jid
-#: ../src/history_manager.py:156
-msgid "Contacts"
-msgstr "聯絡人"
-
 #. holds time
-#: ../src/history_manager.py:169 ../src/history_manager.py:213
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:176 ../src/history_manager.py:232
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "暱稱"
 
 #. holds message
-#: ../src/history_manager.py:185 ../src/history_manager.py:220
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "訊息"
 
 #. holds subject
-#: ../src/history_manager.py:193 ../src/history_manager.py:226
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "主題"
 
-#: ../src/history_manager.py:252
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您確定要清除資料庫?(強烈建議 GAJIM 執行時不要進行此作業)"
 
-#: ../src/history_manager.py:254
+#: ../src/history_manager.py:264
 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 "
@@ -9292,107 +9958,103 @@ msgstr ""
 "\n"
 "如果您點擊\"是\"，請等待…"
 
-#: ../src/history_manager.py:259
+#: ../src/history_manager.py:269
 msgid "Database Cleanup"
 msgstr "資料庫清理"
 
-#: ../src/history_manager.py:477
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "輸出命令歷程記錄…"
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 時說:  %(message)s\n"
 
-#: ../src/history_manager.py:592
+#: ../src/history_manager.py:602
 #, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
 msgstr "您真的要刪除 %(jid)s 的記錄檔嗎？"
 
-#: ../src/history_manager.py:596
+#: ../src/history_manager.py:606
 msgid "Do you really want to delete logs of the selected contacts?"
 msgstr "您真的要刪除已選聯絡人的記錄檔嗎？"
 
-#: ../src/history_manager.py:598 ../src/history_manager.py:637
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "該作業是不可撤消的。"
 
-#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
 msgid "Deletion Confirmation"
 msgstr "刪除確認"
 
-#: ../src/history_manager.py:634
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您確定要刪除所選取的訊息?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "與 %s 的聊天命令歷程"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "磁碟錯誤"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的狀態是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "錯誤: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "現在狀態: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "現在狀態:  %(status)s "
 
-#: ../src/htmltextview.py:523 ../src/htmltextview.py:533
-msgid "Timeout loading image"
-msgstr "讀取檔案逾時"
-
-#: ../src/htmltextview.py:543
-msgid "Image is too big"
-msgstr "圖片太大"
-
-#: ../src/htmltextview.py:576
+#: ../src/htmltextview.py:523
 msgid "Loading"
 msgstr "載入"
 
-#: ../src/message_window.py:222
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
+
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "您將要關閉多個標籤"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "您確定要關閉所有這些嗎"
 
-#: ../src/message_window.py:497
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:499
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "多人聊天"
 
-#: ../src/message_window.py:501
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "私人聊天"
 
-#: ../src/message_window.py:507
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "訊息"
 
@@ -9404,48 +10066,53 @@ msgstr "- 訊息將會被記錄"
 msgid "- messages will not be logged"
 msgstr "- 訊息將不會被記錄"
 
-#: ../src/notify.py:319
+#: ../src/notify.py:324
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/plugins/gui.py:67
+#: ../src/plugins/gui.py:82
 msgid "Plugin"
 msgstr "外掛程式"
 
-#: ../src/plugins/gui.py:161
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "將封禁 %s"
+
+#: ../src/plugins/gui.py:209
 msgid "Plugin failed"
 msgstr "外掛程式失敗"
 
-#: ../src/plugins/gui.py:205
+#: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
 msgstr "無法適當地移除外掛程式"
 
 #. members not safe
-#: ../src/plugins/gui.py:213 ../src/plugins/pluginmanager.py:497
-#: ../src/plugins/pluginmanager.py:505
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
 msgid "Archive is malformed"
 msgstr "存檔異常"
 
-#: ../src/plugins/gui.py:236 ../src/plugins/gui.py:244
-#: ../src/plugins/pluginmanager.py:513
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
 msgid "Plugin already exists"
 msgstr "外掛程式已經存在"
 
-#: ../src/plugins/gui.py:236
+#: ../src/plugins/gui.py:286
 msgid "Overwrite?"
 msgstr "覆寫？"
 
-#: ../src/plugins/gui.py:265
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "組態"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:483 ../src/plugins/pluginmanager.py:489
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
 msgid "Archive corrupted"
 msgstr "存檔已損壞"
 
-#: ../src/plugins/pluginmanager.py:485
+#: ../src/plugins/pluginmanager.py:514
 msgid "Archive empty"
 msgstr "存檔為空"
 
@@ -9453,136 +10120,138 @@ msgstr "存檔為空"
 msgid "Retrieving profile..."
 msgstr "正在獲取側寫…"
 
-#: ../src/profile_window.py:125 ../src/roster_window.py:3137
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "檔案為空"
 
-#: ../src/profile_window.py:128 ../src/roster_window.py:3140
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "檔案不存在"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:142 ../src/profile_window.py:158
-#: ../src/roster_window.py:3142 ../src/roster_window.py:3153
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "無法讀取圖片"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:235
 msgid "Wrong date format"
 msgstr "錯誤的資料格式"
 
-#: ../src/profile_window.py:230
+#: ../src/profile_window.py:236
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日期的格式必須是 YYYY-MM-DD"
 
-#: ../src/profile_window.py:284
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "資訊已收到"
 
-#: ../src/profile_window.py:362
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "沒有連線的情況下您無法發布您的聯絡人資訊。"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "傳送側寫…"
 
-#: ../src/profile_window.py:394
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "資訊沒有發布"
 
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "vCard 發布失敗"
 
-#: ../src/profile_window.py:402
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "發布您的個人資訊時發生錯誤，請稍後重試。"
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1028
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "已合併的帳號"
 
-#: ../src/roster_window.py:1956
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "授權傳送成功"
 
-#: ../src/roster_window.py:1957
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "現在\"%s\"將知道您的狀態。"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "認證請求已發出"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果\"%s\"接受此請求，您將知道他/她的狀態。"
 
-#: ../src/roster_window.py:1995
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "授權被移除"
 
-#: ../src/roster_window.py:1996
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 將一直看到您的狀態為離線。"
 
-#: ../src/roster_window.py:2023
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG 無法使用"
 
-#: ../src/roster_window.py:2024
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您將在無 OpenPGP 情況下連線到 %s。"
 
-#: ../src/roster_window.py:2231 ../src/roster_window.py:3714
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "您正在參與一個或多個多人聊天"
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:3715
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 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:2258
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "未同步"
 
-#: ../src/roster_window.py:2324
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "真得要離開 Gajim?"
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您確定您要離開 Gajim 嗎?"
 
-#: ../src/roster_window.py:2326
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "總是關閉 Gajim"
 
-#: ../src/roster_window.py:2410
+#: ../src/roster_window.py:2519
 msgid "You have running file transfers"
 msgstr "您有傳送中的檔案"
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "如果現在離開，傳送中的檔案會停止傳輸。您仍然要離開嗎?"
 
-#: ../src/roster_window.py:2442 ../src/roster_window.py:2856
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "您有未讀訊息"
 
-#: ../src/roster_window.py:2443
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9590,119 +10259,119 @@ msgstr ""
 "除非您啟用了命令歷程記錄而且向您傳送訊息的聯絡人在您的聯絡人清單中，您才能\n"
 "在以後讀到這些訊息。"
 
-#: ../src/roster_window.py:2857
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必須檢視它們。"
 
-#: ../src/roster_window.py:2860
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理\"%s\"將被移除"
 
-#: ../src/roster_window.py:2861
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您將無法再和使用這個代理的聯絡人收發訊息。"
 
-#: ../src/roster_window.py:2864
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "代理將被移除"
 
-#: ../src/roster_window.py:2869
+#: ../src/roster_window.py:3001
 #, 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:2937
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您將要阻斷一個聯絡人。您確定要繼續嗎?"
 
-#: ../src/roster_window.py:2939
+#: ../src/roster_window.py:3045
 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:3029
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "重新命名聯絡人"
 
-#: ../src/roster_window.py:3030
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "為聯絡人 %s 輸入新的暱稱"
 
-#: ../src/roster_window.py:3037
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "重新命名群組"
 
-#: ../src/roster_window.py:3038
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "為群組 %s 輸入新的名稱"
 
-#: ../src/roster_window.py:3083
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../src/roster_window.py:3084
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想從聯絡人清單中刪除組 %s ?"
 
-#: ../src/roster_window.py:3085
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同時從聯絡人清單移除這個群組的所有聯絡人"
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "指定 OpenPGP 密鑰"
 
-#: ../src/roster_window.py:3125
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "選擇一個對應於該聯絡人的密鑰。"
 
-#: ../src/roster_window.py:3524
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "聯絡人\"%s\"將從您的聯絡人清單中被移除"
 
-#: ../src/roster_window.py:3526
+#: ../src/roster_window.py:3637
 #, 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:3531
+#: ../src/roster_window.py:3642
 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:3537
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "您要繼續嗎?"
 
-#: ../src/roster_window.py:3541
+#: ../src/roster_window.py:3652
 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:3544
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "我想讓此聯絡人在被移除之後仍然知道我的狀態"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3548
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "聯絡人將從您的聯絡人清單中被移除"
 
-#: ../src/roster_window.py:3553
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9711,12 +10380,13 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: ../src/roster_window.py:3611
+#: ../src/roster_window.py:3722
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "您將傳送一個自訂的狀態。您確定要繼續嗎?"
 
-#: ../src/roster_window.py:3613
+#: ../src/roster_window.py:3724
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9725,31 +10395,32 @@ msgstr ""
 "這個聯絡人會暫時看到您的狀態為 %(status)s，直到您下次變更您的狀態。之後\n"
 "他/她會看到您的全域狀態。"
 
-#: ../src/roster_window.py:3632
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "沒有有效帳號"
 
-#: ../src/roster_window.py:3633
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必須在與他人聊天前新增帳號。"
 
-#: ../src/roster_window.py:4286
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的伺服器不支援儲存元聯絡人資訊"
 
-#: ../src/roster_window.py:4288
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "您的伺服器不支援儲存元聯絡人資訊。所以這些資訊在下次重新連線時不會被儲存。"
 
-#: ../src/roster_window.py:4380
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在建立一個元聯絡人。確定繼續?"
 
-#: ../src/roster_window.py:4382
+#: ../src/roster_window.py:4552
 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 "
@@ -9758,27 +10429,27 @@ msgstr ""
 "元聯絡人是將幾個聯絡人組合起來顯示在同一列。一般在某個人有幾個 Jabber\n"
 "帳號或代理帳號時用到。"
 
-#: ../src/roster_window.py:4503
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "無效的檔案位址:"
 
-#: ../src/roster_window.py:4515
+#: ../src/roster_window.py:4685
 #, 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:4650
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "傳送 %s 給 %s"
 
-#: ../src/roster_window.py:4661
+#: ../src/roster_window.py:4831
 #, python-format
 msgid "Make %s first contact"
 msgstr "將 %s 設為第一聯絡人"
 
-#: ../src/roster_window.py:4664
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "將 %s 與 %s 設為中繼聯絡人"
@@ -9788,129 +10459,129 @@ msgstr "將 %s 與 %s 設為中繼聯絡人"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5104 ../src/roster_window.py:5158
-#: ../src/roster_window.py:5167 ../src/statusicon.py:264
-#: ../src/statusicon.py:311 ../src/statusicon.py:317
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "使用帳號 %s"
 
 #. add
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "至帳號 %s"
 
 #. disco
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "使用 %s 帳號"
 
-#: ../src/roster_window.py:5218 ../src/statusicon.py:327
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "管理書籤(_M)…"
 
 #. profile, avatar
-#: ../src/roster_window.py:5238
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "帳號 %s 的"
 
-#: ../src/roster_window.py:5279
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "帳號 %s"
 
-#: ../src/roster_window.py:5339 ../src/roster_window.py:5447
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "變更狀態訊息(_C)"
 
-#: ../src/roster_window.py:5372
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "發布音樂"
 
-#: ../src/roster_window.py:5374
+#: ../src/roster_window.py:5564
 msgid "Publish Location"
 msgstr "發布位置資訊"
 
-#: ../src/roster_window.py:5377
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "配置服務…"
 
-#: ../src/roster_window.py:5525
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "放到最大全部(_M)"
 
-#: ../src/roster_window.py:5535 ../src/roster_window.py:5708
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "傳送群組訊息(_E)"
 
-#: ../src/roster_window.py:5543
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "向所有的使用者"
 
-#: ../src/roster_window.py:5547
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "向所有線上使用者"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "管理聯絡人(_M)"
 
 #. Edit Groups
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "編輯群組(_G)"
 
 #. Send single message
-#: ../src/roster_window.py:5792
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "傳送單條訊息(_S)"
 
 #. Execute Command
-#: ../src/roster_window.py:5839
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "執行命令…"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5849
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "管理代理(_M)"
 
 #. Modify Transport
-#: ../src/roster_window.py:5858
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
 #. Rename
-#: ../src/roster_window.py:5868
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
-#: ../src/roster_window.py:5928
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "放到最大(_M)"
 
-#: ../src/roster_window.py:5937
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
-#: ../src/roster_window.py:5944
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "中斷連線(_D)"
 
 #. History manager
-#: ../src/roster_window.py:6033
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "命令歷程記錄管理器"
 
-#: ../src/roster_window.py:6044
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: ../src/roster_window.py:6263
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "變更狀態訊息…"
 
@@ -9927,19 +10598,14 @@ msgstr "在收到的資料表中有錯誤"
 msgid "No result"
 msgstr "無結果"
 
-#: ../src/session.py:95
-msgid "Disk WriteError"
-msgstr "磁碟寫入錯誤"
-
-#: ../src/session.py:406 ../src/session.py:450
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "確定這些作業階段屬性"
 
-#: ../src/session.py:407
-#, python-format
+#: ../src/session.py:411
+#, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9952,7 +10618,7 @@ msgstr ""
 "\n"
 "是否接受?"
 
-#: ../src/session.py:451
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9967,146 +10633,151 @@ msgstr ""
 "\n"
 "繼續進行作業階段?"
 
-#: ../src/statusicon.py:228
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "是否為此聯絡人使用 OpenPGP?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "變更狀態訊息_(C)…"
 
-#: ../src/statusicon.py:342
+#: ../src/statusicon.py:355
 msgid "Hide _Roster"
 msgstr "隱藏聯絡人清單(_R)"
 
-#: ../src/statusicon.py:353
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "隱藏本選單"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "資源: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr "[已阻斷]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr "[最小化的]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "狀態: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "最後狀態: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr "自從 %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "已連線"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "已中斷連線"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "認證: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, python-format
 msgid "Idle since %s"
 msgstr "閒置，自從 %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, python-format
 msgid "Idle for %s"
 msgstr "閒置了 %s"
 
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "心情: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
+msgstr "心情:"
 
-#: ../src/tooltips.py:702
-#, python-format
-msgid "Activity: %s"
-msgstr "活動: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
+msgstr "活動:"
 
-#: ../src/tooltips.py:706
-#, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "音樂: %s"
 
-#: ../src/tooltips.py:710
-#, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "位置: %s"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "下載"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "上傳"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "類型: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "已傳輸: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "未開始"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暫停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "已凍結"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "服務還沒有詳細的資訊應答"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10114,65 +10785,246 @@ msgstr ""
 "這個服務無法應答詳細的資訊。\n"
 "這很可能是伺服器的遺留問題，或是伺服器被損壞了"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:310
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>角色</b>"
 
-#: ../src/vcard.py:371
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>歸屬:</b>"
 
-#: ../src/vcard.py:379
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此聯絡人對您的狀態資訊感興趣，但您不關心他/她的狀態"
 
-#: ../src/vcard.py:381
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您對此聯絡人的狀態資訊感興趣，但他/她不關心您的狀態"
 
-#: ../src/vcard.py:383
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您與此聯絡人同時對對方的狀態資訊感興趣"
 
 #. None
-#: ../src/vcard.py:385
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您與他/她互不關心對方的狀態資訊"
 
-#: ../src/vcard.py:392
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待聯絡人回應您的認證請求"
 
-#: ../src/vcard.py:394
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "沒有未處理的認證請求"
 
-#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr "帶有優先等級的資源"
 
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "顯示聯絡人的側寫"
+
+#~ msgid "label"
+#~ msgstr "標籤"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "允許他/她檢視我的狀態(_A)"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "在聯絡人清單中顯示聯絡人的活動(_A)"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "在聯絡人清單中顯示聯絡人正在播放音樂的資訊(_T)"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "在聯絡人清單中顯示聯絡人的心情(_O)"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的活動。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的位置。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人正在播放的音樂。"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim 即時訊息軟體"
+
+#~ msgid "English"
+#~ msgstr "英語"
+
+#~ msgid "Belarusian"
+#~ msgstr "白俄語"
+
+#~ msgid "Bulgarian"
+#~ msgstr "保加利亞語"
+
+#~ msgid "Breton"
+#~ msgstr "布列塔尼語"
+
+#~ msgid "Czech"
+#~ msgstr "捷克語"
+
+#~ msgid "German"
+#~ msgstr "德語"
+
+#~ msgid "Greek"
+#~ msgstr "希臘語"
+
+#~ msgid "British"
+#~ msgstr "英語(英國)"
+
+#~ msgid "Esperanto"
+#~ msgstr "世界語"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙語"
+
+#~ msgid "Basque"
+#~ msgstr "巴斯克語"
+
+#~ msgid "French"
+#~ msgstr "法語"
+
+#~ msgid "Croatian"
+#~ msgstr "克羅埃西亞語"
+
+#~ msgid "Italian"
+#~ msgstr "義大利語"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "挪威語 (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "荷蘭語"
+
+#~ msgid "Norwegian"
+#~ msgstr "挪威語"
+
+#~ msgid "Polish"
+#~ msgstr "波蘭語"
+
+#~ msgid "Portuguese"
+#~ msgstr "葡萄牙語"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "巴西葡萄牙語"
+
+#~ msgid "Russian"
+#~ msgstr "俄語"
+
+#~ msgid "Serbian"
+#~ msgstr "塞爾維亞語"
+
+#~ msgid "Slovak"
+#~ msgstr "斯洛伐克語"
+
+#~ msgid "Swedish"
+#~ msgstr "瑞典語"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "漢語"
+
+#~ msgid "Spelling language"
+#~ msgstr "拼寫語言"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "需要 python-farsight。"
+
+#~ 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 ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr "變更這個值以變更顯示的 LaTeX 方程的大小。更高則更大。"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "檢查連線或稍後重試"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "在執行命令\"%(command)s\"時發生錯誤: %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "錯誤: 無法讀取檔案 %s"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "無法繫結連接埠%s。"
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr "或許您有另一個正在執行的 Gajim 實體。檔案傳輸將被取消。"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "轉換 $$ $$ 之間的 LaTeX 運算式。"
+
+#~ 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 或 ImageMagick)。您需要在進階設定編輯器"
+#~ "中將 'use_latex' 設定為真。"
+
+#~ 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 或 ImageMagick) (全部在 MikTeX 中)。您"
+#~ "需要在進階設定編輯器中將 'use_latex' 設定為真。"
+
+#~ msgid "Contacts"
+#~ msgstr "聯絡人"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "磁碟寫入錯誤"
+
+#~ msgid "Mood: %s"
+#~ msgstr "心情: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "活動: %s"
+
 #~ msgid "A GTK+ jabber client"
 #~ msgstr "一個 GTK+ Jabber 客戶端"